diff --git a/schon/settings/unfold.py b/schon/settings/unfold.py
index 1f9eac98..69d4d1a0 100644
--- a/schon/settings/unfold.py
+++ b/schon/settings/unfold.py
@@ -34,8 +34,8 @@ UNFOLD: dict[str, Any] = {
     "SITE_URL": STOREFRONT_DOMAIN,
     "SITE_TITLE": f"{PROJECT_NAME} Dashboard",
     "SITE_HEADER": PROJECT_NAME,
-    "SITE_LOGO": "favicon.png",
-    "SITE_ICON": "favicon.ico",
+    "SITE_LOGO": lambda request: static("favicon.png"),
+    "SITE_ICON": lambda request: static("favicon.ico"),
     "SITE_SYMBOL": "money",
     "SITE_DROPDOWN": [
         {
diff --git a/scripts/Docker/app-entrypoint.sh b/scripts/Docker/app-entrypoint.sh
index 07a8c203..bdd0e40e 100644
--- a/scripts/Docker/app-entrypoint.sh
+++ b/scripts/Docker/app-entrypoint.sh
@@ -2,6 +2,7 @@
 set -e
 
 uv run manage.py await_services
+uv run manage.py collectstatic --noinput --verbosity 0
 
 if [ "${DEBUG:-0}" = "1" ]; then
   uv run uvicorn --host 0.0.0.0 --port 8000 --reload --log-level debug --ws-ping-interval 20 --ws-ping-timeout 20 schon.asgi:application
diff --git a/scripts/Unix/restart.sh b/scripts/Unix/restart.sh
index 5023ceeb..9b6db910 100755
--- a/scripts/Unix/restart.sh
+++ b/scripts/Unix/restart.sh
@@ -56,13 +56,6 @@ if ! output=$(docker compose exec -T app uv run manage.py search_index --rebuild
   exit 1
 fi
 
-log_info "  → Collecting static files..."
-if ! output=$(docker compose exec -T app uv run manage.py collectstatic --clear --no-input --verbosity 0 2>&1); then
-  log_error "Static files collection failed"
-  echo "$output"
-  exit 1
-fi
-
 log_success "Pre-run tasks completed successfully!"
 
 # Cleanup
diff --git a/scripts/Unix/run.sh b/scripts/Unix/run.sh
index 0702e4ad..2c0ba267 100755
--- a/scripts/Unix/run.sh
+++ b/scripts/Unix/run.sh
@@ -64,13 +64,6 @@ if ! output=$(docker compose exec -T app uv run manage.py search_index --rebuild
   exit 1
 fi
 
-log_info "  → Collecting static files..."
-if ! output=$(docker compose exec -T app uv run manage.py collectstatic --clear --no-input --verbosity 0 2>&1); then
-  log_error "Static files collection failed"
-  echo "$output"
-  exit 1
-fi
-
 log_success "Pre-run tasks completed successfully!"
 
 # Cleanup
diff --git a/scripts/Windows/restart.ps1 b/scripts/Windows/restart.ps1
index fd248985..18f38b53 100644
--- a/scripts/Windows/restart.ps1
+++ b/scripts/Windows/restart.ps1
@@ -69,14 +69,6 @@ if ($LASTEXITCODE -ne 0) {
     exit $LASTEXITCODE
 }
 
-Write-Info "  Collecting static files..."
-$output = docker compose exec -T app uv run manage.py collectstatic --clear --no-input --verbosity 0 2>&1
-if ($LASTEXITCODE -ne 0) {
-    Write-Error-Custom "Static files collection failed"
-    Write-Host $output
-    exit $LASTEXITCODE
-}
-
 Write-Success "Pre-run tasks completed successfully!"
 
 # Cleanup
diff --git a/scripts/Windows/run.ps1 b/scripts/Windows/run.ps1
index 9c75cf3e..e7e57f0b 100644
--- a/scripts/Windows/run.ps1
+++ b/scripts/Windows/run.ps1
@@ -84,14 +84,6 @@ if ($LASTEXITCODE -ne 0) {
     exit $LASTEXITCODE
 }
 
-Write-Info "  Collecting static files..."
-$output = docker compose exec -T app uv run manage.py collectstatic --clear --no-input --verbosity 0 2>&1
-if ($LASTEXITCODE -ne 0) {
-    Write-Error-Custom "Static files collection failed"
-    Write-Host $output
-    exit $LASTEXITCODE
-}
-
 Write-Success "Pre-run tasks completed successfully!"
 
 # Cleanup