diff --git a/Makefile b/Makefile
index 4856d78..4c98d16 100644
--- a/Makefile
+++ b/Makefile
@@ -137,6 +137,10 @@ install: check uninstall
 	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.lookup-symbolic.svg"
 	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.edit-symbolic.svg"
 	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.lock-symbolic.svg"
+	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.sync-time-symbolic.svg"
+	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.menu-symbolic.svg"
+	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.properties-symbolic.svg"
+	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.source-symbolic.svg"
 	@install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
 	@if [ -z ${DESTDIR} ]; then \
 	    [ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \
diff --git a/icons/com.ublinux.ubl-settings-services.menu-symbolic.svg b/icons/com.ublinux.ubl-settings-services.menu-symbolic.svg
new file mode 100644
index 0000000..f8e628f
--- /dev/null
+++ b/icons/com.ublinux.ubl-settings-services.menu-symbolic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc. --><path d="M448 64c0-17.7-14.3-32-32-32H32C14.3 32 0 46.3 0 64S14.3 96 32 96H416c17.7 0 32-14.3 32-32zm0 256c0-17.7-14.3-32-32-32H32c-17.7 0-32 14.3-32 32s14.3 32 32 32H416c17.7 0 32-14.3 32-32zM0 192c0 17.7 14.3 32 32 32H416c17.7 0 32-14.3 32-32s-14.3-32-32-32H32c-17.7 0-32 14.3-32 32zM448 448c0-17.7-14.3-32-32-32H32c-17.7 0-32 14.3-32 32s14.3 32 32 32H416c17.7 0 32-14.3 32-32z"/></svg>
\ No newline at end of file
diff --git a/icons/com.ublinux.ubl-settings-services.properties-symbolic.svg b/icons/com.ublinux.ubl-settings-services.properties-symbolic.svg
new file mode 100644
index 0000000..93afc13
--- /dev/null
+++ b/icons/com.ublinux.ubl-settings-services.properties-symbolic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc. --><path d="M64 80c-8.8 0-16 7.2-16 16V416c0 8.8 7.2 16 16 16H512c8.8 0 16-7.2 16-16V96c0-8.8-7.2-16-16-16H64zM0 96C0 60.7 28.7 32 64 32H512c35.3 0 64 28.7 64 64V416c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V96zm96 64a32 32 0 1 1 64 0 32 32 0 1 1 -64 0zm104 0c0-13.3 10.7-24 24-24H448c13.3 0 24 10.7 24 24s-10.7 24-24 24H224c-13.3 0-24-10.7-24-24zm0 96c0-13.3 10.7-24 24-24H448c13.3 0 24 10.7 24 24s-10.7 24-24 24H224c-13.3 0-24-10.7-24-24zm0 96c0-13.3 10.7-24 24-24H448c13.3 0 24 10.7 24 24s-10.7 24-24 24H224c-13.3 0-24-10.7-24-24zm-72-64a32 32 0 1 1 0-64 32 32 0 1 1 0 64zM96 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"/></svg>
\ No newline at end of file
diff --git a/icons/com.ublinux.ubl-settings-services.source-symbolic.svg b/icons/com.ublinux.ubl-settings-services.source-symbolic.svg
new file mode 100644
index 0000000..b509606
--- /dev/null
+++ b/icons/com.ublinux.ubl-settings-services.source-symbolic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc. --><path d="M64 464c-8.8 0-16-7.2-16-16V64c0-8.8 7.2-16 16-16H224v80c0 17.7 14.3 32 32 32h80V448c0 8.8-7.2 16-16 16H64zM64 0C28.7 0 0 28.7 0 64V448c0 35.3 28.7 64 64 64H320c35.3 0 64-28.7 64-64V154.5c0-17-6.7-33.3-18.7-45.3L274.7 18.7C262.7 6.7 246.5 0 229.5 0H64zm97 289c9.4-9.4 9.4-24.6 0-33.9s-24.6-9.4-33.9 0L79 303c-9.4 9.4-9.4 24.6 0 33.9l48 48c9.4 9.4 24.6 9.4 33.9 0s9.4-24.6 0-33.9l-31-31 31-31zM257 255c-9.4-9.4-24.6-9.4-33.9 0s-9.4 24.6 0 33.9l31 31-31 31c-9.4 9.4-9.4 24.6 0 33.9s24.6 9.4 33.9 0l48-48c9.4-9.4 9.4-24.6 0-33.9l-48-48z"/></svg>
\ No newline at end of file
diff --git a/icons/com.ublinux.ubl-settings-services.sync-time-symbolic.svg b/icons/com.ublinux.ubl-settings-services.sync-time-symbolic.svg
new file mode 100644
index 0000000..87adb7a
--- /dev/null
+++ b/icons/com.ublinux.ubl-settings-services.sync-time-symbolic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc. --><path d="M75 75L41 41C25.9 25.9 0 36.6 0 57.9V168c0 13.3 10.7 24 24 24H134.1c21.4 0 32.1-25.9 17-41l-30.8-30.8C155 85.5 203 64 256 64c106 0 192 86 192 192s-86 192-192 192c-40.8 0-78.6-12.7-109.7-34.4c-14.5-10.1-34.4-6.6-44.6 7.9s-6.6 34.4 7.9 44.6C151.2 495 201.7 512 256 512c141.4 0 256-114.6 256-256S397.4 0 256 0C185.3 0 121.3 28.7 75 75zm181 53c-13.3 0-24 10.7-24 24V256c0 6.4 2.5 12.5 7 17l72 72c9.4 9.4 24.6 9.4 33.9 0s9.4-24.6 0-33.9l-65-65V152c0-13.3-10.7-24-24-24z"/></svg>
\ No newline at end of file
diff --git a/source/ubl-settings-services.h b/source/ubl-settings-services.h
index df255ee..34ddcd8 100644
--- a/source/ubl-settings-services.h
+++ b/source/ubl-settings-services.h
@@ -93,9 +93,9 @@
 #define update_icon_path "com.ublinux.ubl-settings-services.sync-symbolic"
 #define launch_icon_path "com.ublinux.ubl-settings-services.check-symbolic"
 #define log_icon_path "com.ublinux.ubl-settings-services.lookup-symbolic"
-#define source_icon_path "com.ublinux.ubl-settings-services.play-symbolic"
-#define properties_icon_path "com.ublinux.ubl-settings-services.play-symbolic"
-#define status_icon_path "com.ublinux.ubl-settings-services.play-symbolic"
+#define source_icon_path "com.ublinux.ubl-settings-services.source-symbolic"
+#define properties_icon_path "com.ublinux.ubl-settings-services.properties-symbolic"
+#define status_icon_path "com.ublinux.ubl-settings-services.important-symbolic"
 
 #define reload_systemd_root_command "systemctl daemon-reload"
 #define reexec_systemd_root_command "systemctl daemon-reexec"
diff --git a/ubl-settings-services.glade b/ubl-settings-services.glade
index 7ee5de3..6aca0d2 100644
--- a/ubl-settings-services.glade
+++ b/ubl-settings-services.glade
@@ -108,6 +108,7 @@
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.ubl-settings-services.sync-time-symbolic</property>
   </object>
   <object class="GtkImage" id="image10">
     <property name="visible">True</property>
@@ -127,6 +128,7 @@
   <object class="GtkImage" id="image13">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.ubl-settings-services.sync-time-symbolic</property>
   </object>
   <object class="GtkImage" id="image14">
     <property name="visible">True</property>
@@ -146,10 +148,12 @@
   <object class="GtkImage" id="image17">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.ubl-settings-services.source-symbolic</property>
   </object>
   <object class="GtkImage" id="image18">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.ubl-settings-services.properties-symbolic</property>
   </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
@@ -164,10 +168,12 @@
   <object class="GtkImage" id="image5">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.ubl-settings-services.source-symbolic</property>
   </object>
   <object class="GtkImage" id="image7">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.ubl-settings-services.properties-symbolic</property>
   </object>
   <object class="GtkImage" id="image8">
     <property name="visible">True</property>
@@ -350,7 +356,7 @@
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
-                        <property name="tooltip-text" translatable="yes">Toggle autostart at configuration</property>
+                        <property name="tooltip-text" translatable="yes">Relaunch systemctl</property>
                         <property name="image">image1</property>
                         <style>
                           <class name="thin"/>
@@ -367,7 +373,7 @@
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
-                        <property name="tooltip-text" translatable="yes">Update</property>
+                        <property name="tooltip-text" translatable="yes">Reexec systemctl</property>
                         <property name="image">image8</property>
                         <style>
                           <class name="thin"/>
@@ -396,7 +402,7 @@
                         <property name="sensitive">False</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
-                        <property name="tooltip-text" translatable="yes">Toggle service blocking at configuration</property>
+                        <property name="tooltip-text" translatable="yes">Show service information</property>
                         <property name="image">image3</property>
                         <style>
                           <class name="thin"/>
@@ -414,7 +420,7 @@
                         <property name="sensitive">False</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
-                        <property name="tooltip-text" translatable="yes">Toggle autostart at system</property>
+                        <property name="tooltip-text" translatable="yes">Show service log</property>
                         <property name="image">image4</property>
                         <style>
                           <class name="thin"/>
@@ -432,7 +438,7 @@
                         <property name="sensitive">False</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
-                        <property name="tooltip-text" translatable="yes">Launch/Stop service</property>
+                        <property name="tooltip-text" translatable="yes">Show service source file</property>
                         <property name="image">image5</property>
                         <style>
                           <class name="thin"/>
@@ -450,7 +456,7 @@
                         <property name="sensitive">False</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
-                        <property name="tooltip-text" translatable="yes">Check service log</property>
+                        <property name="tooltip-text" translatable="yes">Show service properties</property>
                         <property name="image">image7</property>
                         <style>
                           <class name="thin"/>
@@ -479,11 +485,13 @@
                         <property name="can-focus">True</property>
                         <property name="focus-on-click">False</property>
                         <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Show...</property>
                         <property name="popup">menu1</property>
                         <child>
                           <object class="GtkImage">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
+                            <property name="icon-name">com.ublinux.ubl-settings-services.menu-symbolic</property>
                           </object>
                         </child>
                         <style>
@@ -906,6 +914,7 @@
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Relaunch systemctl</property>
                         <property name="image">image13</property>
                         <style>
                           <class name="thin"/>
@@ -922,6 +931,7 @@
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Reexec systemctl</property>
                         <property name="image">image14</property>
                         <style>
                           <class name="thin"/>
@@ -950,6 +960,7 @@
                         <property name="sensitive">False</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Show service information</property>
                         <property name="image">image15</property>
                         <style>
                           <class name="thin"/>
@@ -967,6 +978,7 @@
                         <property name="sensitive">False</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Show service log</property>
                         <property name="image">image16</property>
                         <style>
                           <class name="thin"/>
@@ -984,6 +996,7 @@
                         <property name="sensitive">False</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Show service source file</property>
                         <property name="image">image17</property>
                         <style>
                           <class name="thin"/>
@@ -1001,6 +1014,7 @@
                         <property name="sensitive">False</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Show service properties</property>
                         <property name="image">image18</property>
                         <style>
                           <class name="thin"/>