diff --git a/app/ui/ftp.glade b/app/ui/ftp.glade
index c728cb4b..d822d32c 100644
--- a/app/ui/ftp.glade
+++ b/app/ui/ftp.glade
@@ -584,7 +584,7 @@ Author: Dmitriy Yefremov
         <property name="image">rename_image</property>
         <property name="use_stock">False</property>
         <signal name="activate" handler="on_ftp_edit" object="ftp_name_column_renderer" swapped="no"/>
-        <accelerator key="r" signal="activate" modifiers="Primary"/>
+        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
         <accelerator key="F2" signal="activate"/>
       </object>
     </child>
@@ -633,7 +633,7 @@ Author: Dmitriy Yefremov
         <property name="image">rename_image_2</property>
         <property name="use_stock">False</property>
         <signal name="activate" handler="on_file_edit" object="file_name_column_renderer" swapped="no"/>
-        <accelerator key="r" signal="activate" modifiers="Primary"/>
+        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
         <accelerator key="F2" signal="activate"/>
       </object>
     </child>
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index c3a0102f..987c0782 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -1270,11 +1270,11 @@ Author: Dmitriy Yefremov
           </packing>
         </child>
         <child>
-          <object class="GtkButtonBox" id="tools_button_box">
+          <object class="GtkBox" id="tools_button_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_right">5</property>
-            <property name="layout_style">expand</property>
+            <property name="spacing">1</property>
             <child>
               <object class="GtkToggleButton" id="control_button">
                 <property name="can_focus">True</property>
@@ -1301,8 +1301,8 @@ Author: Dmitriy Yefremov
                 <property name="image">ftp_image</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>