diff --git a/ui/accountgeneraltab.ui b/ui/accountgeneraltab.ui
index 14e799f10dd3578d200b69d95ac2bf2c78e8953d..8b8b01573ba2754fda8bfb66e314187467db51b9 100644
--- a/ui/accountgeneraltab.ui
+++ b/ui/accountgeneraltab.ui
@@ -5,6 +5,7 @@
   <object class="GtkImage" id="image-file">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="xpad">5</property>
     <property name="stock">gtk-file</property>
   </object>
   <template class="AccountGeneralTab" parent="GtkBox">
diff --git a/ui/generalsettingsview.ui b/ui/generalsettingsview.ui
index 169faa18d1912ac70b32691c863b093d3ef18045..0ff60485a4232090d72ac3082d6e926c6076d681 100644
--- a/ui/generalsettingsview.ui
+++ b/ui/generalsettingsview.ui
@@ -4,8 +4,13 @@
   <object class="GtkImage" id="image-folder">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="xpad">5</property>
     <property name="stock">gtk-directory</property>
   </object>
+  <object class="GtkImage" id="image_clear_history">
+    <property name="visible">True</property>
+    <property name="resource">/cx/ring/RingGnome/clear_history</property>
+  </object>
   <object class="GtkAdjustment" id="adjustment_history_duration">
     <property name="value">0</property>
     <property name="lower">0</property>
@@ -152,10 +157,10 @@
                       <object class="GtkBox" id="hbox_file_directory">
                         <property name="visible">True</property>
                         <property name="orientation">horizontal</property>
-                        <property name="spacing">12</property>
+                        <property name="spacing">10</property>
                         <child>
                           <object class="GtkLabel" id="label_file_directory">
-                            <property name="label" translatable="yes">Download folder</property>
+                            <property name="label" translatable="yes">Download folder:</property>
                               <property name="visible">True</property>
                               <property name="can_focus">False</property>
                               <property name="halign">start</property>
@@ -287,9 +292,4 @@
     </packing>
   </child>
 </template>
-
-<object class="GtkImage" id="image_clear_history">
-  <property name="visible">True</property>
-  <property name="resource">/cx/ring/RingGnome/clear_history</property>
-</object>
 </interface>