diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
index 3c0e223064..26b53d47f8 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
@@ -1519,11 +1519,14 @@ public class Case implements SleuthkitCase.ErrorObserver {
 
             if (RuntimeProperties.coreComponentsAreActive()) {
                 // enable these menus
-                CallableSystemAction.get(AddImageAction.class).setEnabled(true);
-                CallableSystemAction.get(CaseCloseAction.class).setEnabled(true);
-                CallableSystemAction.get(CasePropertiesAction.class).setEnabled(true);
-                CallableSystemAction.get(CaseDeleteAction.class).setEnabled(true); // Delete Case menu
-                CallableSystemAction.get(OpenTimelineAction.class).setEnabled(true);
+                SwingUtilities.invokeLater(() -> {
+                    CallableSystemAction.get(AddImageAction.class).setEnabled(true);
+                    CallableSystemAction.get(CaseCloseAction.class).setEnabled(true);
+                    CallableSystemAction.get(CasePropertiesAction.class).setEnabled(true);
+                    CallableSystemAction.get(CaseDeleteAction.class).setEnabled(true); // Delete Case menu
+                    CallableSystemAction.get(OpenTimelineAction.class).setEnabled(true);
+                });
+
                 if (toChangeTo.hasData()) {
                     // open all top components
                     SwingUtilities.invokeLater(() -> {
@@ -1665,7 +1668,7 @@ public class Case implements SleuthkitCase.ErrorObserver {
      * Deletes reports from the case.
      *
      * @param reports        Collection of Report to be deleted from the case.
-     * @param deleteFromDisk No longer supported - ignored. 
+     * @param deleteFromDisk No longer supported - ignored.
      *
      * @throws TskCoreException
      * @deprecated Use deleteReports(Collection<? extends Report> reports)
@@ -1675,5 +1678,5 @@ public class Case implements SleuthkitCase.ErrorObserver {
     public void deleteReports(Collection<? extends Report> reports, boolean deleteFromDisk) throws TskCoreException {
         deleteReports(reports);
     }
-    
+
 }
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index b6a7828a57..cd72a061f9 100644
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -387,7 +387,7 @@
             <file name="org-sleuthkit-autopsy-report-ReportWizardAction.shadow">
                 <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.report.Bundle#Toolbars/Reports/org-sleuthkit-autopsy-report-ReportWizardAction.shadow"/>
                 <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-ReportWizardAction.instance"/>
-                <attr name="position" intvalue="104"/>
+                <attr name="position" intvalue="103"/>
             </file>
         </folder>
         <folder name="Ingest">
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/OpenTimelineAction.java b/Core/src/org/sleuthkit/autopsy/timeline/OpenTimelineAction.java
index 7c16b9da8e..8796c4f7ca 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/OpenTimelineAction.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/OpenTimelineAction.java
@@ -140,7 +140,7 @@ public class OpenTimelineAction extends CallableSystemAction implements Presente
      */
     @Override
     public Component getToolbarPresenter() {
-        ImageIcon icon = new ImageIcon("Core\\src\\org\\sleuthkit\\autopsy\\timeline\\images\\btn_icon_timeline.png"); //NON-NLS
+        ImageIcon icon = new ImageIcon("Core\\src\\org\\sleuthkit\\autopsy\\timeline\\images\\btn_icon_timeline_colorized_26.png"); //NON-NLS
         toolbarButton.setIcon(icon);
         toolbarButton.setText(this.getName());
 
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/images/20140521121247760_easyicon_net_32.png b/Core/src/org/sleuthkit/autopsy/timeline/images/btn_icon_timeline_32.png
similarity index 100%
rename from Core/src/org/sleuthkit/autopsy/timeline/images/20140521121247760_easyicon_net_32.png
rename to Core/src/org/sleuthkit/autopsy/timeline/images/btn_icon_timeline_32.png
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/images/20140521121247760_easyicon_net_32_colorized.png b/Core/src/org/sleuthkit/autopsy/timeline/images/btn_icon_timeline_32_colorized.png
similarity index 100%
rename from Core/src/org/sleuthkit/autopsy/timeline/images/20140521121247760_easyicon_net_32_colorized.png
rename to Core/src/org/sleuthkit/autopsy/timeline/images/btn_icon_timeline_32_colorized.png
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/images/btn_icon_timeline.png b/Core/src/org/sleuthkit/autopsy/timeline/images/btn_icon_timeline_colorized_26.png
similarity index 100%
rename from Core/src/org/sleuthkit/autopsy/timeline/images/btn_icon_timeline.png
rename to Core/src/org/sleuthkit/autopsy/timeline/images/btn_icon_timeline_colorized_26.png
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanelController.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanelController.java
index 28d507619e..3d893fa88a 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanelController.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanelController.java
@@ -31,7 +31,7 @@ import org.openide.util.Lookup;
  */
 @OptionsPanelController.TopLevelRegistration(
         categoryName = "#OptionsCategory_Name_Options",
-        iconBase = "org/sleuthkit/autopsy/imagegallery/images/polaroid_32_silhouette.png",
+        iconBase = "org/sleuthkit/autopsy/imagegallery/images/btn_icon_image_gallery_32.png",
         keywords = "#OptionsCategory_Keywords_Options",
         keywordsCategory = "Options",
         position = 10
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/images/btn_icon_image_gallery.png b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/images/btn_icon_image_gallery_26.png
similarity index 100%
rename from ImageGallery/src/org/sleuthkit/autopsy/imagegallery/images/btn_icon_image_gallery.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imagegallery/images/btn_icon_image_gallery_26.png
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/images/polaroid_32_silhouette.png b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/images/btn_icon_image_gallery_32.png
similarity index 100%
rename from ImageGallery/src/org/sleuthkit/autopsy/imagegallery/images/polaroid_32_silhouette.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imagegallery/images/btn_icon_image_gallery_32.png
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/images/polaroid_48_silhouette.png b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/images/btn_icon_image_gallery_48.png
similarity index 100%
rename from ImageGallery/src/org/sleuthkit/autopsy/imagegallery/images/polaroid_48_silhouette.png
rename to ImageGallery/src/org/sleuthkit/autopsy/imagegallery/images/btn_icon_image_gallery_48.png