diff --git a/img/icons/alarm.png b/img/icons/alarm.png
new file mode 100644
index 000000000..040eaa1be
--- /dev/null
+++ b/img/icons/alarm.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:443f24dec250a880139361df254f22759bf175198ad7a65f4910d61cebef8509
+size 5345
diff --git a/img/icons/brickbreaker.png b/img/icons/brickbreaker.png
new file mode 100644
index 000000000..a7311a52d
--- /dev/null
+++ b/img/icons/brickbreaker.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab1751aeea6004a7981dfc334dbd64a60f5ba32b52f99906a45301a56216cc54
+size 5094
diff --git a/img/icons/calculator.png b/img/icons/calculator.png
new file mode 100644
index 000000000..3029b99b3
--- /dev/null
+++ b/img/icons/calculator.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cebad84e52855d53a4ee7e9426610f1e88276ba564c840b177e2d00681a89f22
+size 4919
diff --git a/img/icons/settings.png b/img/icons/settings.png
new file mode 100644
index 000000000..cabf434dc
--- /dev/null
+++ b/img/icons/settings.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ea7afdafaad517fe6f4a5cb77ff28cf513cd31083407aa572e92d53ef2ab82e
+size 5648
diff --git a/img/icons/snake.png b/img/icons/snake.png
new file mode 100644
index 000000000..04dbcfa35
--- /dev/null
+++ b/img/icons/snake.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99edd29fe2ebc041cb367d9f69dc353bf471c7f2f0a245e49749bd1e6b9370d3
+size 4862
diff --git a/img/icons/stopwatch.png b/img/icons/stopwatch.png
new file mode 100644
index 000000000..57f9857ef
--- /dev/null
+++ b/img/icons/stopwatch.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:774a2498cce0c63a0161ccb4f4bf309ffc6320c925e406941cb7f16da7d23e48
+size 5118
diff --git a/img/icons/time.png b/img/icons/time.png
new file mode 100644
index 000000000..0e0e40f33
--- /dev/null
+++ b/img/icons/time.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2195eb68d047e3f2b1a0836604af5635200fa7a129a788a9c9d3652f14f49943
+size 5827
diff --git a/img/icons/timer.png b/img/icons/timer.png
new file mode 100644
index 000000000..1f7429cec
--- /dev/null
+++ b/img/icons/timer.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e59b81aca24d084d1c9b571ebd64f809c4d8cba83878096f00d9e53d210f0cc
+size 5354
diff --git a/img/icons/waterlevel.png b/img/icons/waterlevel.png
new file mode 100644
index 000000000..0fd00d9ca
--- /dev/null
+++ b/img/icons/waterlevel.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4428ba5ffab2a65c1b7a284ffd16cf435b84d00242af1253bb5377bec3ada96
+size 4917
diff --git a/src/main.cpp b/src/main.cpp
index 35ce301ae..6ede638e9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,21 +29,30 @@
 #ifdef OSW_FEATURE_LUA
 #include "./apps/main/luaapp.h"
 #endif
+#include "assets/img/icons/brickbreaker.png.h"
 #include "./apps/games/brick_breaker.h"
+#include "assets/img/icons/snake.png.h"
 #include "./apps/games/snake_game.h"
 #ifdef OSW_FEATURE_WIFI
+#include "assets/img/icons/settings.png.h"
 #include "./apps/tools/OswAppWebserver.h"
 #endif
+#include "assets/img/icons/stopwatch.png.h"
 #include "./apps/clock/stopwatch.h"
+#include "assets/img/icons/alarm.png.h"
 #include "./apps/clock/OswAppAlarm.h"
+#include "assets/img/icons/timer.png.h"
 #include "./apps/clock/OswAppTimer.h"
+#include "assets/img/icons/calculator.png.h"
 #include "./apps/tools/OswAppCalculator.h"
 #include "./apps/tools/OswAppFlashLight.h"
 #include "./apps/tools/button_test.h"
 #ifndef NDEBUG
 #include "./apps/tools/OswAppPrintDebug.h"
 #endif
+#include "assets/img/icons/time.png.h"
 #include "./apps/tools/OswAppTimeConfig.h"
+#include "assets/img/icons/waterlevel.png.h"
 #include "./apps/tools/OswAppWaterLevel.h"
 #include "./apps/tools/OswAppFitnessStats.h"
 #ifdef OSW_FEATURE_STATS_STEPS
@@ -222,20 +231,20 @@ void loop() {
         static OswAppStopWatch toolStopWatch;
         static OswAppTimer toolTimer;
         static OswAppAlarm toolAlarm;
-        main_mainDrawer.registerApp(LANG_TOOLS, new OswAppV2Compat("osw.tool.sw", "Stopwatch", toolStopWatch));
-        main_mainDrawer.registerApp(LANG_TOOLS, new OswAppV2Compat("osw.tool.tm", "Timer", toolTimer));
-        main_mainDrawer.registerApp(LANG_TOOLS, new OswAppV2Compat("osw.tool.al", "Alarm", toolAlarm));
+        main_mainDrawer.registerApp(LANG_TOOLS, new OswAppV2Compat("osw.tool.sw", "Stopwatch", toolStopWatch, true, stopwatch_png));
+        main_mainDrawer.registerApp(LANG_TOOLS, new OswAppV2Compat("osw.tool.tm", "Timer", toolTimer, true, timer_png));
+        main_mainDrawer.registerApp(LANG_TOOLS, new OswAppV2Compat("osw.tool.al", "Alarm", toolAlarm, true, alarm_png));
 #endif
 #if TOOL_FLASHLIGHT == 1
         main_mainDrawer.registerAppLazy<OswAppFlashLight>(LANG_TOOLS);
 #endif
 #if TOOL_WATERLEVEL == 1
         static OswAppWaterLevel toolWaterLevel;
-        main_mainDrawer.registerApp(LANG_TOOLS, new OswAppV2Compat("osw.tool.wl", "Water Level", toolWaterLevel));
+        main_mainDrawer.registerApp(LANG_TOOLS, new OswAppV2Compat("osw.tool.wl", "Water Level", toolWaterLevel, true, waterlevel_png));
 #endif
 #if TOOL_CALCULATOR == 1
         static OswAppCalculator toolCalculator;
-        main_mainDrawer.registerApp(LANG_TOOLS, new OswAppV2Compat("osw.tool.ca", "Calculator", toolCalculator));
+        main_mainDrawer.registerApp(LANG_TOOLS, new OswAppV2Compat("osw.tool.ca", "Calculator", toolCalculator, true, calculator_png));
 #endif
 
         // Weather
@@ -247,11 +256,11 @@ void loop() {
         // Settings
 #ifdef OSW_FEATURE_WIFI
         static OswAppWebserver configWifi;
-        main_mainDrawer.registerApp(LANG_SETTINGS, new OswAppV2Compat("osw.sets.wifi", "WiFi", configWifi));
+        main_mainDrawer.registerApp(LANG_SETTINGS, new OswAppV2Compat("osw.sets.wifi", "WiFi", configWifi, true, settings_png));
 #endif
 
         static OswAppTimeConfig configTime;
-        main_mainDrawer.registerApp(LANG_SETTINGS, new OswAppV2Compat("osw.sets.time", "Time", configTime));
+        main_mainDrawer.registerApp(LANG_SETTINGS, new OswAppV2Compat("osw.sets.time", "Time", configTime, true, time_png));
 #ifndef NDEBUG
         static OswAppPrintDebug configDebug;
         main_mainDrawer.registerApp(LANG_SETTINGS, new OswAppV2Compat("osw.sets.debug", "Debug", configDebug));
@@ -260,11 +269,11 @@ void loop() {
         // Games
 #if GAME_SNAKE == 1
         static OswAppSnakeGame gameSnake;
-        main_mainDrawer.registerApp(LANG_GAMES, new OswAppV2Compat("osw.game.snake", "Snake", gameSnake));
+        main_mainDrawer.registerApp(LANG_GAMES, new OswAppV2Compat("osw.game.snake", "Snake", gameSnake, true, snake_png));
 #endif
 #if GAME_BRICK_BREAKER == 1
         static OswAppBrickBreaker gameBrickBreaker;
-        main_mainDrawer.registerApp(LANG_GAMES, new OswAppV2Compat("osw.game.brick", "Brick Breaker", gameBrickBreaker));
+        main_mainDrawer.registerApp(LANG_GAMES, new OswAppV2Compat("osw.game.brick", "Brick Breaker", gameBrickBreaker, true, brickbreaker_png));
 #endif
 
 #ifdef OSW_FEATURE_LUA