diff --git a/apps/ui/static/apple-touch-icon.png b/apps/ui/static/apple-touch-icon.png
new file mode 100644
index 0000000..e088927
Binary files /dev/null and b/apps/ui/static/apple-touch-icon.png differ
diff --git a/apps/ui/static/garage-icon.png b/apps/ui/static/garage-icon.png
new file mode 100644
index 0000000..feab56b
Binary files /dev/null and b/apps/ui/static/garage-icon.png differ
diff --git a/apps/ui/templates/garage.html b/apps/ui/templates/garage.html
index 3bf2da8..b80f702 100644
--- a/apps/ui/templates/garage.html
+++ b/apps/ui/templates/garage.html
@@ -6,8 +6,8 @@
     <title>Garage - Home Automation</title>
     
     <!-- Apple Touch Icon -->
-    <link rel="apple-touch-icon" sizes="180x180" href="/static/garage-icon.svg">
-    <link rel="icon" type="image/svg+xml" href="/static/garage-icon.svg">
+    <link rel="apple-touch-icon" sizes="180x180" href="/static/garage-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/static/garage-icon.png">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="Garage">
diff --git a/apps/ui/templates/rooms.html b/apps/ui/templates/rooms.html
index 50e3c19..9dfdcff 100644
--- a/apps/ui/templates/rooms.html
+++ b/apps/ui/templates/rooms.html
@@ -6,8 +6,8 @@
     <title>Räume - Home Automation</title>
     
     <!-- Apple Touch Icon -->
-    <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.svg">
-    <link rel="icon" type="image/svg+xml" href="/static/apple-touch-icon.svg">
+    <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/static/apple-touch-icon.png">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="Home Automation">
diff --git a/icon-generator.html b/icon-generator.html
new file mode 100644
index 0000000..8cadbd5
--- /dev/null
+++ b/icon-generator.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Icon Generator</title>
+</head>
+<body>
+    <canvas id="homeCanvas" width="180" height="180" style="border: 1px solid #ccc;"></canvas>
+    <canvas id="garageCanvas" width="180" height="180" style="border: 1px solid #ccc;"></canvas>
+    <br><br>
+    <button onclick="downloadHome()">Download Home Icon</button>
+    <button onclick="downloadGarage()">Download Garage Icon</button>
+
+    <script>
+        // Home Icon
+        const homeCanvas = document.getElementById('homeCanvas');
+        const homeCtx = homeCanvas.getContext('2d');
+        
+        // Fill background
+        homeCtx.fillStyle = '#667EEA';
+        homeCtx.fillRect(0, 0, 180, 180);
+        
+        // Add house emoji
+        homeCtx.font = '80px Arial';
+        homeCtx.fillStyle = 'white';
+        homeCtx.textAlign = 'center';
+        homeCtx.textBaseline = 'middle';
+        homeCtx.fillText('🏡', 90, 90);
+
+        // Garage Icon
+        const garageCanvas = document.getElementById('garageCanvas');
+        const garageCtx = garageCanvas.getContext('2d');
+        
+        // Fill background
+        garageCtx.fillStyle = '#667EEA';
+        garageCtx.fillRect(0, 0, 180, 180);
+        
+        // Add car emoji
+        garageCtx.font = '80px Arial';
+        garageCtx.fillStyle = 'white';
+        garageCtx.textAlign = 'center';
+        garageCtx.textBaseline = 'middle';
+        garageCtx.fillText('🚗', 90, 90);
+
+        function downloadHome() {
+            const link = document.createElement('a');
+            link.download = 'apple-touch-icon.png';
+            link.href = homeCanvas.toDataURL();
+            link.click();
+        }
+
+        function downloadGarage() {
+            const link = document.createElement('a');
+            link.download = 'garage-icon.png';
+            link.href = garageCanvas.toDataURL();
+            link.click();
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
