diff --git a/Classes/Bookmark/BookmarkNavigationController.swift b/Classes/Bookmark/BookmarkNavigationController.swift
index d3dd67922..2e9ac717b 100644
--- a/Classes/Bookmark/BookmarkNavigationController.swift
+++ b/Classes/Bookmark/BookmarkNavigationController.swift
@@ -14,6 +14,7 @@ final class BookmarkNavigationController {
 
     private let store: BookmarkStore
     private let model: Bookmark
+    private static let iconImageInset = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 0)
 
     init?(store: BookmarkStore?, model: Bookmark?) {
         guard let store = store, let model = model else { return nil }
@@ -51,6 +52,7 @@ final class BookmarkNavigationController {
         item.action = selector
         item.isEnabled = true
         item.width = 0
+        item.imageInsets = BookmarkNavigationController.iconImageInset
     }
     
     //for timeframe between viewDidLoad() and bookmark info is loaded 
@@ -58,6 +60,7 @@ final class BookmarkNavigationController {
         let item = UIBarButtonItem()
         item.image = UIImage(named: "nav-bookmark")?.withRenderingMode(.alwaysTemplate)
         item.isEnabled = false
+        item.imageInsets = BookmarkNavigationController.iconImageInset
         return item
     }
     
diff --git a/Classes/Issues/IssuesViewController.swift b/Classes/Issues/IssuesViewController.swift
index 4e55ecfe9..9ebae0347 100644
--- a/Classes/Issues/IssuesViewController.swift
+++ b/Classes/Issues/IssuesViewController.swift
@@ -49,7 +49,6 @@ final class IssuesViewController:
         bottom: 2 * Styles.Sizes.rowSpacing + Styles.Sizes.tableCellHeight,
         right: Styles.Sizes.gutter
     )
-    private let bookmarkIconInset = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 0)
 
     private var needsScrollToBottom = false
     private var lastTimelineElement: ListDiffable?
@@ -199,9 +198,7 @@ final class IssuesViewController:
         messageView.add(contentView: actions)
         
         //show disabled bookmark button until issue has finished loading
-        let disabledNavItem = BookmarkNavigationController.disabledNavigationItem
-        disabledNavItem.imageInsets = bookmarkIconInset
-        navigationItem.rightBarButtonItems = [ moreOptionsItem, disabledNavItem ]
+        navigationItem.rightBarButtonItems = [ moreOptionsItem, BookmarkNavigationController.disabledNavigationItem ]
 
         // insert below so button doesn't appear above autocomplete
         view.insertSubview(manageController.manageButton, belowSubview: messageView)
@@ -264,7 +261,6 @@ final class IssuesViewController:
         guard let rightbarButtonItems = navigationItem.rightBarButtonItems else { return }
         guard let bookmarkItem = rightbarButtonItems.last else { return }
         bookmarkNavController?.configureNavigationItem(bookmarkItem)
-        bookmarkItem.imageInsets = bookmarkIconInset
     }
 
     func viewRepoAction() -> UIAlertAction? {
diff --git a/Classes/Utility/AlertAction.swift b/Classes/Utility/AlertAction.swift
index 76858ed74..063129552 100644
--- a/Classes/Utility/AlertAction.swift
+++ b/Classes/Utility/AlertAction.swift
@@ -34,7 +34,7 @@ struct AlertAction {
             case .shareContent: return NSLocalizedString("Share Content", comment: "")
             case .shareFilePath: return NSLocalizedString("Copy Path", comment: "")
             case .shareFileName: return NSLocalizedString("Copy Name", comment: "")
-            default: return NSLocalizedString("Share", comment: "")
+            case .default: return NSLocalizedString("Share", comment: "")
             }
         }
     }