diff --git a/.gitmodules b/.gitmodules
index 79a6457..fb3154e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,3 +55,6 @@
 [submodule "components/FastLED-idf"]
 	path = components/FastLED-idf
 	url = git@github.com:0xFEEDC0DE64/FastLED-idf.git
+[submodule "components/esp-gui-lib"]
+	path = components/esp-gui-lib
+	url = git@github.com:0xFEEDC0DE64/esp-gui-lib.git
diff --git a/components/esp-gui-lib b/components/esp-gui-lib
new file mode 160000
index 0000000..f4b568f
--- /dev/null
+++ b/components/esp-gui-lib
@@ -0,0 +1 @@
+Subproject commit f4b568f055ac3d0e67e657895736b2cc852540cf
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 91f4c3a..089a511 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -101,7 +101,6 @@ set(headers
     esp_websocket_client.h
     fontinterface.h
     htmltag.h
-    icon.h
     iconinterface.h
     icons/alert.h
     icons/back.h
@@ -188,7 +187,7 @@ set(dependencies
     libsodium freertos nvs_flash esp_http_server esp_https_ota mdns app_update esp_system esp_websocket_client driver
     arduino-esp32 ArduinoJson esp-nimble-cpp FastLED-idf TFT_eSPI
     bobbycar-protocol cpputils cxx-ring-buffer date
-    espasynchttpreq espasyncota espchrono espcpputils esphttpdutils espwifistack expected fmt
+    espasynchttpreq espasyncota espchrono espcpputils esp-gui-lib esphttpdutils espwifistack expected fmt
 )
 
 idf_component_register(
diff --git a/main/icon.h b/main/icon.h
deleted file mode 100644
index eb919a5..0000000
--- a/main/icon.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-namespace {
-template<uint16_t width, uint16_t height>
-struct Icon
-{
-    static constexpr auto WIDTH=width;
-    static constexpr auto HEIGHT=height;
-
-    const unsigned short buffer[width*height];
-};
-}