diff --git a/Shared/Navigation/ContentView.swift b/Shared/Navigation/ContentView.swift
index bc5e6ce..c4d878f 100644
--- a/Shared/Navigation/ContentView.swift
+++ b/Shared/Navigation/ContentView.swift
@@ -1,145 +1,145 @@
 import SwiftUI
 
 struct ContentView: View {
     @EnvironmentObject var model: WriteFreelyModel
     @Binding var sidebarIsHidden: Bool
 
     var body: some View {
         NavigationView {
             #if os(macOS)
             SidebarView()
                 .toolbar {
                     Button(
                         action: {
                             NSApp.keyWindow?.contentViewController?.tryToPerform(
                                 #selector(NSSplitViewController.toggleSidebar(_:)), with: nil
                             )
                             withAnimation { self.sidebarIsHidden.toggle() }
                         },
                         label: { Image(systemName: "sidebar.left") }
                     )
                     Spacer()
                     Button(action: {
                         withAnimation {
                             self.model.selectedPost = nil
                         }
                         let managedPost = WFAPost(context: LocalStorageManager.persistentContainer.viewContext)
                         managedPost.createdDate = Date()
                         managedPost.title = ""
                         managedPost.body = ""
                         managedPost.status = PostStatus.local.rawValue
                         managedPost.collectionAlias = nil
                         switch model.preferences.font {
                         case 1:
                             managedPost.appearance = "sans"
                         case 2:
                             managedPost.appearance = "wrap"
                         default:
                             managedPost.appearance = "serif"
                         }
                         if let languageCode = Locale.current.languageCode {
                             managedPost.language = languageCode
                             managedPost.rtl = Locale.characterDirection(forLanguage: languageCode) == .rightToLeft
                         }
                         withAnimation {
                             self.model.selectedPost = managedPost
                         }
                     }, label: { Image(systemName: "square.and.pencil") })
                 }
             #else
             SidebarView()
             #endif
 
             #if os(macOS)
             PostListView(selectedCollection: nil, showAllPosts: model.account.isLoggedIn)
                 .toolbar {
                     ToolbarItem(placement: .navigation) {
                         Button(action: {
                             DispatchQueue.main.async {
                                 model.fetchUserCollections()
                                 model.fetchUserPosts()
                             }
                         }, label: { Image(systemName: "arrow.clockwise") })
                         .disabled(!model.account.isLoggedIn)
                         .padding(.leading, sidebarIsHidden ? 8 : 0)
                         .animation(.linear)
                     }
                     ToolbarItem(placement: .status) {
                         if let selectedPost = model.selectedPost {
-                            PostStatusBadgeView(post: selectedPost)
+                            PostEditorStatusToolbarView(post: selectedPost)
                         }
                     }
                     ToolbarItemGroup(placement: .primaryAction) {
                         if let selectedPost = model.selectedPost {
                             Button(action: {
                                 DispatchQueue.main.async {
                                     LocalStorageManager().saveContext()
                                     model.publish(post: selectedPost)
                                 }
                             }, label: { Image(systemName: "paperplane") })
                             .disabled(selectedPost.body.isEmpty || selectedPost.status == PostStatus.published.rawValue)
                             Button(action: {}, label: { Image(systemName: "square.and.arrow.up") })
                                 .disabled(selectedPost.status == PostStatus.local.rawValue)
                         }
                     }
                 }
             #else
             PostListView(selectedCollection: nil, showAllPosts: model.account.isLoggedIn)
             #endif
 
             Text("Select a post, or create a new local draft.")
                 .foregroundColor(.secondary)
         }
         .environmentObject(model)
         .alert(isPresented: $model.isPresentingDeleteAlert) {
             Alert(
                 title: Text("Delete Post?"),
                 message: Text("This action cannot be undone."),
                 primaryButton: .destructive(Text("Delete"), action: {
                     if let postToDelete = model.postToDelete {
                         model.selectedPost = nil
                         DispatchQueue.main.async {
                             model.posts.remove(postToDelete)
                         }
                         model.postToDelete = nil
                     }
                 }),
                 secondaryButton: .cancel() {
                     model.postToDelete = nil
                 }
             )
         }
         .alert(isPresented: $model.isPresentingNetworkErrorAlert, content: {
             Alert(
                 title: Text("Connection Error"),
                 message: Text("There is no internet connection at the moment. Please reconnect or try again later"),
                 dismissButton: .default(Text("OK"), action: {
                     model.isPresentingNetworkErrorAlert = false
                 })
             )
         })
 
         #if os(iOS)
         EmptyView()
             .sheet(
                 isPresented: $model.isPresentingSettingsView,
                 onDismiss: { model.isPresentingSettingsView = false },
                 content: {
                     SettingsView()
                         .environmentObject(model)
                 }
             )
         #endif
     }
 }
 
 struct ContentView_Previews: PreviewProvider {
     static var previews: some View {
         let context = LocalStorageManager.persistentContainer.viewContext
         let model = WriteFreelyModel()
 
         return ContentView(sidebarIsHidden: .constant(false))
             .environment(\.managedObjectContext, context)
             .environmentObject(model)
     }
 }
diff --git a/Shared/PostEditor/PostEditorStatusToolbarView.swift b/Shared/PostEditor/PostEditorStatusToolbarView.swift
index 580e051..7d8cac4 100644
--- a/Shared/PostEditor/PostEditorStatusToolbarView.swift
+++ b/Shared/PostEditor/PostEditorStatusToolbarView.swift
@@ -1,88 +1,98 @@
 import SwiftUI
 
 struct PostEditorStatusToolbarView: View {
     @EnvironmentObject var model: WriteFreelyModel
 
     @ObservedObject var post: WFAPost
 
     var body: some View {
         if post.hasNewerRemoteCopy {
             #if os(iOS)
             PostStatusBadgeView(post: post)
             #else
             HStack {
+                HStack {
+                    Text("⚠️ Newer copy on server. Replace local copy?")
+                        .font(.callout)
+                        .foregroundColor(.secondary)
+                    Button(action: {
+                        model.updateFromServer(post: post)
+                    }, label: {
+                        Image(systemName: "square.and.arrow.down")
+                    })
+                }
+                .padding(.horizontal)
+                .background(Color.primary.opacity(0.1))
+                .clipShape(Capsule())
+                .padding(.trailing)
                 PostStatusBadgeView(post: post)
-                    .padding(.trailing)
-                Text("⚠️ Newer copy on server. Replace local copy?")
-                    .font(.callout)
-                    .foregroundColor(.secondary)
-                Button(action: {
-                    model.updateFromServer(post: post)
-                }, label: {
-                    Image(systemName: "square.and.arrow.down")
-                })
             }
             #endif
         } else if post.wasDeletedFromServer && post.status != PostStatus.local.rawValue {
             #if os(iOS)
             PostStatusBadgeView(post: post)
             #else
             HStack {
+                HStack {
+                    Text("⚠️ Post deleted from server. Delete local copy?")
+                        .font(.callout)
+                        .foregroundColor(.secondary)
+                    Button(action: {
+                        model.selectedPost = nil
+                        DispatchQueue.main.async {
+                            model.posts.remove(post)
+                        }
+                    }, label: {
+                        Image(systemName: "trash")
+                    })
+                }
+                .padding(.horizontal)
+                .background(Color.primary.opacity(0.1))
+                .clipShape(Capsule())
+                .padding(.trailing)
                 PostStatusBadgeView(post: post)
-                    .padding(.trailing)
-                Text("⚠️ Post deleted from server. Delete local copy?")
-                    .font(.callout)
-                    .foregroundColor(.secondary)
-                Button(action: {
-                    model.selectedPost = nil
-                    DispatchQueue.main.async {
-                        model.posts.remove(post)
-                    }
-                }, label: {
-                    Image(systemName: "trash")
-                })
             }
             #endif
         } else {
             PostStatusBadgeView(post: post)
         }
     }
 }
 
 struct PESTView_StandardPreviews: PreviewProvider {
     static var previews: some View {
         let context = LocalStorageManager.persistentContainer.viewContext
         let model = WriteFreelyModel()
         let testPost = WFAPost(context: context)
         testPost.status = PostStatus.published.rawValue
 
         return PostEditorStatusToolbarView(post: testPost)
             .environmentObject(model)
     }
 }
 
 struct PESTView_OutdatedLocalCopyPreviews: PreviewProvider {
     static var previews: some View {
         let context = LocalStorageManager.persistentContainer.viewContext
         let model = WriteFreelyModel()
         let updatedPost = WFAPost(context: context)
         updatedPost.status = PostStatus.published.rawValue
         updatedPost.hasNewerRemoteCopy = true
 
         return PostEditorStatusToolbarView(post: updatedPost)
             .environmentObject(model)
     }
 }
 
 struct PESTView_DeletedRemoteCopyPreviews: PreviewProvider {
     static var previews: some View {
         let context = LocalStorageManager.persistentContainer.viewContext
         let model = WriteFreelyModel()
         let deletedPost = WFAPost(context: context)
         deletedPost.status = PostStatus.published.rawValue
         deletedPost.wasDeletedFromServer = true
 
         return PostEditorStatusToolbarView(post: deletedPost)
             .environmentObject(model)
     }
 }