diff --git a/Tusker/Screens/Preferences/AppearancePrefsView.swift b/Tusker/Screens/Preferences/AppearancePrefsView.swift
index 966d97ca03..d00195f953 100644
--- a/Tusker/Screens/Preferences/AppearancePrefsView.swift
+++ b/Tusker/Screens/Preferences/AppearancePrefsView.swift
@@ -30,12 +30,26 @@ struct AppearancePrefsView : View {
                 Text("Light").tag(UIUserInterfaceStyle.light)
                 Text("Dark").tag(UIUserInterfaceStyle.dark)
             }
+            accountsSection
+            postsSection
+        }
+            .listStyle(GroupedListStyle())
+            .navigationBarTitle(Text("Appearance"))
+    }
+    
+    private var accountsSection: some View {
+        Section(header: Text("Accounts")) {
             Toggle(isOn: useCircularAvatars) {
                 Text("Use Circular Avatars")
             }
             Toggle(isOn: $preferences.hideCustomEmojiInUsernames) {
                 Text("Hide Custom Emoji in Usernames")
             }
+        }
+    }
+    
+    private var postsSection: some View {
+        Section(header: Text("Posts")) {
             Toggle(isOn: $preferences.showIsStatusReplyIcon) {
                 Text("Show Status Reply Icons")
             }
@@ -43,8 +57,6 @@ struct AppearancePrefsView : View {
                 Text("Always Show Status Visibility Icons")
             }
         }
-            .listStyle(GroupedListStyle())
-            .navigationBarTitle(Text("Appearance"))
     }
 }