diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index db0f5617..6c8d7026 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -47,7 +47,8 @@ class MainAppWindow:
                          "fav_remove_popup_item")
 
     _FAV_ELEMENTS = ("fav_cut_popup_item", "fav_paste_popup_item", "fav_locate_popup_item", "fav_iptv_popup_item",
-                     "fav_insert_marker_popup_item", "fav_edit_sub_menu_popup_item", "fav_picon_popup_item")
+                     "fav_insert_marker_popup_item", "fav_edit_sub_menu_popup_item", "fav_edit_popup_item",
+                     "fav_picon_popup_item")
 
     _FAV_ENIGMA_ELEMENTS = ("fav_insert_marker_popup_item",)
 
@@ -60,9 +61,9 @@ class MainAppWindow:
                          "services_remove_popup_item", "fav_cut_popup_item", "fav_paste_popup_item",
                          "bouquets_new_popup_item", "bouquets_edit_popup_item", "services_remove_popup_item",
                          "bouquets_remove_popup_item", "fav_remove_popup_item", "hide_tool_button",
-                         "fav_insert_marker_popup_item", "fav_edit_sub_menu_popup_item", "fav_locate_popup_item",
-                         "services_copy_popup_item", "services_picon_popup_item", "fav_picon_popup_item",
-                         "services_add_new_popup_item", "fav_iptv_popup_item")
+                         "fav_insert_marker_popup_item", "fav_edit_popup_item", "fav_edit_sub_menu_popup_item",
+                         "fav_locate_popup_item", "services_copy_popup_item", "services_picon_popup_item",
+                         "fav_picon_popup_item", "services_add_new_popup_item", "fav_iptv_popup_item")
 
     def __init__(self):
         handlers = {"on_close_app": self.on_close_app,
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index c4effedb..2a688a58 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -33,11 +33,6 @@ Author: Dmitriy Yefremov
   <!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
   <!-- interface-copyright 2018 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkImage">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">document-properties</property>
-  </object>
   <object class="GtkMenu" id="bouquets_popup_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -122,7 +117,12 @@ Author: Dmitriy Yefremov
   <object class="GtkImage" id="edit_image_2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-edit</property>
+    <property name="stock">gtk-revert-to-saved</property>
+  </object>
+  <object class="GtkImage" id="extra_edit_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-find-and-replace</property>
   </object>
   <object class="GtkImage" id="fav_iptv_list_config_image">
     <property name="visible">True</property>
@@ -193,11 +193,6 @@ Author: Dmitriy Yefremov
     <property name="can_focus">False</property>
     <property name="stock">gtk-find</property>
   </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-remove</property>
-  </object>
   <object class="GtkImage" id="insert_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -335,6 +330,16 @@ Author: Dmitriy Yefremov
     <property name="can_focus">False</property>
     <property name="icon_name">network-transmit-receive</property>
   </object>
+  <object class="GtkImage" id="new_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-new</property>
+  </object>
+  <object class="GtkImage" id="remova_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-remove</property>
+  </object>
   <object class="GtkMenu" id="fav_popup_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -367,27 +372,27 @@ Author: Dmitriy Yefremov
       </object>
     </child>
     <child>
-      <object class="GtkImageMenuItem" id="fav_edit_sub_menu_popup_item">
+      <object class="GtkImageMenuItem" id="fav_edit_popup_item">
         <property name="label">gtk-edit</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
+        <signal name="activate" handler="on_service_edit" object="fav_tree_view" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="fav_edit_sub_menu_popup_item">
+        <property name="label" translatable="yes">Extra:</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="image">extra_edit_image</property>
+        <property name="use_stock">False</property>
         <property name="always_show_image">True</property>
         <child type="submenu">
           <object class="GtkMenu" id="fav_edit_popoup_menu">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <child>
-              <object class="GtkImageMenuItem" id="fav_edit_popup_item">
-                <property name="label">gtk-edit</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-                <signal name="activate" handler="on_service_edit" object="fav_tree_view" swapped="no"/>
-              </object>
-            </child>
             <child>
               <object class="GtkImageMenuItem" id="fav_rename_popup_item">
                 <property name="label" translatable="yes">Rename for this bouquet</property>
@@ -529,7 +534,7 @@ Author: Dmitriy Yefremov
                 <property name="label" translatable="yes">Remove all unavailable</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="image">image1</property>
+                <property name="image">remova_image</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_remove_all_unavailable" swapped="no"/>
               </object>
@@ -614,11 +619,6 @@ Author: Dmitriy Yefremov
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="new_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-new</property>
-  </object>
   <object class="GtkPopoverMenu" id="right_header_popover_menu">
     <property name="can_focus">False</property>
     <signal name="button-release-event" handler="on_popover_release" swapped="no"/>