diff --git a/ubl-settings-update-mirror-add.glade b/ubl-settings-update-mirror-add.glade
index 46f836b..cb56a6c 100644
--- a/ubl-settings-update-mirror-add.glade
+++ b/ubl-settings-update-mirror-add.glade
@@ -17,7 +17,7 @@
     <property name="width-request">500</property>
     <property name="can-focus">False</property>
     <property name="modal">True</property>
-    <property name="icon-name">com.ublinux.ubl-settings-repomanager</property>
+    <property name="icon-name">com.ublinux.ubl-settings-update</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
@@ -324,7 +324,7 @@ mirrorlist - mirrors file, make sure server URL is NOT included in this file! Si
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="pixel-size">32</property>
-            <property name="icon-name">com.ublinux.ubl-settings-repomanager</property>
+            <property name="icon-name">com.ublinux.ubl-settings-update</property>
           </object>
         </child>
         <child>
diff --git a/ubl-settings-update-mirror-configure.glade b/ubl-settings-update-mirror-configure.glade
index 8a1d477..cd0bd8b 100644
--- a/ubl-settings-update-mirror-configure.glade
+++ b/ubl-settings-update-mirror-configure.glade
@@ -38,7 +38,7 @@
     <property name="width-request">500</property>
     <property name="can-focus">False</property>
     <property name="modal">True</property>
-    <property name="icon-name">com.ublinux.ubl-settings-repomanager</property>
+    <property name="icon-name">com.ublinux.ubl-settings-update</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
@@ -560,7 +560,7 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="pixel-size">32</property>
-            <property name="icon-name">com.ublinux.ubl-settings-repomanager</property>
+            <property name="icon-name">com.ublinux.ubl-settings-update</property>
           </object>
         </child>
         <child>
diff --git a/ubl-settings-update-mirror-path-add.glade b/ubl-settings-update-mirror-path-add.glade
index 167bd1a..2f7c3f7 100644
--- a/ubl-settings-update-mirror-path-add.glade
+++ b/ubl-settings-update-mirror-path-add.glade
@@ -26,10 +26,6 @@
         <property name="receives-default">True</property>
         <property name="tooltip-text" translatable="yes">Remove</property>
         <property name="image">image2</property>
-        <style>
-          <class name="noborder"/>
-          <class name="nobg_active"/>
-        </style>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -80,10 +76,6 @@
         <property name="receives-default">True</property>
         <property name="tooltip-text" translatable="yes">Edit</property>
         <property name="image">image1</property>
-        <style>
-          <class name="noborder"/>
-          <class name="nobg_active"/>
-        </style>
       </object>
       <packing>
         <property name="expand">False</property>
diff --git a/ubl-settings-update-password.glade b/ubl-settings-update-password.glade
index 79105de..d3548a2 100644
--- a/ubl-settings-update-password.glade
+++ b/ubl-settings-update-password.glade
@@ -18,7 +18,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="default-width">450</property>
-    <property name="icon-name">com.ublinux.ubl-settings-usergroups</property>
+    <property name="icon-name">com.ublinux.ubl-settings-update</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
diff --git a/ubl-settings-update-repo-add.glade b/ubl-settings-update-repo-add.glade
index caa9db1..2fe5c9e 100644
--- a/ubl-settings-update-repo-add.glade
+++ b/ubl-settings-update-repo-add.glade
@@ -18,7 +18,7 @@
     <property name="height-request">300</property>
     <property name="can-focus">False</property>
     <property name="modal">True</property>
-    <property name="icon-name">com.ublinux.ubl-settings-repomanager</property>
+    <property name="icon-name">com.ublinux.ubl-settings-update</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
@@ -1061,7 +1061,7 @@ Configuration - configuration path</property>
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="pixel-size">32</property>
-            <property name="icon-name">com.ublinux.ubl-settings-repomanager</property>
+            <property name="icon-name">com.ublinux.ubl-settings-update</property>
           </object>
         </child>
         <child>
diff --git a/ubl-settings-update-repo-path-add.glade b/ubl-settings-update-repo-path-add.glade
index 04856c9..c3fed8f 100644
--- a/ubl-settings-update-repo-path-add.glade
+++ b/ubl-settings-update-repo-path-add.glade
@@ -26,10 +26,6 @@
         <property name="receives-default">True</property>
         <property name="tooltip-text" translatable="yes">Remove</property>
         <property name="image">image2</property>
-        <style>
-          <class name="noborder"/>
-          <class name="nobg_active"/>
-        </style>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -82,10 +78,6 @@
         <property name="receives-default">True</property>
         <property name="tooltip-text" translatable="yes">Edit</property>
         <property name="image">image1</property>
-        <style>
-          <class name="noborder"/>
-          <class name="nobg_active"/>
-        </style>
       </object>
       <packing>
         <property name="expand">False</property>
diff --git a/ubl-settings-update.glade b/ubl-settings-update.glade
index f0abaab..f31a9b6 100644
--- a/ubl-settings-update.glade
+++ b/ubl-settings-update.glade
@@ -522,7 +522,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
               <object class="GtkLabel" id="generalTabLabel">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">Update</property>
+                <property name="label" translatable="yes">System update</property>
               </object>
               <packing>
                 <property name="tab-fill">False</property>