diff --git a/app/ui/backup_dialog.glade b/app/ui/backup_dialog.glade
index 85619d9e..32749d33 100644
--- a/app/ui/backup_dialog.glade
+++ b/app/ui/backup_dialog.glade
@@ -47,7 +47,7 @@ Author: Dmitriy Yefremov
     <property name="can_focus">False</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
-    <property name="icon_name">extract-archive</property>
+    <property name="icon_name">insert-object</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header_bar">
         <property name="visible">True</property>
@@ -71,7 +71,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="restore_bouquets_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">document-revert-symbolic</property>
+                    <property name="icon_name">document-revert</property>
                   </object>
                 </child>
               </object>
@@ -92,7 +92,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="restore_all_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">edit-select-all-symbolic</property>
+                    <property name="icon_name">edit-select-all</property>
                   </object>
                 </child>
               </object>
@@ -124,7 +124,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="remove_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">user-trash-symbolic</property>
+                    <property name="icon_name">user-trash</property>
                   </object>
                 </child>
               </object>
@@ -247,7 +247,7 @@ Author: Dmitriy Yefremov
   <object class="GtkImage" id="restore_popup_menu_item_image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-revert-to-saved</property>
+    <property name="stock">gtk-select-all</property>
   </object>
   <object class="GtkMenu" id="popup_menu">
     <property name="visible">True</property>
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index 68f8fb81..9c3f3c1c 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -819,8 +819,6 @@ Author: Dmitriy Yefremov
           <object class="GtkSeparator" id="popover_menu_separator2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -994,7 +992,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="download_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">network-transmit-receive-symbolic</property>
+                    <property name="icon_name">network-transmit-receive</property>
                   </object>
                 </child>
               </object>
@@ -1015,7 +1013,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="save_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">document-save-symbolic</property>
+                    <property name="stock">gtk-save</property>
                   </object>
                 </child>
               </object>
@@ -1048,7 +1046,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="filter_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">tools-check-spelling-symbolic</property>
+                    <property name="stock">gtk-spell-check</property>
                   </object>
                 </child>
               </object>
@@ -1069,7 +1067,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="search_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">system-search-symbolic</property>
+                    <property name="stock">gtk-find</property>
                   </object>
                 </child>
               </object>
@@ -1125,7 +1123,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">go-jump-symbolic</property>
+                    <property name="stock">gtk-jump-to</property>
                   </object>
                 </child>
               </object>
@@ -1153,7 +1151,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="edit_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">document-edit-symbolic</property>
+                    <property name="stock">gtk-edit</property>
                   </object>
                 </child>
               </object>
@@ -1175,7 +1173,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="new_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">document-new-symbolic</property>
+                    <property name="stock">gtk-new</property>
                   </object>
                 </child>
               </object>
@@ -1207,7 +1205,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="sat_editor_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">edit-select-all-symbolic</property>
+                    <property name="stock">gtk-select-all</property>
                   </object>
                 </child>
               </object>
@@ -1228,7 +1226,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="picons_downloader_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">insert-image-symbolic</property>
+                    <property name="icon_name">insert-image</property>
                   </object>
                 </child>
               </object>
@@ -1249,7 +1247,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="import_m3u_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">insert-link-symbolic</property>
+                    <property name="icon_name">insert-link</property>
                   </object>
                 </child>
               </object>
@@ -1270,7 +1268,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="backup_tool_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">drive-harddisk-symbolic</property>
+                    <property name="icon_name">insert-object</property>
                   </object>
                 </child>
               </object>
@@ -1481,7 +1479,7 @@ Author: Dmitriy Yefremov
                             <property name="height_request">32</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="primary_icon_name">system-search-symbolic</property>
+                            <property name="primary_icon_stock">gtk-find</property>
                             <property name="primary_icon_activatable">False</property>
                             <property name="primary_icon_sensitive">False</property>
                             <signal name="changed" handler="on_search" swapped="no"/>
@@ -1574,7 +1572,7 @@ Author: Dmitriy Yefremov
                             <property name="height_request">32</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="primary_icon_name">tools-check-spelling-symbolic</property>
+                            <property name="primary_icon_stock">gtk-spell-check</property>
                             <property name="primary_icon_activatable">False</property>
                             <property name="primary_icon_sensitive">False</property>
                             <signal name="search-changed" handler="on_filter_changed" swapped="no"/>