diff --git a/src/identity-server/templates/core/views/api-driven-ui/index.vm b/src/identity-server/templates/core/views/api-driven-ui/index.vm
index db1abfd..4f91edc 100644
--- a/src/identity-server/templates/core/views/api-driven-ui/index.vm
+++ b/src/identity-server/templates/core/views/api-driven-ui/index.vm
@@ -15,18 +15,23 @@
     <meta charset="UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 
-    #set($_cspImgsrc = "img-src 'self' data:;")
+    #if (!$_cspImgsrc)
+        #set($_cspImgsrc = "img-src 'self' data:;")
+    #end
     #parse("fragments/csp")
 
     <title></title>
     <script type="module" crossorigin src="$!_staticResourceRootPath/assets/js/api-driven-ui.js?v=${_cacheBustingHash}"></script>
     <link rel="stylesheet" crossorigin href="$!_staticResourceRootPath/assets/css/api-driven-ui.css?v=${_cacheBustingHash}">
     #if ($_configured_ui_theme_css_path)
-        <link rel="stylesheet" type="text/css" href="${_configured_ui_theme_css_path}?v=${_cacheBustingHash}"/>
+        <link rel="stylesheet" href="${_configured_ui_theme_css_path}"/>
     #end
     #if ($_configured_ui_custom_theme_css_path)
-        <link rel="stylesheet" type="text/css" href="${_configured_ui_custom_theme_css_path}?v=${_cacheBustingHash}">
+        <link rel="stylesheet" href="${_configured_ui_custom_theme_css_path}">
     #end
+
+    <link rel="icon" type="image/png" href="$favicon_path">
+    <link rel="apple-touch-icon" href="$favicon_path">
 </head>
 <body>
 <script $nonceAttr>
@@ -36,6 +41,38 @@
             clientId: '$_apiDrivenClientInfo.clientId',
             tokenEndpoint: '$_apiDrivenClientInfo.tokenEndpoint',
         },
+        theme: {
+            logo: {
+                path: '$!logo_path',
+                isInsideWell: #if ($logo_inside) true #else false #end,
+            },
+        #if ($show_symbol)
+            pageSymbols: {
+                ## Free form mapping of page symbols names to full paths.
+                #macro(pageSymbolPath $jsonKey $variable)
+                    #if($variable)$jsonKey: '$!variable',#end
+                #end
+                paths: {
+                    #pageSymbolPath("authenticate_desktop" $page_symbol_authenticate_desktop)
+                    #pageSymbolPath("authenticate_mobile" $page_symbol_authenticate_mobile)
+                    #pageSymbolPath("authenticate_email" $page_symbol_authenticate_email)
+                    #pageSymbolPath("authenticate_card" $page_symbol_authenticate_card)
+                    #pageSymbolPath("authenticate_sms" $page_symbol_authenticate_sms)
+                    #pageSymbolPath("authenticate_pair_device" $page_symbol_authenticate_pair_device)
+                    #pageSymbolPath("authenticate_htmlform" $page_symbol_authenticate_htmlform)
+                    #pageSymbolPath("authenticate_totp" $page_symbol_authenticate_totp)
+                    #pageSymbolPath("authenticate_bankid" $page_symbol_authenticate_bankid)
+                    #pageSymbolPath("authenticate_webauthn" $page_symbol_authenticate_webauthn)
+                    #pageSymbolPath("authenticate_opt_in_mfa" $page_symbol_authenticate_opt_in_mfa)
+                    #pageSymbolPath("authenticate_passkeys" $page_symbol_authenticate_passkeys)
+                    #pageSymbolPath("authenticate_openid_wallet" $page_symbol_openid_wallet)
+                    #pageSymbolPath("error_generic" $page_symbol_error_generic)
+                },
+                ## Added in case the UI needs to build paths for other page symbols.
+                basePath: '$!page_symbol_path',
+            },
+        #end
+        },
     };
 </script>
 <div id="root"></div>
diff --git a/src/login-web-app/configure-idsvr-dev.sh b/src/login-web-app/configure-idsvr-dev.sh
index 204126c..a8b8c17 100755
--- a/src/login-web-app/configure-idsvr-dev.sh
+++ b/src/login-web-app/configure-idsvr-dev.sh
@@ -53,7 +53,7 @@ EOF
 # Copy the loader template
 
 OVERRIDES_DIR=$IDSVR_HOME/usr/share/templates/overrides
-API_DRIVEN_UI_DIR=$OVERRIDES_DIR/api-driven-ui
+API_DRIVEN_UI_DIR=$OVERRIDES_DIR/views/api-driven-ui
 
 mkdir -p $API_DRIVEN_UI_DIR
 
diff --git a/src/login-web-app/index.html b/src/login-web-app/index.html
index 3d76c9f..7969218 100644
--- a/src/login-web-app/index.html
+++ b/src/login-web-app/index.html
@@ -14,7 +14,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title></title>
+    <title>LWA - Development mode</title>
   </head>
   <body>
     <script>
