diff --git a/res/screenshot.png b/res/screenshot.png
index c760727..25d88d9 100644
Binary files a/res/screenshot.png and b/res/screenshot.png differ
diff --git a/src/icons/hicolor/scalable/categories/preferences-backgrounds-symbolic.svg b/src/icons/hicolor/scalable/categories/nightthemeswitcher-backgrounds-symbolic.svg
similarity index 100%
rename from src/icons/hicolor/scalable/categories/preferences-backgrounds-symbolic.svg
rename to src/icons/hicolor/scalable/categories/nightthemeswitcher-backgrounds-symbolic.svg
diff --git a/src/icons/hicolor/scalable/categories/preferences-commands-symbolic.svg b/src/icons/hicolor/scalable/categories/nightthemeswitcher-commands-symbolic.svg
similarity index 100%
rename from src/icons/hicolor/scalable/categories/preferences-commands-symbolic.svg
rename to src/icons/hicolor/scalable/categories/nightthemeswitcher-commands-symbolic.svg
diff --git a/src/icons/hicolor/scalable/categories/nightthemeswitcher-cursortheme-symbolic.svg b/src/icons/hicolor/scalable/categories/nightthemeswitcher-cursortheme-symbolic.svg
new file mode 100644
index 0000000..14e98a2
--- /dev/null
+++ b/src/icons/hicolor/scalable/categories/nightthemeswitcher-cursortheme-symbolic.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m5 1c-0.554 0-1 0.446-1 1v8h-1c0-0.554-0.446-1-1-1s-1 0.446-1 1v1 2c0 1.108 0.892 2 2 2h10.002c1.108 0 2.0006-0.892 2-2l-0.001953-5c0-0.554-0.446-1-1-1s-1 0.446-1 1h-1v-1c0-0.554-0.446-1-1-1s-1 0.446-1 1h-1v-1c0-0.554-0.446-1-1-1s-1 0.446-1 1v1h-1v-5c0-0.554-0.446-1-1-1z" fill="#808080" style="paint-order:normal"/></svg>
diff --git a/src/icons/hicolor/scalable/categories/preferences-gtktheme-symbolic.svg b/src/icons/hicolor/scalable/categories/nightthemeswitcher-gtktheme-symbolic.svg
similarity index 100%
rename from src/icons/hicolor/scalable/categories/preferences-gtktheme-symbolic.svg
rename to src/icons/hicolor/scalable/categories/nightthemeswitcher-gtktheme-symbolic.svg
diff --git a/src/icons/hicolor/scalable/categories/preferences-icontheme-symbolic.svg b/src/icons/hicolor/scalable/categories/nightthemeswitcher-icontheme-symbolic.svg
similarity index 100%
rename from src/icons/hicolor/scalable/categories/preferences-icontheme-symbolic.svg
rename to src/icons/hicolor/scalable/categories/nightthemeswitcher-icontheme-symbolic.svg
diff --git a/src/icons/hicolor/scalable/categories/preferences-schedule-symbolic.svg b/src/icons/hicolor/scalable/categories/nightthemeswitcher-schedule-symbolic.svg
similarity index 100%
rename from src/icons/hicolor/scalable/categories/preferences-schedule-symbolic.svg
rename to src/icons/hicolor/scalable/categories/nightthemeswitcher-schedule-symbolic.svg
diff --git a/src/icons/hicolor/scalable/categories/preferences-shelltheme-symbolic.svg b/src/icons/hicolor/scalable/categories/nightthemeswitcher-shelltheme-symbolic.svg
similarity index 100%
rename from src/icons/hicolor/scalable/categories/preferences-shelltheme-symbolic.svg
rename to src/icons/hicolor/scalable/categories/nightthemeswitcher-shelltheme-symbolic.svg
diff --git a/src/icons/hicolor/scalable/categories/preferences-cursortheme-symbolic.svg b/src/icons/hicolor/scalable/categories/preferences-cursortheme-symbolic.svg
deleted file mode 100644
index 0b8ebeb..0000000
--- a/src/icons/hicolor/scalable/categories/preferences-cursortheme-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m6 1c-0.554 0-1 0.446-1 1v8h-1v-1c0-0.554-0.446-1-1-1s-1 0.446-1 1v4c0 1.108 0.892 2 2 2h7c1.108 0 2-0.892 2-2v-6c0-0.554-0.446-1-1-1s-1 0.446-1 1h-1v-1c0-0.554-0.446-1-1-1s-1 0.446-1 1v1h-1v-5c0-0.554-0.446-1-1-1z" fill="#808080" stop-color="#000000" style="paint-order:normal"/></svg>
diff --git a/src/preferences/ui/headerbar.ui b/src/preferences/ui/headerbar.ui
index 790c662..f80753b 100644
--- a/src/preferences/ui/headerbar.ui
+++ b/src/preferences/ui/headerbar.ui
@@ -57,7 +57,7 @@ Author: Romain Vigier
                   <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">preferences-schedule-symbolic</property>
+                    <property name="icon_name">nightthemeswitcher-schedule-symbolic</property>
                     <property name="icon_size">2</property>
                   </object>
                   <packing>
@@ -110,7 +110,7 @@ Author: Romain Vigier
                   <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">preferences-gtktheme-symbolic</property>
+                    <property name="icon_name">nightthemeswitcher-gtktheme-symbolic</property>
                     <property name="icon_size">2</property>
                   </object>
                   <packing>
@@ -163,7 +163,7 @@ Author: Romain Vigier
                   <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">preferences-shelltheme-symbolic</property>
+                    <property name="icon_name">nightthemeswitcher-shelltheme-symbolic</property>
                     <property name="icon_size">2</property>
                   </object>
                   <packing>
@@ -216,7 +216,7 @@ Author: Romain Vigier
                   <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">preferences-icontheme-symbolic</property>
+                    <property name="icon_name">nightthemeswitcher-icontheme-symbolic</property>
                     <property name="icon_size">2</property>
                   </object>
                   <packing>
@@ -269,7 +269,7 @@ Author: Romain Vigier
                   <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">preferences-cursortheme-symbolic</property>
+                    <property name="icon_name">nightthemeswitcher-cursortheme-symbolic</property>
                     <property name="icon_size">2</property>
                   </object>
                   <packing>
@@ -322,7 +322,7 @@ Author: Romain Vigier
                   <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">preferences-backgrounds-symbolic</property>
+                    <property name="icon_name">nightthemeswitcher-backgrounds-symbolic</property>
                     <property name="icon_size">2</property>
                   </object>
                   <packing>
@@ -375,7 +375,7 @@ Author: Romain Vigier
                   <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">preferences-commands-symbolic</property>
+                    <property name="icon_name">nightthemeswitcher-commands-symbolic</property>
                     <property name="icon_size">2</property>
                   </object>
                   <packing>