diff --git a/resources/glade/main.glade b/resources/glade/main.glade
index 67aa83c..b13127e 100644
--- a/resources/glade/main.glade
+++ b/resources/glade/main.glade
@@ -603,52 +603,6 @@
                       <widget class="GtkHBox" id="fileinfo">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <child>
-                          <widget class="GtkVBox" id="thumb_box">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <child>
-                              <widget class="GtkImage" id="thumb">
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xpad">3</property>
-                                <property name="ypad">3</property>
-                                <property name="stock">gtk-missing-image</property>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkVBox" id="vbox3">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <child>
-                                  <widget class="GtkButton" id="remove_thumb">
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip" translatable="yes">Remove thumbnail image</property>
-                                    <property name="label" translatable="yes">Remove</property>
-                                    <property name="response_id">0</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
                         <child>
                           <widget class="GtkScrolledWindow" id="scrolledwindow4">
                             <property name="visible">True</property>
@@ -670,7 +624,26 @@
                               </widget>
                             </child>
                           </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkViewport" id="thumb_box">
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="resize_mode">GTK_RESIZE_QUEUE</property>
+                            <signal name="button_press_event" handler="on_thumb_box_button_press_event"/>
+                            <child>
+                              <widget class="GtkImage" id="thumb">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xpad">3</property>
+                                <property name="ypad">3</property>
+                                <property name="stock">gtk-missing-image</property>
+                                <property name="icon_size">6</property>
+                              </widget>
+                            </child>
+                          </widget>
                           <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -891,6 +864,29 @@
         <signal name="activate" handler="on_add_tag1_activate"/>
       </widget>
     </child>
+    <child>
+      <widget class="GtkMenuItem" id="add_thumb1">
+        <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label" translatable="yes">Add _Thumbnail</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_add_thumb1_activate"/>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkMenuItem" id="remove_thumb1">
+        <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label" translatable="yes">Re_move Thumbnail</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_remove_thumb1_activate"/>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkSeparatorMenuItem" id="separator7">
+        <property name="visible">True</property>
+      </widget>
+    </child>
     <child>
       <widget class="GtkMenuItem" id="add_image1">
         <property name="visible">True</property>
@@ -901,13 +897,22 @@
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="separator7">
+      <widget class="GtkMenuItem" id="remove_image1">
+        <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label" translatable="yes">Rem_ove All Images</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_remove_image1_activate"/>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkSeparatorMenuItem" id="separator8">
         <property name="visible">True</property>
       </widget>
     </child>
     <child>
       <widget class="GtkMenuItem" id="edit2">
-        <property name="sensitive">False</property>
+        <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="label" translatable="yes">_Edit</property>
         <property name="use_underline">True</property>
@@ -967,4 +972,17 @@
       </widget>
     </child>
   </widget>
+  <widget class="GtkMenu" id="th_popup">
+    <property name="visible">True</property>
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <child>
+      <widget class="GtkMenuItem" id="th_delete">
+        <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label" translatable="yes">_Remove Thumbnail</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_th_delete_activate"/>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>