diff --git a/Modules/Sources/FavoritesFeature/FavoritesScreen.swift b/Modules/Sources/FavoritesFeature/FavoritesScreen.swift
index 3af2bfde..e6d9f901 100644
--- a/Modules/Sources/FavoritesFeature/FavoritesScreen.swift
+++ b/Modules/Sources/FavoritesFeature/FavoritesScreen.swift
@@ -311,7 +311,7 @@ public struct FavoritesScreen: View {
                                 .scaledToFit()
                                 .frame(width: 16, height: 16)
                                 .foregroundStyle(Color(.Labels.secondary))
-                                .padding(.trailing, unread ? 0 : 12)
+                                .padding(.trailing, unread ? -2 : 12)
                         }
                         
                         if unread {
diff --git a/Modules/Sources/ForumFeature/ForumScreen.swift b/Modules/Sources/ForumFeature/ForumScreen.swift
index 79830f5f..8db0d267 100644
--- a/Modules/Sources/ForumFeature/ForumScreen.swift
+++ b/Modules/Sources/ForumFeature/ForumScreen.swift
@@ -272,21 +272,21 @@ public struct ForumScreen: View {
                     }
                     
                     Spacer(minLength: 0)
-
-                    if unread {
-                        Image(systemSymbol: .circleFill)
-                            .resizable()
-                            .scaledToFit()
-                            .frame(width: 10, height: 10)
-                            .foregroundStyle(tintColor)
-                    }
-                    
                     if closed {
                         Image(systemSymbol: .lock)
                             .resizable()
                             .scaledToFit()
                             .frame(width: 16, height: 16)
                             .foregroundStyle(Color(.Labels.secondary))
+                            .padding(.trailing, unread ? 4 : 12)
+                    }
+                    
+                    if unread {
+                        Image(systemSymbol: .circleFill)
+                            .resizable()
+                            .scaledToFit()
+                            .frame(width: 10, height: 10)
+                            .foregroundStyle(tintColor)
                             .padding(.trailing, 12)
                     }
                 }
@@ -294,7 +294,7 @@ public struct ForumScreen: View {
                 .contentShape(Rectangle())
             }
         }
-        .listRowInsets(EdgeInsets(top: 0, leading: 16, bottom: 0, trailing: 16))
+        .listRowInsets(EdgeInsets(top: 0, leading: 16, bottom: 0, trailing: 0))
         .buttonStyle(.plain)
         .frame(minHeight: 60)
     }