--- a/data/geany.glade
+++ b/data/geany.glade
@@ -3,6 +3,13 @@
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkIconFactory" id="iconfactory1">
+    <sources>
+      <source stock-id="geany-build" icon-name="geany-build"/>
+      <source stock-id="geany-close-all" icon-name="geany-close-all"/>
+      <source stock-id="geany-save-all" icon-name="geany-save-all"/>
+    </sources>
+  </object>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">3</property>
     <property name="upper">1000</property>
@@ -467,7 +474,7 @@
   <object class="GtkImage" id="image4061">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-close</property>
+    <property name="stock">geany-close-all</property>
     <property name="icon-size">1</property>
   </object>
   <object class="GtkImage" id="image4062">
@@ -671,7 +678,7 @@
   <object class="GtkImage" id="image4057">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-save</property>
+    <property name="stock">geany-save-all</property>
     <property name="icon-size">1</property>
   </object>
   <object class="GtkImage" id="image4058">
@@ -713,6 +720,7 @@
     <property name="type_hint">dialog</property>
     <property name="skip_pager_hint">True</property>
     <property name="has_separator">True</property>
+    <property name="icon_name">geany</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
@@ -5880,6 +5888,20 @@
                               </packing>
                             </child>
                             <child>
+                              <object class="GtkLabel" id="bg_image">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Background image:</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
                               <object class="GtkLabel" id="terminal_scrollback_lines_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
@@ -5887,8 +5909,8 @@
                                 <property name="label" translatable="yes">Scrollback lines:</property>
                               </object>
                               <packing>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
                                 <property name="x_options">GTK_FILL</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
@@ -5901,8 +5923,8 @@
                                 <property name="label" translatable="yes">Shell:</property>
                               </object>
                               <packing>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
+                                <property name="top_attach">5</property>
+                                <property name="bottom_attach">6</property>
                                 <property name="x_options">GTK_FILL</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
@@ -5931,7 +5953,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Sets the backround color of the text in the terminal widget</property>
+                                <property name="tooltip_text" translatable="yes">Sets the background color of the text in the terminal widget</property>
                                 <property name="title" translatable="yes">Color Chooser</property>
                                 <property name="color">#000000000000</property>
                               </object>
@@ -5940,6 +5962,49 @@
                                 <property name="right_attach">3</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="entry_image">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">Sets the path to the background image in the terminal widget</property>
+                                <property name="invisible_char">���</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="button_term_image">
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <child>
+                                  <object class="GtkImage" id="image1337">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="stock">gtk-open</property>
+                                    <property name="icon-size">1</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="left_attach">2</property>
+                                <property name="right_attach">3</property>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                                <property name="x_options">GTK_FILL</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
@@ -5960,8 +6025,8 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">3</property>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
@@ -5979,8 +6044,8 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
+                                <property name="top_attach">5</property>
+                                <property name="bottom_attach">6</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
@@ -6002,8 +6067,8 @@
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
+                                <property name="top_attach">5</property>
+                                <property name="bottom_attach">6</property>
                                 <property name="x_options">GTK_FILL</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
@@ -6366,6 +6431,7 @@
     <property name="type_hint">dialog</property>
     <property name="transient_for">window1</property>
     <property name="has_separator">True</property>
+    <property name="icon_name">geany</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="project_dialog_vbox">
         <property name="visible">True</property>
@@ -7227,6 +7293,7 @@
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Geany</property>
+    <property name="icon_name">geany</property>
     <child internal-child="accessible">
       <object class="AtkObject" id="window1-atkobject">
         <property name="AtkObject::accessible-name" translatable="yes">Geany</property>
@@ -7700,6 +7767,32 @@
                                   </object>
                                 </child>
                                 <child>
+                                  <object class="GtkSeparatorMenuItem" id="separator63">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkMenuItem" id="move_lines_up1">
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" translatable="yes">_Move Line(s) Up</property>
+                                    <property name="use_underline">True</property>
+                                    <signal name="activate" handler="on_move_lines_up1_activate" swapped="no"/>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkMenuItem" id="move_lines_down1">
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" translatable="yes">_Move Line(s) Down</property>
+                                    <property name="use_underline">True</property>
+                                    <signal name="activate" handler="on_move_lines_down1_activate" swapped="no"/>
+                                  </object>
+                                </child>
+                                <child>
                                   <object class="GtkSeparatorMenuItem" id="separator52">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -7747,16 +7840,6 @@
                                     <property name="label" translatable="yes">T_oggle Case of Selection</property>
                                     <property name="use_underline">True</property>
                                     <signal name="activate" handler="on_toggle_case1_activate" swapped="no"/>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkMenuItem" id="transpose_current_line1">
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">_Transpose Current Line</property>
-                                    <property name="use_underline">True</property>
-                                    <signal name="activate" handler="on_transpose_current_line1_activate" swapped="no"/>
                                   </object>
                                 </child>
                                 <child>
@@ -8862,6 +8945,16 @@
                           <object class="GtkSeparatorMenuItem" id="separator8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkMenuItem" id="clone1">
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">_Clone</property>
+                            <property name="use_underline">True</property>
+                            <signal name="activate" handler="on_clone1_activate" swapped="no"/>
                           </object>
                         </child>
                         <child>