diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/MediaViewImagePanel.form b/Core/src/org/sleuthkit/autopsy/contentviewers/MediaViewImagePanel.form
index befc6fe7a6..fe7843bf7a 100644
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/MediaViewImagePanel.form
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/MediaViewImagePanel.form
@@ -250,6 +250,16 @@
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalAlignment" type="int" value="4"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
+            <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[61, 21]"/>
+            </Property>
+            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[61, 21]"/>
+            </Property>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[61, 21]"/>
+            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -265,6 +275,17 @@
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
+            <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[61, 21]"/>
+            </Property>
+            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[61, 21]"/>
+            </Property>
+            <Property name="opaque" type="boolean" value="false"/>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[61, 21]"/>
+            </Property>
+            <Property name="rolloverEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/MediaViewImagePanel.java b/Core/src/org/sleuthkit/autopsy/contentviewers/MediaViewImagePanel.java
index bb921a2974..1e039d614a 100644
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/MediaViewImagePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/MediaViewImagePanel.java
@@ -268,7 +268,6 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan
                             tagsGroup = buildImageTagsGroup(contentViewerTags);
                         } catch (TskCoreException | NoCurrentCaseException ex) {
                             LOGGER.log(Level.WARNING, "Could not retrieve image tags for file in case db", ex); //NON-NLS
-                            //TODO - pop dialog
                         }
                         scrollPane.setContent(masterGroup);
                     } else {
@@ -539,6 +538,10 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan
         deleteTagButton.setFocusable(false);
         deleteTagButton.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
         deleteTagButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        deleteTagButton.setMaximumSize(new java.awt.Dimension(61, 21));
+        deleteTagButton.setMinimumSize(new java.awt.Dimension(61, 21));
+        deleteTagButton.setPreferredSize(new java.awt.Dimension(61, 21));
+        deleteTagButton.setRequestFocusEnabled(false);
         deleteTagButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         deleteTagButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -551,6 +554,11 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan
         org.openide.awt.Mnemonics.setLocalizedText(showTagsButton, org.openide.util.NbBundle.getMessage(MediaViewImagePanel.class, "MediaViewImagePanel.showTagsButton.text")); // NOI18N
         showTagsButton.setFocusable(false);
         showTagsButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        showTagsButton.setMaximumSize(new java.awt.Dimension(61, 21));
+        showTagsButton.setMinimumSize(new java.awt.Dimension(61, 21));
+        showTagsButton.setOpaque(false);
+        showTagsButton.setPreferredSize(new java.awt.Dimension(61, 21));
+        showTagsButton.setRolloverEnabled(false);
         showTagsButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         showTagsButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -618,7 +626,6 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan
                 tagsGroup.getChildren().remove(tagInFocus);
             } catch (TskCoreException | NoCurrentCaseException ex) {
                 LOGGER.log(Level.WARNING, "Could not delete image tag in case db", ex); //NON-NLS
-                //TODO pop dialog
             }
 
             scrollPane.setCursor(Cursor.DEFAULT);
@@ -654,7 +661,6 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan
                         tagsGroup.getChildren().add(imageTag);
                     } catch (TskCoreException | SerializationException | NoCurrentCaseException ex) {
                         LOGGER.log(Level.WARNING, "Could not save new image tag in case db", ex); //NON-NLS
-                        //TODO pop dialog
                     }
                     
                     scrollPane.setCursor(Cursor.DEFAULT);
@@ -689,7 +695,6 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan
                 ContentViewerTagManager.updateTag(contentViewerTag, newRegion);
             } catch (SerializationException | TskCoreException | NoCurrentCaseException ex) {
                 LOGGER.log(Level.WARNING, "Could not save edit for image tag in case db", ex); //NON-NLS
-                //TODO pop dialog
             }
             scrollPane.setCursor(Cursor.DEFAULT);
         });