diff --git a/app/ui/epg_dialog.glade b/app/ui/epg_dialog.glade
index 8e33f134..7c9815fb 100644
--- a/app/ui/epg_dialog.glade
+++ b/app/ui/epg_dialog.glade
@@ -36,7 +36,7 @@ Author: Dmitriy Yefremov
   <object class="GtkImage" id="apply_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">checkmark</property>
+    <property name="icon_name">document-save-symbolic</property>
     <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="auto_config_image">
diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index f9c57665..84369a6a 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -212,6 +212,7 @@ class Application(Gtk.Application):
         self._bq_name_label = builder.get_object("bq_name_label")
         tool_bar = builder.get_object("top_toolbar")
         self._main_data_box.bind_property("visible", tool_bar, "visible")
+        self._telnet_tool_button = builder.get_object("telnet_tool_button")
         # App info
         self._app_info_box = builder.get_object("app_info_box")
         self._app_info_box.bind_property("visible", self._status_bar_box, "visible", 4)
@@ -333,6 +334,7 @@ class Application(Gtk.Application):
         ac.connect("activate", self.on_telnet_client_show)
         self.add_action(ac)
         self.set_accels_for_action("app.on_telnet_client_show", ["<primary>t"])
+        self._telnet_tool_button.set_visible(True)
 
     def init_keys(self):
         main_handlers = ("on_new_configuration", "on_data_open", "on_download", "on_settings",
@@ -437,6 +439,7 @@ class Application(Gtk.Application):
                 log("No valid [on, off] arguments for -t found!")
                 return 1
             log("Telnet support is {}. Restart the program to apply the settings!".format(t_op))
+            self._settings.save()
 
         self.activate()
         return 0
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index 547ea03a..03d484e1 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -854,6 +854,11 @@ Author: Dmitriy Yefremov
       </object>
     </child>
   </object>
+  <object class="GtkImage" id="telnet_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">network-workgroup-symbolic</property>
+  </object>
   <object class="GtkMenu" id="toolbar_iptv_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -1021,6 +1026,23 @@ Author: Dmitriy Yefremov
                     <property name="position">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkButton" id="telnet_tool_button">
+                    <property name="label" translatable="yes"> </property>
+                    <property name="visible">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Telnet</property>
+                    <property name="action_name">app.on_telnet_client_show</property>
+                    <property name="image">telnet_image</property>
+                    <property name="always_show_image">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkButton" id="save_tool_button">
                     <property name="label" translatable="yes"> </property>
@@ -1035,7 +1057,7 @@ Author: Dmitriy Yefremov
                   <packing>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
                 <child>
@@ -1053,7 +1075,7 @@ Author: Dmitriy Yefremov
                   <packing>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">3</property>
+                    <property name="position">4</property>
                   </packing>
                 </child>
               </object>
diff --git a/app/ui/picons_manager.glade b/app/ui/picons_manager.glade
index cb196d63..86401330 100644
--- a/app/ui/picons_manager.glade
+++ b/app/ui/picons_manager.glade
@@ -35,7 +35,7 @@ Author: Dmitriy Yefremov
   <object class="GtkImage" id="cancel_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">cancel</property>
+    <property name="icon_name">window-close-symbolic</property>
   </object>
   <object class="GtkImage" id="convert_image">
     <property name="visible">True</property>
diff --git a/app/ui/satellites_dialog.glade b/app/ui/satellites_dialog.glade
index 0f1129e4..6d7d5443 100644
--- a/app/ui/satellites_dialog.glade
+++ b/app/ui/satellites_dialog.glade
@@ -384,6 +384,48 @@ Author: Dmitriy Yefremov
       </object>
     </child>
   </object>
+  <object class="GtkImage" id="sat_editor_save_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">document-save-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="sat_editor_update_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">emblem-synchronizing-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="sat_receive_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">network-receive-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="sat_update_cancel_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">window-close-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="sat_update_filter_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">edit-find-replace-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="sat_update_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">emblem-synchronizing-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="sat_update_search_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">edit-find-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
   <object class="GtkTreeStore" id="satellites_tree_store">
     <columns>
       <!-- column-name satelitte -->
@@ -469,6 +511,8 @@ Author: Dmitriy Yefremov
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="tooltip_text" translatable="yes">Save</property>
+                <property name="image">sat_editor_save_image</property>
+                <property name="always_show_image">True</property>
                 <signal name="clicked" handler="on_save" object="satellites_editor_tree_view" swapped="no"/>
               </object>
               <packing>
@@ -484,6 +528,8 @@ Author: Dmitriy Yefremov
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="tooltip_text" translatable="yes">Update</property>
+                <property name="image">sat_editor_update_image</property>
+                <property name="always_show_image">True</property>
                 <signal name="clicked" handler="on_update" swapped="no"/>
               </object>
               <packing>
@@ -1395,6 +1441,8 @@ Author: Dmitriy Yefremov
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Cancel</property>
                     <property name="valign">center</property>
+                    <property name="image">sat_update_cancel_image</property>
+                    <property name="always_show_image">True</property>
                     <signal name="clicked" handler="on_cancel_receive" swapped="no"/>
                   </object>
                   <packing>
@@ -1410,6 +1458,8 @@ Author: Dmitriy Yefremov
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Receive</property>
+                    <property name="image">sat_receive_image</property>
+                    <property name="always_show_image">True</property>
                     <signal name="clicked" handler="on_receive_satellites_list" swapped="no"/>
                   </object>
                   <packing>
@@ -1425,8 +1475,10 @@ Author: Dmitriy Yefremov
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Filter</property>
+                    <property name="image">sat_update_filter_image</property>
+                    <property name="always_show_image">True</property>
                     <signal name="toggled" handler="on_filter_toggled" swapped="no"/>
-                    <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK"/>
+                    <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | Primary"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1441,8 +1493,10 @@ Author: Dmitriy Yefremov
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Find</property>
+                    <property name="image">sat_update_search_image</property>
+                    <property name="always_show_image">True</property>
                     <signal name="toggled" handler="on_find_toggled" swapped="no"/>
-                    <accelerator key="f" signal="clicked"/>
+                    <accelerator key="f" signal="clicked" modifiers="Primary"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1492,6 +1546,8 @@ Author: Dmitriy Yefremov
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Update</property>
                     <property name="valign">center</property>
+                    <property name="image">sat_update_image</property>
+                    <property name="always_show_image">True</property>
                     <signal name="clicked" handler="on_update_satellites_list" swapped="no"/>
                   </object>
                   <packing>
@@ -1580,11 +1636,11 @@ Author: Dmitriy Yefremov
                     <property name="position">2</property>
                   </packing>
                 </child>
+                <style>
+                  <class name="group"/>
+                </style>
               </object>
             </child>
-            <style>
-              <class name="group"/>
-            </style>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/app/ui/satellites_dialog.py b/app/ui/satellites_dialog.py
index 5c9fa190..c64f2bb7 100644
--- a/app/ui/satellites_dialog.py
+++ b/app/ui/satellites_dialog.py
@@ -48,7 +48,8 @@ class SatellitesDialog:
         builder.set_translation_domain(TEXT_DOMAIN)
         builder.add_objects_from_string(get_dialogs_string(_UI_PATH),
                                         ("satellites_editor_window", "satellites_tree_store", "popup_menu",
-                                         "left_header_menu", "popup_menu_add_image", "popup_menu_add_image_2"))
+                                         "left_header_menu", "popup_menu_add_image", "popup_menu_add_image_2",
+                                         "sat_editor_save_image", "sat_editor_update_image"))
         builder.connect_signals(handlers)
 
         self._window = builder.get_object("satellites_editor_window")
@@ -456,7 +457,8 @@ class SatellitesUpdateDialog:
                                       ("satellites_update_window", "update_source_store", "update_sat_list_store",
                                        "update_sat_list_model_filter", "update_sat_list_model_sort", "side_store",
                                        "pos_adjustment", "pos_adjustment2", "satellites_update_popup_menu",
-                                       "remove_selection_image"))
+                                       "remove_selection_image", "sat_update_cancel_image", "sat_receive_image",
+                                       "sat_update_filter_image", "sat_update_search_image", "sat_update_image"))
         builder.connect_signals(handlers)
 
         self._window = builder.get_object("satellites_update_window")
diff --git a/app/ui/settings_dialog.glade b/app/ui/settings_dialog.glade
index a51236b4..836b3fe5 100644
--- a/app/ui/settings_dialog.glade
+++ b/app/ui/settings_dialog.glade
@@ -156,7 +156,7 @@ Author: Dmitriy Yefremov
                 <property name="tooltip_text" translatable="yes">Apply profile settings</property>
                 <property name="valign">center</property>
                 <signal name="clicked" handler="on_apply_profile_settings" swapped="no"/>
-                <accelerator key="s" signal="clicked"/>
+                <accelerator key="s" signal="clicked" modifiers="Primary"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -428,7 +428,7 @@ Author: Dmitriy Yefremov
                                     <property name="use_underline">True</property>
                                     <property name="icon_name">emblem-default</property>
                                     <signal name="clicked" handler="on_profile_set_default" swapped="no"/>
-                                    <accelerator key="d" signal="clicked"/>
+                                    <accelerator key="d" signal="clicked" modifiers="Primary"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1322,6 +1322,7 @@ Author: Dmitriy Yefremov
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Sets the profile folder as default to store picons, backups, etc.</property>
+                        <property name="valign">center</property>
                         <property name="margin_left">5</property>
                         <property name="margin_right">5</property>
                         <property name="margin_top">5</property>
@@ -1346,6 +1347,7 @@ Author: Dmitriy Yefremov
                           <object class="GtkSwitch" id="default_data_paths_switch">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="valign">center</property>
                             <signal name="state-set" handler="on_default_path_mode_switch" swapped="no"/>
                           </object>
                           <packing>