diff --git a/Base/res/apps/HelloWorld.af b/Base/res/apps/HelloWorld.af
index 1267b4b6bcb..08f60034044 100644
--- a/Base/res/apps/HelloWorld.af
+++ b/Base/res/apps/HelloWorld.af
@@ -1,4 +1,8 @@
 [App]
-Name=HelloWorld
+Name=Hello World
 Executable=/bin/HelloWorld
 Category=Demos
+
+[Icons]
+16x16=/res/icons/16x16/app-hello-world.png
+32x32=
diff --git a/Base/res/apps/LibGfxDemo.af b/Base/res/apps/LibGfxDemo.af
index ca98553cc46..df613aad8a4 100644
--- a/Base/res/apps/LibGfxDemo.af
+++ b/Base/res/apps/LibGfxDemo.af
@@ -2,3 +2,7 @@
 Name=LibGfx Demo
 Executable=/bin/LibGfxDemo
 Category=Demos
+
+[Icons]
+16x16=/res/icons/16x16/app-libgfx-demo.png
+32x32=
diff --git a/Base/res/apps/ThemeEditor.af b/Base/res/apps/ThemeEditor.af
index 64655415e7d..d56873bf4b0 100644
--- a/Base/res/apps/ThemeEditor.af
+++ b/Base/res/apps/ThemeEditor.af
@@ -4,5 +4,5 @@ Executable=/bin/ThemeEditor
 Category=Development
 
 [Icons]
-16x16=/res/icons/16x16/themes.png
+16x16=/res/icons/16x16/app-theme-editor.png
 32x32=
diff --git a/Base/res/apps/VisualBuilder.af b/Base/res/apps/VisualBuilder.af
index c7f9e0fcaec..52db98356f8 100644
--- a/Base/res/apps/VisualBuilder.af
+++ b/Base/res/apps/VisualBuilder.af
@@ -4,7 +4,7 @@ Executable=/bin/VisualBuilder
 Category=Development
 
 [Icons]
-16x16=
+16x16=/res/icons/16x16/app-visual-builder.png
 32x32=/res/icons/32x32/app-visual-builder.png
 
 [Launcher]
diff --git a/Base/res/icons/16x16/app-demo.png b/Base/res/icons/16x16/app-demo.png
deleted file mode 100644
index b0e2faffe2f..00000000000
Binary files a/Base/res/icons/16x16/app-demo.png and /dev/null differ
diff --git a/Base/res/icons/16x16/app-hello-world.png b/Base/res/icons/16x16/app-hello-world.png
new file mode 100644
index 00000000000..b12975d382d
Binary files /dev/null and b/Base/res/icons/16x16/app-hello-world.png differ
diff --git a/Base/res/icons/16x16/app-libgfx-demo.png b/Base/res/icons/16x16/app-libgfx-demo.png
new file mode 100644
index 00000000000..5eca9b90315
Binary files /dev/null and b/Base/res/icons/16x16/app-libgfx-demo.png differ
diff --git a/Base/res/icons/16x16/app-mouse.png b/Base/res/icons/16x16/app-mouse.png
index eaac01e4a37..69ad6202d23 100644
Binary files a/Base/res/icons/16x16/app-mouse.png and b/Base/res/icons/16x16/app-mouse.png differ
diff --git a/Base/res/icons/16x16/app-theme-editor.png b/Base/res/icons/16x16/app-theme-editor.png
new file mode 100644
index 00000000000..92a640a1c5a
Binary files /dev/null and b/Base/res/icons/16x16/app-theme-editor.png differ
diff --git a/Base/res/icons/16x16/app-visual-builder.png b/Base/res/icons/16x16/app-visual-builder.png
new file mode 100644
index 00000000000..05ed06083b1
Binary files /dev/null and b/Base/res/icons/16x16/app-visual-builder.png differ
diff --git a/Base/res/icons/16x16/demos.png b/Base/res/icons/16x16/demos.png
new file mode 100644
index 00000000000..fb7e1a1ebb5
Binary files /dev/null and b/Base/res/icons/16x16/demos.png differ
diff --git a/Base/res/icons/16x16/development.png b/Base/res/icons/16x16/development.png
new file mode 100644
index 00000000000..4d90be3b51a
Binary files /dev/null and b/Base/res/icons/16x16/development.png differ
diff --git a/Base/res/icons/16x16/games.png b/Base/res/icons/16x16/games.png
new file mode 100644
index 00000000000..87136fc79a3
Binary files /dev/null and b/Base/res/icons/16x16/games.png differ
diff --git a/Base/res/icons/16x16/graphics.png b/Base/res/icons/16x16/graphics.png
new file mode 100644
index 00000000000..753f26fe9f3
Binary files /dev/null and b/Base/res/icons/16x16/graphics.png differ
diff --git a/Base/res/icons/16x16/internet.png b/Base/res/icons/16x16/internet.png
new file mode 100644
index 00000000000..2f2bafc0428
Binary files /dev/null and b/Base/res/icons/16x16/internet.png differ
diff --git a/Base/res/icons/16x16/ladybug.png b/Base/res/icons/16x16/ladybug.png
index 0f7ce747ab2..0fa2215de49 100644
Binary files a/Base/res/icons/16x16/ladybug.png and b/Base/res/icons/16x16/ladybug.png differ
diff --git a/Base/res/icons/16x16/multimedia.png b/Base/res/icons/16x16/multimedia.png
new file mode 100644
index 00000000000..a5d95e24ff9
Binary files /dev/null and b/Base/res/icons/16x16/multimedia.png differ
diff --git a/Base/res/icons/16x16/power.png b/Base/res/icons/16x16/power.png
index e9d32e18f20..95ddabe0cb6 100644
Binary files a/Base/res/icons/16x16/power.png and b/Base/res/icons/16x16/power.png differ
diff --git a/Base/res/icons/16x16/settings.png b/Base/res/icons/16x16/settings.png
new file mode 100644
index 00000000000..69a9c99bf79
Binary files /dev/null and b/Base/res/icons/16x16/settings.png differ
diff --git a/Base/res/icons/16x16/themes.png b/Base/res/icons/16x16/themes.png
index 92a640a1c5a..f511578d60a 100644
Binary files a/Base/res/icons/16x16/themes.png and b/Base/res/icons/16x16/themes.png differ
diff --git a/Base/res/icons/16x16/utilities.png b/Base/res/icons/16x16/utilities.png
new file mode 100644
index 00000000000..48bf310299b
Binary files /dev/null and b/Base/res/icons/16x16/utilities.png differ
diff --git a/Base/res/icons/SystemMenu.ini b/Base/res/icons/SystemMenu.ini
index a0454ec0d84..23a83badad8 100644
--- a/Base/res/icons/SystemMenu.ini
+++ b/Base/res/icons/SystemMenu.ini
@@ -1,9 +1,9 @@
 [16x16]
-Demos=/res/icons/16x16/app-demo.png
-#Development=
-#Games=
-#Graphics=
-#Internet=
-Settings=/res/icons/16x16/gear.png
-Sound=/res/icons/16x16/filetype-music.png
-#Utilities=
+Demos=/res/icons/16x16/demos.png
+Development=/res/icons/16x16/development.png
+Games=/res/icons/16x16/games.png
+Graphics=/res/icons/16x16/graphics.png
+Internet=/res/icons/16x16/internet.png
+Settings=/res/icons/16x16/settings.png
+Sound=/res/icons/16x16/multimedia.png
+Utilities=/res/icons/16x16/utilities.png