diff --git a/internal_packages/category-picker/lib/category-picker.cjsx b/internal_packages/category-picker/lib/category-picker.cjsx
index 5cc848514..4c75086da 100644
--- a/internal_packages/category-picker/lib/category-picker.cjsx
+++ b/internal_packages/category-picker/lib/category-picker.cjsx
@@ -56,11 +56,11 @@ class CategoryPicker extends React.Component
     return <span></span> unless @_account
 
     if @_account?.usesLabels()
-      img = "ic-toolbar-tag.png"
+      img = "toolbar-tag.png"
       tooltip = "Apply Labels"
       placeholder = "Label as"
     else if @_account?.usesFolders()
-      img = "ic-toolbar-movetofolder.png"
+      img = "toolbar-movetofolder.png"
       tooltip = "Move to Folder"
       placeholder = "Move to folder"
     else
diff --git a/internal_packages/message-list/lib/thread-toggle-unread-button.cjsx b/internal_packages/message-list/lib/thread-toggle-unread-button.cjsx
index 8782b0b29..8026849e9 100644
--- a/internal_packages/message-list/lib/thread-toggle-unread-button.cjsx
+++ b/internal_packages/message-list/lib/thread-toggle-unread-button.cjsx
@@ -13,7 +13,7 @@ class ThreadToggleUnreadButton extends React.Component
             style={order: -105}
             title="Mark as #{fragment}"
             onClick={@_onClick}>
-      <RetinaImg name="icon-toolbar-markas#{fragment}@2x.png"
+      <RetinaImg name="toolbar-markas#{fragment}.png"
       mode={RetinaImg.Mode.ContentIsMask} />
     </button>
 
diff --git a/internal_packages/thread-list/lib/thread-buttons.cjsx b/internal_packages/thread-list/lib/thread-buttons.cjsx
index 7d980a41d..6a5927e42 100644
--- a/internal_packages/thread-list/lib/thread-buttons.cjsx
+++ b/internal_packages/thread-list/lib/thread-buttons.cjsx
@@ -95,7 +95,7 @@ class ThreadBulkToggleUnreadButton extends React.Component
             className="btn btn-toolbar"
             title="Mark as #{fragment}"
             onClick={@_onClick}>
-      <RetinaImg name="icon-toolbar-markas#{fragment}@2x.png"
+      <RetinaImg name="toolbar-markas#{fragment}.png"
                  mode={RetinaImg.Mode.ContentIsMask} />
     </button>
 
diff --git a/static/images/toolbar/icon-toolbar-markasread@2x.png b/static/images/toolbar/toolbar-markasread@2x.png
similarity index 100%
rename from static/images/toolbar/icon-toolbar-markasread@2x.png
rename to static/images/toolbar/toolbar-markasread@2x.png
diff --git a/static/images/toolbar/icon-toolbar-markasunread@2x.png b/static/images/toolbar/toolbar-markasunread@2x.png
similarity index 100%
rename from static/images/toolbar/icon-toolbar-markasunread@2x.png
rename to static/images/toolbar/toolbar-markasunread@2x.png
diff --git a/static/images/toolbar/ic-toolbar-movetofolder@2x.png b/static/images/toolbar/toolbar-movetofolder@2x.png
similarity index 100%
rename from static/images/toolbar/ic-toolbar-movetofolder@2x.png
rename to static/images/toolbar/toolbar-movetofolder@2x.png
diff --git a/static/images/toolbar/ic-toolbar-tag@2x.png b/static/images/toolbar/toolbar-tag@2x.png
similarity index 100%
rename from static/images/toolbar/ic-toolbar-tag@2x.png
rename to static/images/toolbar/toolbar-tag@2x.png
diff --git a/static/images/toolbar/toolbar-trash@2x.png b/static/images/toolbar/toolbar-trash@2x.png
index 6506eae06..7236dc38a 100644
Binary files a/static/images/toolbar/toolbar-trash@2x.png and b/static/images/toolbar/toolbar-trash@2x.png differ