diff --git a/fw-settings/definitions/RuleItem.xml b/fw-settings/definitions/RuleItem.xml
index 7fdbd75..de1ef47 100644
--- a/fw-settings/definitions/RuleItem.xml
+++ b/fw-settings/definitions/RuleItem.xml
@@ -50,6 +50,7 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Edit Firewall rule</property>
         <property name="relief">none</property>
         <signal name="clicked" handler="on_edit_rule" swapped="no"/>
         <child>
@@ -70,6 +71,7 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Delete Firewall rule</property>
         <property name="relief">none</property>
         <signal name="clicked" handler="on_delete_rule" swapped="no"/>
         <child>
diff --git a/fw-settings/definitions/rule_item.go b/fw-settings/definitions/rule_item.go
index 991768f..9b70be0 100644
--- a/fw-settings/definitions/rule_item.go
+++ b/fw-settings/definitions/rule_item.go
@@ -21,6 +21,7 @@ func (*defRuleItem) String() string {
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
+        <property name="margin_left">8</property>
         <property name="margin_right">10</property>
         <property name="xalign">0</property>
       </object>
@@ -59,6 +60,7 @@ func (*defRuleItem) String() string {
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Edit Firewall rule</property>
         <property name="relief">none</property>
         <signal name="clicked" handler="on_edit_rule" swapped="no"/>
         <child>
@@ -79,6 +81,7 @@ func (*defRuleItem) String() string {
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Delete Firewall rule</property>
         <property name="relief">none</property>
         <signal name="clicked" handler="on_delete_rule" swapped="no"/>
         <child>