diff --git a/app/ui/satellites_dialog.glade b/app/ui/satellites_dialog.glade
index 16f42bd4..c4cfb61c 100644
--- a/app/ui/satellites_dialog.glade
+++ b/app/ui/satellites_dialog.glade
@@ -2,6 +2,34 @@
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
+  <object class="GtkImage" id="add_menu_icon">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-add</property>
+    <property name="icon_size">3</property>
+  </object>
+  <object class="GtkMenu" id="add_popup_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="add_sat_popoup_menu_item">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Satellite</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_satellite_add" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="add_tr_popoup_menu_item">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Transponder</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_transponder_add" swapped="no"/>
+      </object>
+    </child>
+  </object>
   <object class="GtkListStore" id="fec_store">
     <columns>
       <!-- column-name fec -->
@@ -372,6 +400,7 @@
                   <object class="GtkToolButton" id="load_tool_button">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Open</property>
                     <property name="label" translatable="yes">Load</property>
                     <property name="use_underline">True</property>
                     <property name="stock_id">gtk-open</property>
@@ -396,6 +425,7 @@
                   <object class="GtkToolButton" id="save_tool_button1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Save</property>
                     <property name="label" translatable="yes">Save</property>
                     <property name="use_underline">True</property>
                     <property name="stock_id">gtk-floppy</property>
@@ -417,33 +447,19 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkMenuToolButton" id="add_tool_button">
+                  <object class="GtkToolItem" id="toolitem1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Add</property>
-                    <property name="use_underline">True</property>
-                    <property name="stock_id">gtk-add</property>
-                    <child type="menu">
-                      <object class="GtkMenu" id="menu4">
+                    <child>
+                      <object class="GtkMenuButton" id="add_menu_tool_button">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Add</property>
+                        <property name="popup">add_popup_menu</property>
+                        <property name="direction">none</property>
                         <child>
-                          <object class="GtkMenuItem" id="add_sat_menui_tem">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Satellite</property>
-                            <property name="use_underline">True</property>
-                            <signal name="activate" handler="on_satellite_add" swapped="no"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="add_tr_menui_tem">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Transponder</property>
-                            <property name="use_underline">True</property>
-                            <signal name="activate" handler="on_transponder_add" swapped="no"/>
-                          </object>
+                          <placeholder/>
                         </child>
                       </object>
                     </child>
@@ -457,6 +473,7 @@
                   <object class="GtkToolButton" id="edit_tool_button">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Edit</property>
                     <property name="label" translatable="yes">Edit</property>
                     <property name="use_underline">True</property>
                     <property name="stock_id">gtk-edit</property>
@@ -471,6 +488,8 @@
                   <object class="GtkToolButton" id="remove_tool_button">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Remove</property>
+                    <property name="resize_mode">immediate</property>
                     <property name="label" translatable="yes">Remove</property>
                     <property name="use_underline">True</property>
                     <property name="stock_id">gtk-remove</property>
diff --git a/app/ui/satellites_dialog.py b/app/ui/satellites_dialog.py
index 20db69e9..43213df4 100644
--- a/app/ui/satellites_dialog.py
+++ b/app/ui/satellites_dialog.py
@@ -36,8 +36,12 @@ class SatellitesDialog:
 
         builder = Gtk.Builder()
         builder.add_objects_from_file("app/ui/satellites_dialog.glade",
-                                      ("satellites_editor_dialog", "satellites_tree_store", "popup_menu"))
+                                      ("satellites_editor_dialog", "satellites_tree_store",
+                                       "popup_menu", "add_popup_menu", "add_menu_icon"))
         builder.connect_signals(handlers)
+        # Adding custom image for add_menu_tool_button
+        add_menu_tool_button = builder.get_object("add_menu_tool_button")
+        add_menu_tool_button.set_image(builder.get_object("add_menu_icon"))
 
         self._dialog = builder.get_object("satellites_editor_dialog")
         self._dialog.set_transient_for(transient)
@@ -321,10 +325,11 @@ class TransponderDialog:
             self.init_transponder(transponder)
 
     def run(self):
-        if self._dialog.run() == Gtk.ResponseType.CANCEL:
-            return
-
-        return self.to_transponder()
+        while self._dialog.run() != Gtk.ResponseType.CANCEL:
+            tr = self.to_transponder()
+            if self.is_accept(tr):
+                return tr
+            show_dialog("error_dialog", self._dialog, "Please check your parameters and try again.")
 
     def destroy(self):
         self._dialog.destroy()
@@ -354,6 +359,18 @@ class TransponderDialog:
     def on_entry_changed(self, entry):
         entry.set_name("digit-entry" if self._pattern.search(entry.get_text()) else "GtkEntry")
 
+    def is_accept(self, tr):
+        if self._pattern.search(tr.frequency) or not tr.frequency:
+            return False
+        elif self._pattern.search(tr.symbol_rate) or not tr.symbol_rate:
+            return False
+        elif None in (tr.polarization, tr.fec_inner, tr.system, tr.modulation):
+            return False
+        elif self._pattern.search(tr.pls_code) or self._pattern.search(tr.is_id):
+            return False
+
+        return True
+
 
 class SatelliteDialog:
     """ Shows dialog for adding or edit satellite """