diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form
index 9871cad4e0..f62c7213d3 100644
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form
+++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form
@@ -2,8 +2,11 @@
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <Properties>
+    <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+      <Dimension value="[32767, 25]"/>
+    </Property>
     <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[93, 23]"/>
+      <Dimension value="[80, 23]"/>
     </Property>
   </Properties>
   <AuxValues>
@@ -21,7 +24,11 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="ingestMessagesButton" alignment="0" pref="93" max="32767" attributes="0"/>
+          <Group type="102" alignment="1" attributes="0">
+              <EmptySpace pref="30" max="32767" attributes="0"/>
+              <Component id="ingestMessagesButton" min="-2" max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
+          </Group>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
@@ -45,12 +52,10 @@
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessagesToolbar.ingestMessagesButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
-        <Property name="alignmentX" type="float" value="0.5"/>
-        <Property name="enabled" type="boolean" value="false"/>
         <Property name="horizontalAlignment" type="int" value="2"/>
         <Property name="horizontalTextPosition" type="int" value="4"/>
         <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[1, 0, 1, 14]"/>
+          <Insets value="[2, 0, 2, 2]"/>
         </Property>
         <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[65, 23]"/>
@@ -58,6 +63,9 @@
         <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[65, 23]"/>
         </Property>
+        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[65, 23]"/>
+        </Property>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="ingestMessagesButtonActionPerformed"/>
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
index d9e75b036a..43c52d8e61 100644
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
+++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
@@ -48,19 +48,19 @@ public class IngestMessagesToolbar extends javax.swing.JPanel {
 
         ingestMessagesButton = new javax.swing.JButton();
 
-        setPreferredSize(new java.awt.Dimension(93, 23));
+        setMaximumSize(new java.awt.Dimension(32767, 25));
+        setPreferredSize(new java.awt.Dimension(80, 23));
 
         ingestMessagesButton.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
         ingestMessagesButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/eye-icon-16.png"))); // NOI18N
         ingestMessagesButton.setText(org.openide.util.NbBundle.getMessage(IngestMessagesToolbar.class, "IngestMessagesToolbar.ingestMessagesButton.text")); // NOI18N
         ingestMessagesButton.setToolTipText(org.openide.util.NbBundle.getMessage(IngestMessagesToolbar.class, "IngestMessagesToolbar.ingestMessagesButton.toolTipText")); // NOI18N
-        ingestMessagesButton.setAlignmentX(0.5F);
-        ingestMessagesButton.setEnabled(false);
         ingestMessagesButton.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
         ingestMessagesButton.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
-        ingestMessagesButton.setMargin(new java.awt.Insets(1, 0, 1, 14));
+        ingestMessagesButton.setMargin(new java.awt.Insets(2, 0, 2, 2));
         ingestMessagesButton.setMaximumSize(new java.awt.Dimension(65, 23));
         ingestMessagesButton.setMinimumSize(new java.awt.Dimension(65, 23));
+        ingestMessagesButton.setPreferredSize(new java.awt.Dimension(65, 23));
         ingestMessagesButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 ingestMessagesButtonActionPerformed(evt);
@@ -71,7 +71,10 @@ public class IngestMessagesToolbar extends javax.swing.JPanel {
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(ingestMessagesButton, javax.swing.GroupLayout.DEFAULT_SIZE, 93, Short.MAX_VALUE)
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                .addContainerGap(30, Short.MAX_VALUE)
+                .addComponent(ingestMessagesButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addGap(10, 10, 10))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)