diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
new file mode 100644
index 0000000000..e9394964a2
Binary files /dev/null and b/public/apple-touch-icon.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000000..5dbb129549
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/public/icon-192.png b/public/icon-192.png
new file mode 100644
index 0000000000..ec59c83f1b
Binary files /dev/null and b/public/icon-192.png differ
diff --git a/public/icon-512.png b/public/icon-512.png
new file mode 100644
index 0000000000..1a466bfde6
Binary files /dev/null and b/public/icon-512.png differ
diff --git a/public/icon-maskable-512.png b/public/icon-maskable-512.png
new file mode 100644
index 0000000000..19f8d194ca
Binary files /dev/null and b/public/icon-maskable-512.png differ
diff --git a/public/site.webmanifest b/public/site.webmanifest
new file mode 100644
index 0000000000..f16ea8f718
--- /dev/null
+++ b/public/site.webmanifest
@@ -0,0 +1,14 @@
+{
+    "name": "Coolify",
+    "short_name": "Coolify",
+    "start_url": "/",
+    "scope": "/",
+    "display": "standalone",
+    "background_color": "#101010",
+    "theme_color": "#101010",
+    "icons": [
+        { "src": "/icon-192.png", "type": "image/png", "sizes": "192x192" },
+        { "src": "/icon-512.png", "type": "image/png", "sizes": "512x512" },
+        { "src": "/icon-maskable-512.png", "type": "image/png", "sizes": "512x512", "purpose": "maskable" }
+    ]
+}
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 689b2fa0e8..27ddee9f33 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -156,8 +156,12 @@
     @env('local')
         <link rel="icon" href="{{ asset('coolify-logo-dev-transparent.png') }}" type="image/png" />
     @else
+        <link rel="icon" href="{{ asset('favicon.ico') }}" sizes="32x32" />
         <link rel="icon" href="{{ asset('coolify-logo.svg') }}" type="image/svg+xml" />
     @endenv
+    <link rel="apple-touch-icon" href="{{ asset('apple-touch-icon.png') }}" />
+    <link rel="manifest" href="{{ asset('site.webmanifest') }}" />
+    <meta name="apple-mobile-web-app-title" content="Coolify" />
     <meta name="csrf-token" content="{{ csrf_token() }}">
     @vite(['resources/js/app.js', 'resources/css/app.css'])
     <script>
diff --git a/tests/Feature/AppIconsTest.php b/tests/Feature/AppIconsTest.php
new file mode 100644
index 0000000000..82af3f915c
--- /dev/null
+++ b/tests/Feature/AppIconsTest.php
@@ -0,0 +1,59 @@
+<?php
+
+use App\Models\InstanceSettings;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Once;
+
+uses(RefreshDatabase::class);
+
+test('base layout links the app icons and web manifest', function () {
+    InstanceSettings::query()->forceCreate(['id' => 0]);
+    Once::flush();
+    User::factory()->create();
+
+    $this->get('/login')
+        ->assertSuccessful()
+        ->assertSee('<link rel="apple-touch-icon" href="'.asset('apple-touch-icon.png').'" />', false)
+        ->assertSee('<link rel="manifest" href="'.asset('site.webmanifest').'" />', false)
+        ->assertSee('<meta name="apple-mobile-web-app-title" content="Coolify" />', false);
+});
+
+test('icon files are opaque pngs with the required sizes', function (string $file, int $size) {
+    $image = getimagesize(public_path($file));
+
+    expect($image)->toMatchArray([0 => $size, 1 => $size, 'mime' => 'image/png']);
+})->with([
+    ['apple-touch-icon.png', 180],
+    ['icon-192.png', 192],
+    ['icon-512.png', 512],
+    ['icon-maskable-512.png', 512],
+]);
+
+test('favicon ico contains 16, 32 and 48 pixel images', function () {
+    $ico = file_get_contents(public_path('favicon.ico'));
+    $header = unpack('vreserved/vtype/vcount', $ico);
+    $sizes = collect(range(0, $header['count'] - 1))
+        ->map(fn (int $index) => ord($ico[6 + 16 * $index]))
+        ->all();
+
+    expect($header['type'])->toBe(1)
+        ->and($sizes)->toBe([16, 32, 48]);
+});
+
+test('web manifest lists the pwa icons', function () {
+    $manifest = json_decode(file_get_contents(public_path('site.webmanifest')), true, flags: JSON_THROW_ON_ERROR);
+
+    expect($manifest['name'])->toBe('Coolify')
+        ->and($manifest['display'])->toBe('standalone')
+        ->and(collect($manifest['icons'])->map(fn (array $icon) => [$icon['src'], $icon['sizes'], $icon['purpose'] ?? 'any'])->all())
+        ->toBe([
+            ['/icon-192.png', '192x192', 'any'],
+            ['/icon-512.png', '512x512', 'any'],
+            ['/icon-maskable-512.png', '512x512', 'maskable'],
+        ]);
+
+    foreach ($manifest['icons'] as $icon) {
+        expect(public_path(ltrim($icon['src'], '/')))->toBeFile();
+    }
+});