diff --git a/WordPress/Classes/ViewRelated/Post/PostEditorNavigationBarManager.swift b/WordPress/Classes/ViewRelated/Post/PostEditorNavigationBarManager.swift
index b81d4d5cce67..1cb92d8965d0 100644
--- a/WordPress/Classes/ViewRelated/Post/PostEditorNavigationBarManager.swift
+++ b/WordPress/Classes/ViewRelated/Post/PostEditorNavigationBarManager.swift
@@ -30,7 +30,7 @@ class PostEditorNavigationBarManager {
         cancelButton.rightSpacing = Constants.cancelButtonPadding.right
         cancelButton.setContentHuggingPriority(.required, for: .horizontal)
         cancelButton.accessibilityIdentifier = "editor-close-button"
-        cancelButton.tintColor = .editorPrimary
+        cancelButton.tintColor = UIColor.black
         return cancelButton
     }()
 
@@ -43,6 +43,7 @@ class PostEditorNavigationBarManager {
         button.accessibilityIdentifier = "more_post_options"
         button.addTarget(self, action: #selector(moreWasPressed), for: .touchUpInside)
         button.setContentHuggingPriority(.required, for: .horizontal)
+        button.tintColor = UIColor.black
         return button
     }()
 
@@ -72,7 +73,7 @@ class PostEditorNavigationBarManager {
         button.sizeToFit()
         button.isEnabled = delegate?.isPublishButtonEnabled ?? false
         button.setContentHuggingPriority(.required, for: .horizontal)
-        button.tintColor = .editorPrimary
+        button.tintColor = UIColor.black
         return button
     }()
 
@@ -164,7 +165,7 @@ class PostEditorNavigationBarManager {
     }
 
     var rightBarButtonItems: [UIBarButtonItem] {
-        return [moreBarButtonItem, publishBarButtonItem, separatorButtonItem]
+        return [publishBarButtonItem, separatorButtonItem, moreBarButtonItem]
     }
 
     func reloadPublishButton() {