diff --git a/app/ui/ftp.glade b/app/ui/ftp.glade
index 4cb7192f..aba361e1 100644
--- a/app/ui/ftp.glade
+++ b/app/ui/ftp.glade
@@ -195,14 +195,14 @@ Author: Dmitriy Yefremov
                         <child>
                           <object class="GtkToggleButton" id="bookmarks_button">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can_focus">False</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Bookmarks</property>
                             <child>
                               <object class="GtkImage" id="bookmark_image">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="icon_name">user-bookmarks</property>
+                                <property name="icon_name">user-bookmarks-symbolic</property>
                               </object>
                             </child>
                           </object>
@@ -216,7 +216,7 @@ Author: Dmitriy Yefremov
                           <object class="GtkButton" id="add_ftp_bookmark_button">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
+                            <property name="can_focus">False</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Add bookmark</property>
                             <signal name="clicked" handler="on_bookmark_add" swapped="no"/>
@@ -224,7 +224,7 @@ Author: Dmitriy Yefremov
                               <object class="GtkImage" id="ftp_remove_button_image1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="icon_name">bookmark-new</property>
+                                <property name="icon_name">bookmark-new-symbolic</property>
                               </object>
                             </child>
                           </object>
diff --git a/app/ui/style.css b/app/ui/style.css
index 08d953a6..2b766984 100644
--- a/app/ui/style.css
+++ b/app/ui/style.css
@@ -1,3 +1,7 @@
+* {
+  -GtkDialog-action-area-border: 6;
+}
+
 #digit-entry {
   border-color: Red;
 }
diff --git a/app/ui/win_style.css b/app/ui/win_style.css
index e7966888..eafc5c9e 100644
--- a/app/ui/win_style.css
+++ b/app/ui/win_style.css
@@ -1,16 +1,11 @@
 * {
-  -GtkDialog-action-area-border: 6;
-}
-
-button {
-  min-height: 24px;
-  min-width: 24px;
-}
-
-entry {
-  min-height: 24px;
+  -GtkDialog-action-area-border: 12;
 }
 
 switch {
- margin-right: 2px;
+  margin-right: 2px;
+}
+
+spinbutton entry {
+  min-height: 16px;
 }