diff --git a/src/remote_widget.ui b/src/remote_widget.ui
index f1795d9e..23f8f04b 100755
--- a/src/remote_widget.ui
+++ b/src/remote_widget.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>912</width>
+    <width>937</width>
     <height>552</height>
    </rect>
   </property>
@@ -121,66 +121,6 @@
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QToolButton" name="buttonUpload">
-            <property name="text">
-             <string>&amp;Upload...</string>
-            </property>
-            <property name="toolButtonStyle">
-             <enum>Qt::ToolButtonTextBesideIcon</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="buttonDownload">
-            <property name="text">
-             <string>&amp;Download...</string>
-            </property>
-            <property name="toolButtonStyle">
-             <enum>Qt::ToolButtonTextBesideIcon</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="buttonSize">
-            <property name="text">
-             <string>&amp;Get Size...</string>
-            </property>
-            <property name="toolButtonStyle">
-             <enum>Qt::ToolButtonTextBesideIcon</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="buttonTree">
-            <property name="text">
-             <string>&amp;Tree</string>
-            </property>
-            <property name="toolButtonStyle">
-             <enum>Qt::ToolButtonTextBesideIcon</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="buttonLink">
-            <property name="text">
-             <string>&amp;Link</string>
-            </property>
-            <property name="toolButtonStyle">
-             <enum>Qt::ToolButtonTextBesideIcon</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="buttonExport">
-            <property name="text">
-             <string>E&amp;xport...</string>
-            </property>
-            <property name="toolButtonStyle">
-             <enum>Qt::ToolButtonTextBesideIcon</enum>
-            </property>
-           </widget>
-          </item>
           <item>
            <spacer name="horizontalSpacer">
             <property name="orientation">
@@ -223,6 +163,83 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <layout class="QHBoxLayout" name="buttons_2">
+         <item>
+          <widget class="QToolButton" name="buttonUpload">
+           <property name="text">
+            <string>&amp;Upload...</string>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="buttonDownload">
+           <property name="text">
+            <string>&amp;Download...</string>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="buttonSize">
+           <property name="text">
+            <string>&amp;Get Size...</string>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="buttonTree">
+           <property name="text">
+            <string>&amp;Tree</string>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="buttonLink">
+           <property name="text">
+            <string>&amp;Link</string>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="buttonExport">
+           <property name="text">
+            <string>E&amp;xport...</string>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
        <item>
         <widget class="QLineEdit" name="path">
          <property name="readOnly">
@@ -386,10 +403,6 @@
   <tabstop>buttonPurge</tabstop>
   <tabstop>buttonMount</tabstop>
   <tabstop>buttonStream</tabstop>
-  <tabstop>buttonUpload</tabstop>
-  <tabstop>buttonDownload</tabstop>
-  <tabstop>buttonSize</tabstop>
-  <tabstop>buttonTree</tabstop>
   <tabstop>path</tabstop>
   <tabstop>tree</tabstop>
  </tabstops>