From dbf699c5d23b23af896655f88b25ba753ff74bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lpaczos@duckduckgo.com>
Date: Thu, 14 Aug 2025 12:50:17 +0200
Subject: [PATCH 1/9] update icon, title, and copy in rebranded AI Features
 settings

---
 .../impl/ui/DuckChatSettingsActivity.kt       |  5 ++
 .../src/main/res/drawable/ic_ai_128.xml       | 84 +++++++++++++++++++
 .../main/res/values-bg/strings-duckchat.xml   |  1 -
 .../main/res/values-cs/strings-duckchat.xml   |  1 -
 .../main/res/values-da/strings-duckchat.xml   |  1 -
 .../main/res/values-de/strings-duckchat.xml   |  1 -
 .../main/res/values-el/strings-duckchat.xml   |  1 -
 .../main/res/values-es/strings-duckchat.xml   |  1 -
 .../main/res/values-et/strings-duckchat.xml   |  1 -
 .../main/res/values-fi/strings-duckchat.xml   |  1 -
 .../main/res/values-fr/strings-duckchat.xml   |  1 -
 .../main/res/values-hr/strings-duckchat.xml   |  1 -
 .../main/res/values-hu/strings-duckchat.xml   |  1 -
 .../main/res/values-it/strings-duckchat.xml   |  1 -
 .../main/res/values-lt/strings-duckchat.xml   |  1 -
 .../main/res/values-lv/strings-duckchat.xml   |  1 -
 .../main/res/values-nb/strings-duckchat.xml   |  1 -
 .../main/res/values-nl/strings-duckchat.xml   |  1 -
 .../main/res/values-pl/strings-duckchat.xml   |  1 -
 .../main/res/values-pt/strings-duckchat.xml   |  1 -
 .../main/res/values-ro/strings-duckchat.xml   |  1 -
 .../main/res/values-ru/strings-duckchat.xml   |  1 -
 .../main/res/values-sk/strings-duckchat.xml   |  1 -
 .../main/res/values-sl/strings-duckchat.xml   |  1 -
 .../main/res/values-sv/strings-duckchat.xml   |  1 -
 .../main/res/values-tr/strings-duckchat.xml   |  1 -
 .../src/main/res/values/strings-duckchat.xml  |  2 +-
 27 files changed, 90 insertions(+), 25 deletions(-)
 create mode 100644 duckchat/duckchat-impl/src/main/res/drawable/ic_ai_128.xml

diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/DuckChatSettingsActivity.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/DuckChatSettingsActivity.kt
index 1a03b4843d30..74a76a8a213e 100644
--- a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/DuckChatSettingsActivity.kt
+++ b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/DuckChatSettingsActivity.kt
@@ -19,6 +19,7 @@ package com.duckduckgo.duckchat.impl.ui
 import android.os.Bundle
 import android.view.View
 import android.widget.CompoundButton
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
@@ -107,6 +108,8 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
 
     private fun renderViewState(viewState: ViewState) {
         if (viewState.isRebrandingAiFeaturesEnabled) {
+            binding.includeToolbar.toolbar.title = getString(R.string.duck_chat_title_rebranding)
+            binding.duckChatSettingsIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_ai_128))
             binding.userEnabledDuckChatToggleRebranding.quietlySetIsChecked(viewState.isDuckChatUserEnabled, userEnabledDuckChatToggleListener)
             binding.duckChatSettingsTitle.setText(R.string.duck_chat_title_rebranding)
             binding.userEnabledDuckChatToggle.gone()
@@ -115,6 +118,8 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
             binding.showDuckChatSearchSettingsLink.setPrimaryText(getString(R.string.duck_chat_assist_settings_title_rebranding))
             binding.showDuckChatSearchSettingsLink.setSecondaryText(getString(R.string.duck_chat_assist_settings_description_rebranding))
         } else {
+            binding.includeToolbar.toolbar.title = getString(R.string.duck_ai_paid_settings_title)
+            binding.duckChatSettingsIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.chat_private_128))
             binding.userEnabledDuckChatToggle.quietlySetIsChecked(viewState.isDuckChatUserEnabled, userEnabledDuckChatToggleListener)
             binding.duckChatSettingsTitle.setText(R.string.duck_chat_title)
             binding.userEnabledDuckChatToggle.show()
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/ic_ai_128.xml b/duckchat/duckchat-impl/src/main/res/drawable/ic_ai_128.xml
new file mode 100644
index 000000000000..be9e62673d9f
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/drawable/ic_ai_128.xml
@@ -0,0 +1,84 @@
+<!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="128dp"
+    android:height="96dp"
+    android:viewportWidth="128"
+    android:viewportHeight="96">
+  <path
+      android:pathData="M106.57,34L105.03,33.6C104.74,33.54 104.46,33.26 104.4,32.97L104,31.43C103.89,31.03 103.54,30.8 103.2,30.8C102.8,30.8 102.46,31.09 102.4,31.43L102,32.97C101.94,33.26 101.66,33.54 101.37,33.6L99.83,34C99.43,34.11 99.2,34.46 99.2,34.8C99.2,35.2 99.49,35.54 99.83,35.6L101.37,36C101.66,36.06 101.94,36.34 102,36.63L102.4,38.17C102.51,38.57 102.86,38.8 103.2,38.8C103.6,38.8 103.94,38.51 104,38.17L104.4,36.63C104.46,36.34 104.74,36.06 105.03,36L106.57,35.6C106.97,35.49 107.2,35.14 107.2,34.8C107.2,34.4 106.91,34.06 106.57,34Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#888888"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M112,54C110.9,54 110,54.9 110,56C110,57.1 110.9,58 112,58C113.1,58 114,57.1 114,56C114,54.9 113.1,54 112,54Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#888888"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M26.06,62.8L23.74,62.2C23.31,62.11 22.89,61.69 22.8,61.26L22.2,58.94C22.03,58.34 21.51,58 21,58C20.4,58 19.89,58.43 19.8,58.94L19.2,61.26C19.11,61.69 18.69,62.11 18.26,62.2L15.94,62.8C15.34,62.97 15,63.49 15,64C15,64.6 15.43,65.11 15.94,65.2L18.26,65.8C18.69,65.89 19.11,66.31 19.2,66.74L19.8,69.06C19.97,69.66 20.49,70 21,70C21.6,70 22.11,69.57 22.2,69.06L22.8,66.74C22.89,66.31 23.31,65.89 23.74,65.8L26.06,65.2C26.66,65.03 27,64.51 27,64C27,63.4 26.57,62.89 26.06,62.8Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#888888"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M7.37,42.2L5.83,41.8C5.54,41.74 5.26,41.46 5.2,41.17L4.8,39.63C4.69,39.23 4.34,39 4,39C3.6,39 3.26,39.29 3.2,39.63L2.8,41.17C2.74,41.46 2.46,41.74 2.17,41.8L0.63,42.2C0.23,42.31 0,42.66 0,43C0,43.4 0.29,43.74 0.63,43.8L2.17,44.2C2.46,44.26 2.74,44.54 2.8,44.83L3.2,46.37C3.31,46.77 3.66,47 4,47C4.4,47 4.74,46.71 4.8,46.37L5.2,44.83C5.26,44.54 5.54,44.26 5.83,44.2L7.37,43.8C7.77,43.69 8,43.34 8,43C8,42.6 7.71,42.26 7.37,42.2Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#888888"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M126.5,45C125.68,45 125,45.67 125,46.5C125,47.32 125.68,48 126.5,48C127.32,48 128,47.32 128,46.5C128,45.67 127.32,45 126.5,45Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#888888"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M23,27C21.9,27 21,27.9 21,29C21,30.1 21.9,31 23,31C24.1,31 25,30.1 25,29C25,27.9 24.1,27 23,27Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#888888"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M64.02,24C65.14,24 66.25,24.67 66.59,26L68.07,31.93C70.04,39.83 76.21,46 84.11,47.97L90.04,49.45C91.38,49.79 92.05,50.92 92.04,52.04C92.03,53.15 91.36,54.26 90.04,54.59L84.11,56.07C76.21,58.04 70.04,64.21 68.07,72.11L66.59,78.04C66.25,79.37 65.14,80.04 64.02,80.04C63.86,80.04 63.71,80.03 63.55,80H60V73H60.19L59.97,72.11C58,64.21 51.83,58.04 43.93,56.07L38.01,54.59C36.68,54.26 36.01,53.15 36,52.04C35.99,50.92 36.66,49.79 38.01,49.45L43.93,47.97C51.83,46 58,39.83 59.97,31.93L60.2,31H60V24H64.02Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="64.02"
+          android:startY="80.04"
+          android:endX="64.02"
+          android:endY="24"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF2B55CA"/>
+        <item android:offset="1" android:color="#FF8FABF9"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M57.45,26C57.79,24.67 58.9,24 60.02,24C61.14,24 62.25,24.67 62.59,26L64.07,31.93C66.04,39.83 72.21,46 80.11,47.97L86.04,49.45C87.38,49.79 88.05,50.92 88.04,52.04C88.03,53.15 87.36,54.26 86.04,54.59L80.11,56.07C72.21,58.04 66.04,64.21 64.07,72.11L62.59,78.04C62.25,79.37 61.14,80.04 60.02,80.04C58.9,80.04 57.79,79.37 57.45,78.04L55.97,72.11C54,64.21 47.83,58.04 39.93,56.07L34,54.59C32.68,54.26 32.01,53.15 32,52.04C31.99,50.92 32.66,49.79 34,49.45L39.93,47.97C47.83,46 54,39.83 55.97,31.93L57.45,26Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="60.02"
+          android:startY="80.04"
+          android:endX="60.02"
+          android:endY="24"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF5981F3"/>
+        <item android:offset="1" android:color="#FFA7B7FD"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M84.1,16.7C84.34,15.77 85.66,15.77 85.9,16.7L86.97,20.99C87.47,22.98 89.02,24.53 91.01,25.03L95.3,26.1C96.23,26.34 96.23,27.66 95.3,27.9L91.01,28.97C89.02,29.47 87.47,31.02 86.97,33.01L85.9,37.3C85.66,38.23 84.34,38.23 84.1,37.3L83.03,33.01C82.53,31.02 80.98,29.47 78.99,28.97L74.7,27.9C73.77,27.66 73.77,26.34 74.7,26.1L78.99,25.03C80.98,24.53 82.53,22.98 83.03,20.99L84.1,16.7Z"
+      android:fillColor="#557FF3"/>
+</vector>
diff --git a/duckchat/duckchat-impl/src/main/res/values-bg/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-bg/strings-duckchat.xml
index c834b14ccb1b..1fa5ade74070 100644
--- a/duckchat/duckchat-impl/src/main/res/values-bg/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-bg/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Функции с изкуствен интелект</string>
     <string name="duck_chat_settings_activity_description_rebranding">Функциите на DuckDuckGo AI са поверителни и незадължителни.Вашите данни не се използват за обучение на AI.\n<annotation type="learn_more_link">Научете повече</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Анонимен чат с популярни AI модели на трети страни</string>
     <string name="duck_chat_show_in_heading_rebranding">Преки пътища за Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Настройки за Assist при търсене</string>
     <string name="duck_chat_assist_settings_description_rebranding">Изберете колко често искате да се появяват отговори, подпомагани от изкуствен интелект, в търсенето</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-cs/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-cs/strings-duckchat.xml
index 0c4e95df7165..9f1403dce8c0 100644
--- a/duckchat/duckchat-impl/src/main/res/values-cs/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-cs/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Funkce AI</string>
     <string name="duck_chat_settings_activity_description_rebranding">Funkce AI na DuckDuckGo jsou soukromé a volitelné.Tvoje data se nepoužívají k trénování umělé inteligence.\n<annotation type="learn_more_link">Další informace</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">S populárními AI modely třetích stran můžeš chatovat anonymně</string>
     <string name="duck_chat_show_in_heading_rebranding">Zkratky Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Nastavení vyhledávání s funkcí Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Vyber, jak často chceš, aby se odpovědi s podporou umělé inteligence zobrazovaly ve tvých vyhledáváních</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-da/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-da/strings-duckchat.xml
index ee21ac651ae9..352b1344cb60 100644
--- a/duckchat/duckchat-impl/src/main/res/values-da/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-da/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">AI-funktioner</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo AI-funktioner er private og valgfrie.\nDine data bruges ikke til at træne AI.\n<annotation type="learn_more_link">Læs mere</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Chat anonymt med populære tredjeparts AI-chatmodeller</string>
     <string name="duck_chat_show_in_heading_rebranding">Duck.ai-genveje</string>
     <string name="duck_chat_assist_settings_title_rebranding">Indstillinger for Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Vælg, hvor ofte du vil have AI-assisterede svar til at optræde i dine søgninger</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-de/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-de/strings-duckchat.xml
index d8fce7407d23..07ba0832ac15 100644
--- a/duckchat/duckchat-impl/src/main/res/values-de/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-de/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">KI-Funktionen</string>
     <string name="duck_chat_settings_activity_description_rebranding">Die KI-Funktionen von DuckDuckGo sind privat und optional.\nIhre Daten werden nicht zum Trainieren von KI verwendet.\n<annotation type="learn_more_link">Mehr erfahren</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Chatte anonym mit beliebten KI-Chatmodellen von Drittanbietern</string>
     <string name="duck_chat_show_in_heading_rebranding">Duck.ai-Shortcuts</string>
     <string name="duck_chat_assist_settings_title_rebranding">Such-Assist-Einstellungen</string>
     <string name="duck_chat_assist_settings_description_rebranding">Du kannst auswählen, wie oft KI-gestützte Antworten in deinen Suchergebnissen angezeigt werden sollen.</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-el/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-el/strings-duckchat.xml
index a9a32a6729a3..6e60bad2178a 100644
--- a/duckchat/duckchat-impl/src/main/res/values-el/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-el/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Λειτουργίες τεχνητής νοημοσύνης</string>
     <string name="duck_chat_settings_activity_description_rebranding">Οι λειτουργίες τεχνητής νοημοσύνης του DuckDuckGo είναι ιδιωτικές και προαιρετικές.Τα δεδομένα σας δεν χρησιμοποιούνται για εκπαίδευση της τεχνητής νοημοσύνης.\n<annotation type="learn_more_link">Μάθετε περισσότερα</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Συνομίλησε ανώνυμα με δημοφιλή μοντέλα συνομιλίας μέσω τεχνητής νοημοσύνης, τρίτων μερών</string>
     <string name="duck_chat_show_in_heading_rebranding">Συντομεύσεις Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Ρυθμίσεις αναζήτησης Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Επιλέξτε πόσο συχνά θέλετε να εμφανίζονται οι απαντήσεις που υποστηρίζονται από τεχνητή νοημοσύνη στις αναζητήσεις σας</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-es/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-es/strings-duckchat.xml
index d01cb3e678b6..2059e0d3e0be 100644
--- a/duckchat/duckchat-impl/src/main/res/values-es/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-es/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Características de la IA</string>
     <string name="duck_chat_settings_activity_description_rebranding">Las funciones de IA de DuckDuckGo son privadas y opcionales.Tus datos no se utilizan para entrenar la IA.\n<annotation type="learn_more_link">Más información</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Chatea de forma anónima con modelos de chat de IA populares de terceros</string>
     <string name="duck_chat_show_in_heading_rebranding">Atajos de Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Configuración de Asistente de búsqueda</string>
     <string name="duck_chat_assist_settings_description_rebranding">Elige con qué frecuencia deseas que las respuestas asistidas por IA aparezcan en tus búsquedas</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-et/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-et/strings-duckchat.xml
index 6e60eb7c3c32..23b18213b970 100644
--- a/duckchat/duckchat-impl/src/main/res/values-et/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-et/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">AI funktsioonid</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo tehisintellekti funktsioonid on privaatsed ja valikulised.Sinu andmeid ei kasutata tehisintellekti treenimiseks.\n<annotation type="learn_more_link">Lisateave</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Vestle anonüümselt populaarsete kolmanda osapoole tehisintellekti vestlusmudelitega</string>
     <string name="duck_chat_show_in_heading_rebranding">Duck.ai otseteed</string>
     <string name="duck_chat_assist_settings_title_rebranding">Otsingu Assist seaded</string>
     <string name="duck_chat_assist_settings_description_rebranding">Vali, kui tihti soovid, et AI-toega vastused ilmuksid sinu otsingutesse</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-fi/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-fi/strings-duckchat.xml
index 63323c07bf4a..cc8e01e603ca 100644
--- a/duckchat/duckchat-impl/src/main/res/values-fi/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-fi/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Tekoälyominaisuudet</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGon tekoälyominaisuudet ovat yksityisiä ja valinnaisia.\nTietojasi ei käytetä tekoälyn kouluttamiseen.\n<annotation type="learn_more_link">Lue lisää</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Keskustele nimettömästi suosittujen kolmannen osapuolen tekoälykeskustelumallien kanssa</string>
     <string name="duck_chat_show_in_heading_rebranding">Duck.ai-pikakuvakkeet</string>
     <string name="duck_chat_assist_settings_title_rebranding">Search Assist -asetukset</string>
     <string name="duck_chat_assist_settings_description_rebranding">Valitse, kuinka usein haluat tekoälyavusteisten vastausten näkyvän hauissasi</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-fr/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-fr/strings-duckchat.xml
index 669f5a3b10b0..d6a5984c2de5 100644
--- a/duckchat/duckchat-impl/src/main/res/values-fr/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-fr/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Fonctionnalités de l\'IA</string>
     <string name="duck_chat_settings_activity_description_rebranding">Les fonctionnalités de DuckDuckGo AI sont privées et facultatives.Vos données ne servent pas à entraîner l’IA.\n<annotation type="learn_more_link">En savoir plus</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Discutez anonymement avec des modèles de chat IA tiers populaires</string>
     <string name="duck_chat_show_in_heading_rebranding">Raccourcis Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Paramètres de recherche Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Choisissez la fréquence à laquelle vous souhaitez que les réponses assistées par l\'IA apparaissent dans vos recherches</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-hr/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-hr/strings-duckchat.xml
index c7b1b8be5efe..3ee3ad6ff6fc 100644
--- a/duckchat/duckchat-impl/src/main/res/values-hr/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-hr/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">AI značajke</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo AI značajke privatne su i neobavezne.Tvoji podaci se ne koriste za obuku umjetne inteligencije.\n<annotation type="learn_more_link">Saznaj više</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Anonimno čavrljaj s popularnim modelima umjetne inteligencije trećih strana</string>
     <string name="duck_chat_show_in_heading_rebranding">Duck.ai prečaci</string>
     <string name="duck_chat_assist_settings_title_rebranding">Pretraži postavke Assista</string>
     <string name="duck_chat_assist_settings_description_rebranding">Odaberi koliko često želiš da se odgovori potpomognuti umjetnom inteligencijom pojavljuju u tvojim pretraživanjima</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-hu/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-hu/strings-duckchat.xml
index 24988ad2940f..19f1a2b19e1c 100644
--- a/duckchat/duckchat-impl/src/main/res/values-hu/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-hu/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">AI funkciók</string>
     <string name="duck_chat_settings_activity_description_rebranding">A DuckDuckGo AI-funkciói privátak és opcionálisak.\nAz adataidat nem használjuk fel az AI tanítására.\n<annotation type="learn_more_link">További részletek</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Névtelen csevegés harmadik féltől származó népszerű AI-modellekkel</string>
     <string name="duck_chat_show_in_heading_rebranding">Duck.ai-gyorsparancsok</string>
     <string name="duck_chat_assist_settings_title_rebranding">Keresési asszisztens beállításai</string>
     <string name="duck_chat_assist_settings_description_rebranding">Válaszd ki, milyen gyakran szeretnél mesterséges intelligenciával generált válaszokat látni a kereséseid során</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-it/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-it/strings-duckchat.xml
index f4c6e7ad86aa..59b2b7f68012 100644
--- a/duckchat/duckchat-impl/src/main/res/values-it/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-it/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Funzionalità IA</string>
     <string name="duck_chat_settings_activity_description_rebranding">Le funzionalità AI di DuckDuckGo sono private e opzionali.I tuoi dati non vengono usati per addestrare l\'IA.\n<annotation type="learn_more_link">Scopri di più</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Chatta in forma anonima con i più diffusi modelli di chat AI di terze parti</string>
     <string name="duck_chat_show_in_heading_rebranding">Scorciatoie Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Impostazioni di Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Scegli la frequenza con cui vuoi che le risposte assistite dall\'intelligenza artificiale appaiano nelle tue ricerche</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-lt/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-lt/strings-duckchat.xml
index 3d587326ae12..fd6c971b166f 100644
--- a/duckchat/duckchat-impl/src/main/res/values-lt/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-lt/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">DI funkcijos</string>
     <string name="duck_chat_settings_activity_description_rebranding">„DuckDuckGo“ DI funkcijos yra privačios ir neprivalomos.Nenaudojame jūsų duomenų dirbtinio intelekto mokymui.\n<annotation type="learn_more_link">Sužinokite daugiau</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Kalbėkitės anonimiškai su populiariais trečiųjų šalių DI pokalbių modeliais</string>
     <string name="duck_chat_show_in_heading_rebranding">„Duck.ai“ spartieji klavišai</string>
     <string name="duck_chat_assist_settings_title_rebranding">„Assist“ paieškos nustatymai</string>
     <string name="duck_chat_assist_settings_description_rebranding">Pasirink, kaip dažnai nori, kad tavo paieškose būtų rodomi DI generuojami atsakymai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-lv/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-lv/strings-duckchat.xml
index 3f0300297722..1a736947c096 100644
--- a/duckchat/duckchat-impl/src/main/res/values-lv/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-lv/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Mākslīgā intelekta funkcijas</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo MI funkcijas ir privātas un nav obligātas.Tavi dati netiek izmantoti mākslīgā intelekta apmācībai.\n<annotation type="learn_more_link">Uzzini vairāk</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Tērzē anonīmi ar populāriem trešo personu MI tērzēšanas modeļiem</string>
     <string name="duck_chat_show_in_heading_rebranding">Duck.ai īsceļi</string>
     <string name="duck_chat_assist_settings_title_rebranding">Meklēšanas Assist iestatījumi</string>
     <string name="duck_chat_assist_settings_description_rebranding">Izvēlies, cik bieži tu vēlies, lai MI atbalstītās atbildes parādītos tavos meklējumos.</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-nb/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-nb/strings-duckchat.xml
index f1b37dafc657..635162a4d2a2 100644
--- a/duckchat/duckchat-impl/src/main/res/values-nb/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-nb/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">AI-funksjoner</string>
     <string name="duck_chat_settings_activity_description_rebranding">AI-funksjonene i DuckDuckGo er private og valgfrie.\nDataene dine brukes ikke til å trene AI.\n<annotation type="learn_more_link">Les mer</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Chat anonymt med populære tredjeparts AI-chat-modeller</string>
     <string name="duck_chat_show_in_heading_rebranding">Duck.ai-snarveier</string>
     <string name="duck_chat_assist_settings_title_rebranding">Innstillinger for Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Velg hvor ofte du vil at AI-assisterte svar skal vises i søkene dine</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-nl/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-nl/strings-duckchat.xml
index 7064e0d30285..c7a7cded325f 100644
--- a/duckchat/duckchat-impl/src/main/res/values-nl/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-nl/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">AI-functies</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo AI-functies zijn privé en optioneel.\nJe gegevens worden niet gebruikt om AI te trainen.\n<annotation type="learn_more_link">Meer informatie</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Chat anoniem met populaire AI-chatmodellen van derden</string>
     <string name="duck_chat_show_in_heading_rebranding">Duck.ai-snelkoppelingen</string>
     <string name="duck_chat_assist_settings_title_rebranding">Instellingen voor zoek Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Kies hoe vaak antwoorden op basis van AI in je zoekresultaten moeten worden weergegeven</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-pl/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-pl/strings-duckchat.xml
index 9c51c94543f1..7fbb5199f90e 100644
--- a/duckchat/duckchat-impl/src/main/res/values-pl/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-pl/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Funkcje AI</string>
     <string name="duck_chat_settings_activity_description_rebranding">Funkcje sztucznej inteligencji DuckDuckGo są prywatne i opcjonalne.Twoje dane nie są używane do trenowania AI.\n<annotation type="learn_more_link">Dowiedz się więcej</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Czatuj anonimowo z popularnymi modelami czatu AI innych firm</string>
     <string name="duck_chat_show_in_heading_rebranding">Skróty Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Ustawienia wyszukiwania Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Wybierz, jak często w wyszukiwaniach mają pojawiać się odpowiedzi wspomagane przez sztuczną inteligencję</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-pt/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-pt/strings-duckchat.xml
index 1c341262469a..af4eb458607a 100644
--- a/duckchat/duckchat-impl/src/main/res/values-pt/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-pt/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Funcionalidades de IA</string>
     <string name="duck_chat_settings_activity_description_rebranding">As funcionalidades de IA do DuckDuckGo são privadas e opcionais.Os teus dados não são utilizados para treinar a IA.\n<annotation type="learn_more_link">Sabe mais</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Conversa anonimamente com modelos de chat com IA populares de terceiros</string>
     <string name="duck_chat_show_in_heading_rebranding">Atalhos Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Definições do Assist de pesquisa</string>
     <string name="duck_chat_assist_settings_description_rebranding">Escolhe a frequência com que queres que as respostas assistidas por IA apareçam nas suas pesquisas</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-ro/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-ro/strings-duckchat.xml
index f991e1a26a1c..15ed40b04278 100644
--- a/duckchat/duckchat-impl/src/main/res/values-ro/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-ro/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Caracteristici AI</string>
     <string name="duck_chat_settings_activity_description_rebranding">Funcțiile IA ale DuckDuckGo sunt private și opționale.Datele tale nu sunt folosite pentru a antrena IA.\n<annotation type="learn_more_link">Află mai multe</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Discută anonim cu modele populare de chat IA de la terțe părți</string>
     <string name="duck_chat_show_in_heading_rebranding">Comenzi rapide Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Setări Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Alege cât de des vrei să apară răspunsurile asistate de IA în căutările tale</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-ru/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-ru/strings-duckchat.xml
index 560313e2685a..e1d492c53ccf 100644
--- a/duckchat/duckchat-impl/src/main/res/values-ru/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-ru/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Функции ИИ</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo AI — дополнительный конфиденциальный сервис.\nВаши данные не применяются для обучения ИИ.\n<annotation type="learn_more_link">Подробнее...</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Анонимные чаты с популярными сторонними ИИ-моделями</string>
     <string name="duck_chat_show_in_heading_rebranding">Ярлыки Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Настройки Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Выберите, как часто вы хотите видеть ответы от ИИ в результатах поиска.</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-sk/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-sk/strings-duckchat.xml
index f9fe93028250..796c89529f7f 100644
--- a/duckchat/duckchat-impl/src/main/res/values-sk/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-sk/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Funkcie AI</string>
     <string name="duck_chat_settings_activity_description_rebranding">Funkcie DuckDuckGo AI sú súkromné a voliteľné.\nTvoje údaje sa nepoužívajú na trénovanie umelej inteligencie.\n<annotation type="learn_more_link">Viac informácií</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Chatuj anonymne s populárnymi AI modelmi chatu tretích strán</string>
     <string name="duck_chat_show_in_heading_rebranding">Skratky Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Nastavenia Assist vyhľadávania</string>
     <string name="duck_chat_assist_settings_description_rebranding">Vyber, ako často chceš, aby sa vo vyhľadávaní zobrazovali odpovede podporované AI</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-sl/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-sl/strings-duckchat.xml
index 2e6928bfbabb..11385f25e39f 100644
--- a/duckchat/duckchat-impl/src/main/res/values-sl/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-sl/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">Lastnosti UI</string>
     <string name="duck_chat_settings_activity_description_rebranding">Funkcije umetne inteligence DuckDuckGo so zasebne in izbirne.\nVaši podatki se ne uporabljajo za usposabljanje umetne inteligence.\n<annotation type="learn_more_link">Več o tem</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Anonimno klepetajte s priljubljenimi modeli umetne inteligence tretjih oseb</string>
     <string name="duck_chat_show_in_heading_rebranding">Bližnjice do Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Nastavitve modula Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Izberite, kako pogosto želite, da se odgovori s pomočjo umetne inteligence prikazujejo v vaših iskanjih</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-sv/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-sv/strings-duckchat.xml
index 83744e1fd950..d371f5bc4f1b 100644
--- a/duckchat/duckchat-impl/src/main/res/values-sv/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-sv/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">AI-funktioner</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGos AI-funktioner är privata och valfria.\nDina data används inte för att träna AI.\n<annotation type="learn_more_link">Läs mer</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Chatta anonymt med populära AI-chattmodeller från tredje part</string>
     <string name="duck_chat_show_in_heading_rebranding">Duck.ai-genvägar</string>
     <string name="duck_chat_assist_settings_title_rebranding">Inställningar för Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Välj hur ofta du vill att AI-assisterade svar ska visas i dina sökningar</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-tr/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-tr/strings-duckchat.xml
index 1bae6aa12af8..0a6e193e9f60 100644
--- a/duckchat/duckchat-impl/src/main/res/values-tr/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-tr/strings-duckchat.xml
@@ -64,7 +64,6 @@
     <string name="duck_chat_title_rebranding">AI Özellikleri</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo AI özellikleri gizli ve isteğe bağlıdır.\nVerileriniz yapay zekayı eğitmek için kullanılmaz.\n<annotation type="learn_more_link">Daha Fazla Bilgi</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Popüler üçüncü taraf AI sohbet modelleriyle anonim olarak sohbet edin</string>
     <string name="duck_chat_show_in_heading_rebranding">Duck.ai Kısayolları</string>
     <string name="duck_chat_assist_settings_title_rebranding">Search Assist Ayarları</string>
     <string name="duck_chat_assist_settings_description_rebranding">Yapay zeka destekli yanıtların aramalarınızda ne sıklıkta görünmesini istediğinizi seçin</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml
index 70fc8c42e654..4f2d9e0085f6 100644
--- a/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml
@@ -63,7 +63,7 @@
     <string name="duck_chat_title_rebranding">AI Features</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo AI features are private and optional.\nYour data is not used to train AI.\n<annotation type="learn_more_link">Learn More</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Chat anonymously with popular 3rd-party AI chat models</string>
+    <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Chat privately with popular 3rd-party AI models</string>
     <string name="duck_chat_show_in_heading_rebranding">Duck.ai Shortcuts</string>
     <string name="duck_chat_assist_settings_title_rebranding">Search Assist Settings</string>
     <string name="duck_chat_assist_settings_description_rebranding">Choose how often you want AI-Assisted answers to appear in your searches</string>

From 7c74d85c09f8ea20655fa587293279cd62c7d2ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lpaczos@duckduckgo.com>
Date: Thu, 14 Aug 2025 13:42:33 +0200
Subject: [PATCH 2/9] move Duck.ai shortcut settings to a separate screen

---
 .../src/main/AndroidManifest.xml              |   7 +-
 .../DuckAiShortcutSettingsActivity.kt         |  76 ++++++++++++
 .../DuckAiShortcutSettingsViewModel.kt        |  72 ++++++++++++
 .../DuckChatSettingsActivity.kt               |  36 ++----
 .../DuckChatSettingsViewModel.kt              |  30 +++--
 .../activity_duck_ai_shortcut_settings.xml    |  56 +++++++++
 .../layout/activity_duck_chat_settings.xml    |  22 +---
 .../main/res/values-bg/strings-duckchat.xml   |   2 -
 .../main/res/values-cs/strings-duckchat.xml   |   2 -
 .../main/res/values-da/strings-duckchat.xml   |   2 -
 .../main/res/values-de/strings-duckchat.xml   |   2 -
 .../main/res/values-el/strings-duckchat.xml   |   2 -
 .../main/res/values-es/strings-duckchat.xml   |   2 -
 .../main/res/values-et/strings-duckchat.xml   |   2 -
 .../main/res/values-fi/strings-duckchat.xml   |   2 -
 .../main/res/values-fr/strings-duckchat.xml   |   2 -
 .../main/res/values-hr/strings-duckchat.xml   |   2 -
 .../main/res/values-hu/strings-duckchat.xml   |   2 -
 .../main/res/values-it/strings-duckchat.xml   |   2 -
 .../main/res/values-lt/strings-duckchat.xml   |   2 -
 .../main/res/values-lv/strings-duckchat.xml   |   2 -
 .../main/res/values-nb/strings-duckchat.xml   |   2 -
 .../main/res/values-nl/strings-duckchat.xml   |   2 -
 .../main/res/values-pl/strings-duckchat.xml   |   2 -
 .../main/res/values-pt/strings-duckchat.xml   |   2 -
 .../main/res/values-ro/strings-duckchat.xml   |   2 -
 .../main/res/values-ru/strings-duckchat.xml   |   2 -
 .../main/res/values-sk/strings-duckchat.xml   |   2 -
 .../main/res/values-sl/strings-duckchat.xml   |   2 -
 .../main/res/values-sv/strings-duckchat.xml   |   2 -
 .../main/res/values-tr/strings-duckchat.xml   |   2 -
 .../src/main/res/values/strings-duckchat.xml  |   4 +-
 .../DuckAiShortcutSettingsViewModelTest.kt    | 111 ++++++++++++++++++
 .../DuckChatSettingsViewModelTest.kt          | 102 ++++------------
 34 files changed, 376 insertions(+), 188 deletions(-)
 create mode 100644 duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsActivity.kt
 create mode 100644 duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsViewModel.kt
 rename duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/{ => settings}/DuckChatSettingsActivity.kt (85%)
 rename duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/{ => settings}/DuckChatSettingsViewModel.kt (82%)
 create mode 100644 duckchat/duckchat-impl/src/main/res/layout/activity_duck_ai_shortcut_settings.xml
 create mode 100644 duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsViewModelTest.kt
 rename duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/{ => settings}/DuckChatSettingsViewModelTest.kt (69%)

diff --git a/duckchat/duckchat-impl/src/main/AndroidManifest.xml b/duckchat/duckchat-impl/src/main/AndroidManifest.xml
index ae960da40092..d653e3642d66 100644
--- a/duckchat/duckchat-impl/src/main/AndroidManifest.xml
+++ b/duckchat/duckchat-impl/src/main/AndroidManifest.xml
@@ -18,10 +18,15 @@
 
     <application>
         <activity
-            android:name="com.duckduckgo.duckchat.impl.ui.DuckChatSettingsActivity"
+            android:name="com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsActivity"
             android:exported="false"
             android:label="@string/duck_chat_title"
             android:parentActivityName="com.duckduckgo.app.settings.SettingsActivity" />
+        <activity
+            android:name="com.duckduckgo.duckchat.impl.ui.settings.DuckAiShortcutSettingsActivity"
+            android:exported="false"
+            android:label="@string/duck_ai_shortcut_settings_title"
+            android:parentActivityName="com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsActivity" />
         <activity
             android:name="com.duckduckgo.duckchat.impl.ui.DuckChatWebViewActivity"
             android:exported="false"
diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsActivity.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsActivity.kt
new file mode 100644
index 000000000000..6b970bdae2a2
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsActivity.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2025 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.duckchat.impl.ui.settings
+
+import android.os.Bundle
+import android.widget.CompoundButton
+import androidx.core.view.isVisible
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
+import com.duckduckgo.anvil.annotations.InjectWith
+import com.duckduckgo.common.ui.DuckDuckGoActivity
+import com.duckduckgo.common.ui.viewbinding.viewBinding
+import com.duckduckgo.di.scopes.ActivityScope
+import com.duckduckgo.duckchat.impl.databinding.ActivityDuckAiShortcutSettingsBinding
+import com.duckduckgo.duckchat.impl.ui.settings.DuckAiShortcutSettingsViewModel.ViewState
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+
+@InjectWith(ActivityScope::class)
+class DuckAiShortcutSettingsActivity : DuckDuckGoActivity() {
+
+    private val viewModel: DuckAiShortcutSettingsViewModel by bindViewModel()
+    private val binding: ActivityDuckAiShortcutSettingsBinding by viewBinding()
+
+    private val menuToggleListener =
+        CompoundButton.OnCheckedChangeListener { _, isChecked ->
+            viewModel.onShowDuckChatInMenuToggled(isChecked)
+        }
+
+    private val addressBarToggleListener =
+        CompoundButton.OnCheckedChangeListener { _, isChecked ->
+            viewModel.onShowDuckChatInAddressBarToggled(isChecked)
+        }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(binding.root)
+
+        setupToolbar(binding.includeToolbar.toolbar)
+
+        observeViewModel()
+    }
+
+    private fun observeViewModel() {
+        viewModel.viewState
+            .flowWithLifecycle(lifecycle, Lifecycle.State.RESUMED)
+            .onEach { renderViewState(it) }
+            .launchIn(lifecycleScope)
+    }
+
+    private fun renderViewState(viewState: ViewState) {
+        binding.showDuckAiInMenuToggle.apply {
+            quietlySetIsChecked(viewState.showInBrowserMenu, menuToggleListener)
+        }
+        binding.showDuckAiInAddressBarToggle.apply {
+            isVisible = viewState.shouldShowAddressBarToggle
+            quietlySetIsChecked(viewState.showInAddressBar, addressBarToggleListener)
+        }
+    }
+}
diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsViewModel.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsViewModel.kt
new file mode 100644
index 000000000000..c7040a71315d
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsViewModel.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.duckchat.impl.ui.settings
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.duckduckgo.anvil.annotations.ContributesViewModel
+import com.duckduckgo.app.statistics.pixels.Pixel
+import com.duckduckgo.common.ui.experiments.visual.store.ExperimentalThemingDataStore
+import com.duckduckgo.di.scopes.ActivityScope
+import com.duckduckgo.duckchat.impl.DuckChatInternal
+import com.duckduckgo.duckchat.impl.pixel.DuckChatPixelName
+import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenLink
+import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenLinkInNewTab
+import com.duckduckgo.subscriptions.api.SubscriptionRebrandingFeatureToggle
+import javax.inject.Inject
+import kotlinx.coroutines.channels.BufferOverflow.DROP_OLDEST
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+@ContributesViewModel(ActivityScope::class)
+class DuckAiShortcutSettingsViewModel @Inject constructor(
+    private val duckChat: DuckChatInternal,
+) : ViewModel() {
+
+    data class ViewState(
+        val showInBrowserMenu: Boolean = false,
+        val showInAddressBar: Boolean = false,
+        val shouldShowAddressBarToggle: Boolean = false,
+    )
+
+    val viewState = combine(
+        duckChat.observeShowInBrowserMenuUserSetting(),
+        duckChat.observeShowInAddressBarUserSetting(),
+    ) { showInBrowserMenu, showInAddressBar ->
+        ViewState(
+            showInBrowserMenu = showInBrowserMenu,
+            showInAddressBar = showInAddressBar,
+            shouldShowAddressBarToggle = duckChat.isAddressBarEntryPointEnabled(),
+        )
+    }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), ViewState())
+
+    fun onShowDuckChatInMenuToggled(checked: Boolean) {
+        viewModelScope.launch {
+            duckChat.setShowInBrowserMenuUserSetting(checked)
+        }
+    }
+
+    fun onShowDuckChatInAddressBarToggled(checked: Boolean) {
+        viewModelScope.launch {
+            duckChat.setShowInAddressBarUserSetting(checked)
+        }
+    }
+}
diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/DuckChatSettingsActivity.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
similarity index 85%
rename from duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/DuckChatSettingsActivity.kt
rename to duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
index 74a76a8a213e..8089daf6e521 100644
--- a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/DuckChatSettingsActivity.kt
+++ b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.duckchat.impl.ui
+package com.duckduckgo.duckchat.impl.ui.settings
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.widget.CompoundButton
@@ -28,6 +29,7 @@ import com.duckduckgo.anvil.annotations.ContributeToActivityStarter
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.tabs.BrowserNav
+import com.duckduckgo.browser.api.ui.BrowserScreens.FeedbackActivityWithEmptyParams
 import com.duckduckgo.browser.api.ui.BrowserScreens.WebViewActivityWithParams
 import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.common.ui.spans.DuckDuckGoClickableSpan
@@ -40,11 +42,12 @@ import com.duckduckgo.duckchat.api.DuckChatSettingsNoParams
 import com.duckduckgo.duckchat.impl.R
 import com.duckduckgo.duckchat.impl.databinding.ActivityDuckChatSettingsBinding
 import com.duckduckgo.duckchat.impl.pixel.DuckChatPixelName.DUCK_CHAT_SETTINGS_DISPLAYED
-import com.duckduckgo.duckchat.impl.ui.DuckChatSettingsViewModel.ViewState
+import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.ViewState
 import com.duckduckgo.navigation.api.GlobalActivityStarter
 import javax.inject.Inject
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import com.duckduckgo.mobile.android.R as CommonR
 
 @InjectWith(ActivityScope::class)
 @ContributeToActivityStarter(DuckChatSettingsNoParams::class, screenName = "duckai.settings")
@@ -63,16 +66,6 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
             viewModel.onDuckAiInputScreenToggled(isChecked)
         }
 
-    private val menuToggleListener =
-        CompoundButton.OnCheckedChangeListener { _, isChecked ->
-            viewModel.onShowDuckChatInMenuToggled(isChecked)
-        }
-
-    private val addressBarToggleListener =
-        CompoundButton.OnCheckedChangeListener { _, isChecked ->
-            viewModel.onShowDuckChatInAddressBarToggled(isChecked)
-        }
-
     @Inject
     lateinit var globalActivityStarter: GlobalActivityStarter
 
@@ -114,7 +107,6 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
             binding.duckChatSettingsTitle.setText(R.string.duck_chat_title_rebranding)
             binding.userEnabledDuckChatToggle.gone()
             binding.userEnabledDuckChatToggleRebranding.show()
-            binding.duckChatToggleSettingsTitle.setText(R.string.duck_chat_show_in_heading_rebranding)
             binding.showDuckChatSearchSettingsLink.setPrimaryText(getString(R.string.duck_chat_assist_settings_title_rebranding))
             binding.showDuckChatSearchSettingsLink.setSecondaryText(getString(R.string.duck_chat_assist_settings_description_rebranding))
         } else {
@@ -124,7 +116,6 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
             binding.duckChatSettingsTitle.setText(R.string.duck_chat_title)
             binding.userEnabledDuckChatToggle.show()
             binding.userEnabledDuckChatToggleRebranding.gone()
-            binding.duckChatToggleSettingsTitle.setText(R.string.duck_chat_show_in_heading)
             binding.showDuckChatSearchSettingsLink.setPrimaryText(getString(R.string.duck_chat_assist_settings_title))
             binding.showDuckChatSearchSettingsLink.setSecondaryText(getString(R.string.duck_chat_assist_settings_description))
         }
@@ -149,15 +140,9 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
             quietlySetIsChecked(viewState.isInputScreenEnabled, inputScreenToggleListener)
         }
 
-        binding.duckChatToggleSettingsTitle.isVisible = viewState.isDuckChatUserEnabled
-
-        binding.showDuckChatInMenuToggle.apply {
-            isVisible = viewState.shouldShowAddressBarToggle
-            quietlySetIsChecked(viewState.showInBrowserMenu, menuToggleListener)
-        }
-        binding.showDuckChatInAddressBarToggle.apply {
-            isVisible = viewState.shouldShowAddressBarToggle
-            quietlySetIsChecked(viewState.showInAddressBar, addressBarToggleListener)
+        binding.duckAiShortcuts.isVisible = viewState.shouldShowShortcuts
+        binding.duckAiShortcuts.setOnClickListener {
+            viewModel.onDuckAiShortcutsClicked()
         }
         binding.showDuckChatSearchSettingsLink.setOnClickListener {
             viewModel.duckChatSearchAISettingsClicked()
@@ -178,6 +163,11 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
             is DuckChatSettingsViewModel.Command.OpenLinkInNewTab -> {
                 startActivity(browserNav.openInNewTab(this@DuckChatSettingsActivity, command.link))
             }
+
+            is DuckChatSettingsViewModel.Command.OpenShortcutSettings -> {
+                val intent = Intent(this, DuckAiShortcutSettingsActivity::class.java)
+                startActivity(intent)
+            }
         }
     }
 }
diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/DuckChatSettingsViewModel.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModel.kt
similarity index 82%
rename from duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/DuckChatSettingsViewModel.kt
rename to duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModel.kt
index 6c0fd7ed984b..d0c55884ff30 100644
--- a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/DuckChatSettingsViewModel.kt
+++ b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModel.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.duckchat.impl.ui
+package com.duckduckgo.duckchat.impl.ui.settings
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.duckduckgo.anvil.annotations.ContributesViewModel
 import com.duckduckgo.app.statistics.pixels.Pixel
-import com.duckduckgo.common.ui.experiments.visual.store.ExperimentalThemingDataStore
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.duckchat.impl.DuckChatInternal
 import com.duckduckgo.duckchat.impl.pixel.DuckChatPixelName
-import com.duckduckgo.duckchat.impl.ui.DuckChatSettingsViewModel.Command.OpenLink
-import com.duckduckgo.duckchat.impl.ui.DuckChatSettingsViewModel.Command.OpenLinkInNewTab
+import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenLink
+import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenLinkInNewTab
+import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenShortcutSettings
 import com.duckduckgo.subscriptions.api.SubscriptionRebrandingFeatureToggle
 import javax.inject.Inject
 import kotlinx.coroutines.channels.BufferOverflow.DROP_OLDEST
@@ -40,7 +40,6 @@ import kotlinx.coroutines.launch
 class DuckChatSettingsViewModel @Inject constructor(
     private val duckChat: DuckChatInternal,
     private val pixel: Pixel,
-    private val experimentalThemingDataStore: ExperimentalThemingDataStore,
     private val rebrandingAiFeaturesEnabled: SubscriptionRebrandingFeatureToggle,
 ) : ViewModel() {
 
@@ -50,28 +49,20 @@ class DuckChatSettingsViewModel @Inject constructor(
     data class ViewState(
         val isDuckChatUserEnabled: Boolean = false,
         val isInputScreenEnabled: Boolean = false,
-        val showInBrowserMenu: Boolean = false,
-        val showInAddressBar: Boolean = false,
+        val shouldShowShortcuts: Boolean = false,
         val shouldShowInputScreenToggle: Boolean = false,
-        val shouldShowBrowserMenuToggle: Boolean = false,
-        val shouldShowAddressBarToggle: Boolean = false,
         val isRebrandingAiFeaturesEnabled: Boolean = false,
     )
 
     val viewState = combine(
         duckChat.observeEnableDuckChatUserSetting(),
         duckChat.observeInputScreenUserSettingEnabled(),
-        duckChat.observeShowInBrowserMenuUserSetting(),
-        duckChat.observeShowInAddressBarUserSetting(),
-    ) { isDuckChatUserEnabled, isInputScreenEnabled, showInBrowserMenu, showInAddressBar ->
+    ) { isDuckChatUserEnabled, isInputScreenEnabled ->
         ViewState(
             isDuckChatUserEnabled = isDuckChatUserEnabled,
             isInputScreenEnabled = isInputScreenEnabled,
-            showInBrowserMenu = showInBrowserMenu,
-            showInAddressBar = showInAddressBar,
+            shouldShowShortcuts = isDuckChatUserEnabled,
             shouldShowInputScreenToggle = isDuckChatUserEnabled && duckChat.isInputScreenFeatureAvailable(),
-            shouldShowBrowserMenuToggle = isDuckChatUserEnabled,
-            shouldShowAddressBarToggle = isDuckChatUserEnabled && duckChat.isAddressBarEntryPointEnabled(),
             isRebrandingAiFeaturesEnabled = rebrandingAiFeaturesEnabled.isAIFeaturesRebrandingEnabled(),
         )
     }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), ViewState())
@@ -79,6 +70,7 @@ class DuckChatSettingsViewModel @Inject constructor(
     sealed class Command {
         data class OpenLink(val link: String) : Command()
         data class OpenLinkInNewTab(val link: String) : Command()
+        data object OpenShortcutSettings : Command()
     }
 
     fun onDuckChatUserEnabledToggled(checked: Boolean) {
@@ -138,6 +130,12 @@ class DuckChatSettingsViewModel @Inject constructor(
         }
     }
 
+    fun onDuckAiShortcutsClicked() {
+        viewModelScope.launch {
+            commandChannel.send(OpenShortcutSettings)
+        }
+    }
+
     companion object {
         const val DUCK_CHAT_LEARN_MORE_LINK = "https://duckduckgo.com/duckduckgo-help-pages/aichat/"
         const val DUCK_CHAT_SEARCH_AI_SETTINGS_LINK = "https://duckduckgo.com/settings?ko=-1#aifeatures"
diff --git a/duckchat/duckchat-impl/src/main/res/layout/activity_duck_ai_shortcut_settings.xml b/duckchat/duckchat-impl/src/main/res/layout/activity_duck_ai_shortcut_settings.xml
new file mode 100644
index 000000000000..f05eb94cea8d
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/layout/activity_duck_ai_shortcut_settings.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.settings.DuckAiShortcutSettingsActivity">
+
+    <include
+        android:id="@+id/includeToolbar"
+        layout="@layout/include_default_toolbar" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="@dimen/keyline_5">
+
+            <com.duckduckgo.common.ui.view.listitem.OneLineListItem
+                android:id="@+id/show_duck_ai_in_menu_toggle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                app:primaryText="@string/duck_chat_visibility_setting"
+                app:showSwitch="true" />
+
+            <com.duckduckgo.common.ui.view.listitem.OneLineListItem
+                android:id="@+id/show_duck_ai_in_address_bar_toggle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:primaryText="@string/duck_chat_address_bar_visibility_setting"
+                app:showSwitch="true" />
+
+        </LinearLayout>
+    </ScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml b/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
index ff7563496e5a..dabaf6511d24 100644
--- a/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
+++ b/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
@@ -98,25 +98,13 @@
                 app:showBetaPill="true"
                 app:showSwitch="true"/>
 
-            <com.duckduckgo.common.ui.view.listitem.SectionHeaderListItem
-                android:id="@+id/duckChatToggleSettingsTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:primaryText="@string/duck_chat_show_in_heading" />
-
-            <com.duckduckgo.common.ui.view.listitem.OneLineListItem
-                android:id="@+id/showDuckChatInMenuToggle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:primaryText="@string/duck_chat_visibility_setting"
-                app:showSwitch="true"/>
-
-            <com.duckduckgo.common.ui.view.listitem.OneLineListItem
-                android:id="@+id/showDuckChatInAddressBarToggle"
+            <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
+                android:id="@+id/duckAiShortcuts"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:primaryText="@string/duck_chat_address_bar_visibility_setting"
-                app:showSwitch="true"/>
+                android:visibility="gone"
+                app:primaryText="@string/duck_ai_shortcut_settings_title"
+                app:secondaryText="@string/duck_ai_shortcut_settings_description" />
 
             <com.duckduckgo.common.ui.view.divider.HorizontalDivider
                 android:layout_width="match_parent"
diff --git a/duckchat/duckchat-impl/src/main/res/values-bg/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-bg/strings-duckchat.xml
index 1fa5ade74070..dc4a4aaba028 100644
--- a/duckchat/duckchat-impl/src/main/res/values-bg/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-bg/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai е незадължителна функция, чрез която можете да разговаряте анонимно с популярни AI чат модели от трети страни. Чатовете Ви не се използват за обучение на AI.\n<annotation type="learn_more_link">Научете повече</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Активиране на Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Бързи Връзки</string>
     <string name="duck_chat_visibility_setting">Меню на браузъра</string>
     <string name="duck_chat_address_bar_visibility_setting">Адресна лента</string>
     <string name="duck_chat_assist_settings_title">Настройки на Assist</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Функции с изкуствен интелект</string>
     <string name="duck_chat_settings_activity_description_rebranding">Функциите на DuckDuckGo AI са поверителни и незадължителни.Вашите данни не се използват за обучение на AI.\n<annotation type="learn_more_link">Научете повече</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Преки пътища за Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Настройки за Assist при търсене</string>
     <string name="duck_chat_assist_settings_description_rebranding">Изберете колко често искате да се появяват отговори, подпомагани от изкуствен интелект, в търсенето</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-cs/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-cs/strings-duckchat.xml
index 9f1403dce8c0..01a920ffd2ea 100644
--- a/duckchat/duckchat-impl/src/main/res/values-cs/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-cs/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai je volitelná funkce, která umožňuje anonymně chatovat s populárními AI chatovacími modely třetích stran. Tvoje chaty neslouží k trénování umělé inteligence.\n<annotation type="learn_more_link">Další informace</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Povolit službu Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Zkratky</string>
     <string name="duck_chat_visibility_setting">Menu prohlížeče</string>
     <string name="duck_chat_address_bar_visibility_setting">Adresní řádek</string>
     <string name="duck_chat_assist_settings_title">Nastavení funkce Assist</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Funkce AI</string>
     <string name="duck_chat_settings_activity_description_rebranding">Funkce AI na DuckDuckGo jsou soukromé a volitelné.Tvoje data se nepoužívají k trénování umělé inteligence.\n<annotation type="learn_more_link">Další informace</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Zkratky Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Nastavení vyhledávání s funkcí Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Vyber, jak často chceš, aby se odpovědi s podporou umělé inteligence zobrazovaly ve tvých vyhledáváních</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-da/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-da/strings-duckchat.xml
index 352b1344cb60..32023ee913f0 100644
--- a/duckchat/duckchat-impl/src/main/res/values-da/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-da/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai er en valgfri funktion, der giver dig mulighed for at chatte anonymt med populære tredjeparts AI-chatmodeller. Dine chats bruges ikke til at træne AI.\n<annotation type="learn_more_link">Læs mere</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Aktiver Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Genveje</string>
     <string name="duck_chat_visibility_setting">Browsermenu</string>
     <string name="duck_chat_address_bar_visibility_setting">Adresselinje</string>
     <string name="duck_chat_assist_settings_title">Assist-indstillinger</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">AI-funktioner</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo AI-funktioner er private og valgfrie.\nDine data bruges ikke til at træne AI.\n<annotation type="learn_more_link">Læs mere</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Duck.ai-genveje</string>
     <string name="duck_chat_assist_settings_title_rebranding">Indstillinger for Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Vælg, hvor ofte du vil have AI-assisterede svar til at optræde i dine søgninger</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-de/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-de/strings-duckchat.xml
index 07ba0832ac15..5d644a211902 100644
--- a/duckchat/duckchat-impl/src/main/res/values-de/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-de/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai ist eine optionale Funktion, mit der du anonym mit beliebten KI-Chatmodellen von Drittanbietern chatten kannst. Deine Chats werden nicht zum Trainieren von KI verwendet.\n<annotation type="learn_more_link">Mehr erfahren</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Aktiviere Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Shortcuts</string>
     <string name="duck_chat_visibility_setting">Browsermenü</string>
     <string name="duck_chat_address_bar_visibility_setting">Adresszeile</string>
     <string name="duck_chat_assist_settings_title">Assist-Einstellungen</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">KI-Funktionen</string>
     <string name="duck_chat_settings_activity_description_rebranding">Die KI-Funktionen von DuckDuckGo sind privat und optional.\nIhre Daten werden nicht zum Trainieren von KI verwendet.\n<annotation type="learn_more_link">Mehr erfahren</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Duck.ai-Shortcuts</string>
     <string name="duck_chat_assist_settings_title_rebranding">Such-Assist-Einstellungen</string>
     <string name="duck_chat_assist_settings_description_rebranding">Du kannst auswählen, wie oft KI-gestützte Antworten in deinen Suchergebnissen angezeigt werden sollen.</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-el/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-el/strings-duckchat.xml
index 6e60bad2178a..b821f998196e 100644
--- a/duckchat/duckchat-impl/src/main/res/values-el/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-el/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Το Duck.ai αποτελεί προαιρετική λειτουργία που σας επιτρέπει να συνομιλείτε ανώνυμα με δημοφιλή μοντέλα τρίτων για συνομιλία μέσω τεχνητής νοημοσύνης. Οι συνομιλίες σας δεν χρησιμοποιούνται για την εκπαίδευση τεχνητής συνομιλίας.\n<annotation type="learn_more_link">Μάθετε περισσότερα</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Ενεργοποίηση του Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Συντομευσεις</string>
     <string name="duck_chat_visibility_setting">Μενού προγράμματος περιήγησης</string>
     <string name="duck_chat_address_bar_visibility_setting">Γραμμή διευθύνσεων</string>
     <string name="duck_chat_assist_settings_title">Ρυθμίσεις Assist</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Λειτουργίες τεχνητής νοημοσύνης</string>
     <string name="duck_chat_settings_activity_description_rebranding">Οι λειτουργίες τεχνητής νοημοσύνης του DuckDuckGo είναι ιδιωτικές και προαιρετικές.Τα δεδομένα σας δεν χρησιμοποιούνται για εκπαίδευση της τεχνητής νοημοσύνης.\n<annotation type="learn_more_link">Μάθετε περισσότερα</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Συντομεύσεις Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Ρυθμίσεις αναζήτησης Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Επιλέξτε πόσο συχνά θέλετε να εμφανίζονται οι απαντήσεις που υποστηρίζονται από τεχνητή νοημοσύνη στις αναζητήσεις σας</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-es/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-es/strings-duckchat.xml
index 2059e0d3e0be..534a58bc1222 100644
--- a/duckchat/duckchat-impl/src/main/res/values-es/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-es/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai es una función opcional que te permite chatear de forma anónima con modelos populares de chat de IA de terceros. Tus chats no se utilizan para entrenar la IA.\n<annotation type="learn_more_link">Más información</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Activa Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Accesos directos</string>
     <string name="duck_chat_visibility_setting">Menú del navegador</string>
     <string name="duck_chat_address_bar_visibility_setting">Barra de direcciones</string>
     <string name="duck_chat_assist_settings_title">Ajustes de Assist</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Características de la IA</string>
     <string name="duck_chat_settings_activity_description_rebranding">Las funciones de IA de DuckDuckGo son privadas y opcionales.Tus datos no se utilizan para entrenar la IA.\n<annotation type="learn_more_link">Más información</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Atajos de Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Configuración de Asistente de búsqueda</string>
     <string name="duck_chat_assist_settings_description_rebranding">Elige con qué frecuencia deseas que las respuestas asistidas por IA aparezcan en tus búsquedas</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-et/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-et/strings-duckchat.xml
index 23b18213b970..3847ae24b6ed 100644
--- a/duckchat/duckchat-impl/src/main/res/values-et/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-et/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai on valikuline funktsioon, mis võimaldab anonüümselt vestelda populaarsete kolmanda poole AI vestlusmudelitega. Teie vestlusi ei kasutata tehisintellekti treenimiseks.\n<annotation type="learn_more_link">Lisateave</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Luba Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Otseteed</string>
     <string name="duck_chat_visibility_setting">Brauseri menüü</string>
     <string name="duck_chat_address_bar_visibility_setting">Aadressiriba</string>
     <string name="duck_chat_assist_settings_title">Assisti seaded</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">AI funktsioonid</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo tehisintellekti funktsioonid on privaatsed ja valikulised.Sinu andmeid ei kasutata tehisintellekti treenimiseks.\n<annotation type="learn_more_link">Lisateave</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Duck.ai otseteed</string>
     <string name="duck_chat_assist_settings_title_rebranding">Otsingu Assist seaded</string>
     <string name="duck_chat_assist_settings_description_rebranding">Vali, kui tihti soovid, et AI-toega vastused ilmuksid sinu otsingutesse</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-fi/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-fi/strings-duckchat.xml
index cc8e01e603ca..229a5afb3ebb 100644
--- a/duckchat/duckchat-impl/src/main/res/values-fi/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-fi/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai on valinnainen ominaisuus, jonka avulla voit keskustella anonyymisti suosittujen kolmannen osapuolen tekoälykeskustelumallien kanssa. Keskustelujasi ei käytetä tekoälyn kouluttamiseen.\n<annotation type="learn_more_link">Lue lisää</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Ota Duck.ai käyttöön</string>
-    <string name="duck_chat_show_in_heading">Pikavalinnat</string>
     <string name="duck_chat_visibility_setting">Selainvalikko</string>
     <string name="duck_chat_address_bar_visibility_setting">Osoitekenttä</string>
     <string name="duck_chat_assist_settings_title">Assist-asetukset</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Tekoälyominaisuudet</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGon tekoälyominaisuudet ovat yksityisiä ja valinnaisia.\nTietojasi ei käytetä tekoälyn kouluttamiseen.\n<annotation type="learn_more_link">Lue lisää</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Duck.ai-pikakuvakkeet</string>
     <string name="duck_chat_assist_settings_title_rebranding">Search Assist -asetukset</string>
     <string name="duck_chat_assist_settings_description_rebranding">Valitse, kuinka usein haluat tekoälyavusteisten vastausten näkyvän hauissasi</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-fr/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-fr/strings-duckchat.xml
index d6a5984c2de5..e5eefc386859 100644
--- a/duckchat/duckchat-impl/src/main/res/values-fr/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-fr/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai est une fonctionnalité optionnelle qui vous permet de discuter anonymement avec des modèles de chat IA tiers populaires. Vos discussions ne servent pas à entraîner l’IA.\n<annotation type="learn_more_link">En savoir plus</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Activer Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Raccourcis</string>
     <string name="duck_chat_visibility_setting">Menu du navigateur</string>
     <string name="duck_chat_address_bar_visibility_setting">Barre d\'adresse</string>
     <string name="duck_chat_assist_settings_title">Paramètres d\'Assist</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Fonctionnalités de l\'IA</string>
     <string name="duck_chat_settings_activity_description_rebranding">Les fonctionnalités de DuckDuckGo AI sont privées et facultatives.Vos données ne servent pas à entraîner l’IA.\n<annotation type="learn_more_link">En savoir plus</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Raccourcis Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Paramètres de recherche Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Choisissez la fréquence à laquelle vous souhaitez que les réponses assistées par l\'IA apparaissent dans vos recherches</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-hr/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-hr/strings-duckchat.xml
index 3ee3ad6ff6fc..ed89d1ef95ed 100644
--- a/duckchat/duckchat-impl/src/main/res/values-hr/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-hr/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai izborna je značajka koja ti omogućuje anonimno čavrljanje s popularnim AI modelima \'chata\' trećih strana. Tvoja čavrljanja se ne koriste za obuku AI-a.\n<annotation type="learn_more_link">Saznaj više</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Omogući Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Prečaci</string>
     <string name="duck_chat_visibility_setting">Izbornik preglednika</string>
     <string name="duck_chat_address_bar_visibility_setting">Adresna traka</string>
     <string name="duck_chat_assist_settings_title">Postavke Assista</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">AI značajke</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo AI značajke privatne su i neobavezne.Tvoji podaci se ne koriste za obuku umjetne inteligencije.\n<annotation type="learn_more_link">Saznaj više</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Duck.ai prečaci</string>
     <string name="duck_chat_assist_settings_title_rebranding">Pretraži postavke Assista</string>
     <string name="duck_chat_assist_settings_description_rebranding">Odaberi koliko često želiš da se odgovori potpomognuti umjetnom inteligencijom pojavljuju u tvojim pretraživanjima</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-hu/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-hu/strings-duckchat.xml
index 19f1a2b19e1c..0e047a79ed8f 100644
--- a/duckchat/duckchat-impl/src/main/res/values-hu/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-hu/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">A Duck.ai egy opcionális funkció, amely lehetővé teszi a harmadik féltől származó népszerű AI-csevegési modellekkel való névtelen csevegést. A csevegéseidet nem használjuk fel az AI tanítására.\n<annotation type="learn_more_link">További részletek</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Duck.ai engedélyezése</string>
-    <string name="duck_chat_show_in_heading">Gyorsparancsok</string>
     <string name="duck_chat_visibility_setting">Böngészési menü</string>
     <string name="duck_chat_address_bar_visibility_setting">Címsor</string>
     <string name="duck_chat_assist_settings_title">Assist-beállítások</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">AI funkciók</string>
     <string name="duck_chat_settings_activity_description_rebranding">A DuckDuckGo AI-funkciói privátak és opcionálisak.\nAz adataidat nem használjuk fel az AI tanítására.\n<annotation type="learn_more_link">További részletek</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Duck.ai-gyorsparancsok</string>
     <string name="duck_chat_assist_settings_title_rebranding">Keresési asszisztens beállításai</string>
     <string name="duck_chat_assist_settings_description_rebranding">Válaszd ki, milyen gyakran szeretnél mesterséges intelligenciával generált válaszokat látni a kereséseid során</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-it/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-it/strings-duckchat.xml
index 59b2b7f68012..dfa527fae3c0 100644
--- a/duckchat/duckchat-impl/src/main/res/values-it/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-it/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai è una funzionalità opzionale che consente di chattare in forma anonima con i più diffusi modelli di chat AI di terze parti. Le chat non vengono usate per addestrare l\'IA.\n<annotation type="learn_more_link">Scopri di più</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Abilita Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Scorciatoie</string>
     <string name="duck_chat_visibility_setting">Menu del browser</string>
     <string name="duck_chat_address_bar_visibility_setting">Barra degli indirizzi</string>
     <string name="duck_chat_assist_settings_title">Impostazioni di Assist</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Funzionalità IA</string>
     <string name="duck_chat_settings_activity_description_rebranding">Le funzionalità AI di DuckDuckGo sono private e opzionali.I tuoi dati non vengono usati per addestrare l\'IA.\n<annotation type="learn_more_link">Scopri di più</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Scorciatoie Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Impostazioni di Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Scegli la frequenza con cui vuoi che le risposte assistite dall\'intelligenza artificiale appaiano nelle tue ricerche</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-lt/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-lt/strings-duckchat.xml
index fd6c971b166f..5cbe75429a37 100644
--- a/duckchat/duckchat-impl/src/main/res/values-lt/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-lt/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">„Duck.ai“ yra pasirenkama funkcija, leidžianti anonimiškai kalbėtis su populiariais trečiųjų šalių DI pokalbių modeliais. Tavo pokalbiai nenaudojami dirbtinio intelekto mokymui.\n<annotation type="learn_more_link">Sužinok daugiau</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Įjungti „Duck.ai“</string>
-    <string name="duck_chat_show_in_heading">Šaukiniai</string>
     <string name="duck_chat_visibility_setting">Naršyklės meniu</string>
     <string name="duck_chat_address_bar_visibility_setting">Adreso juosta</string>
     <string name="duck_chat_assist_settings_title">„Assist“ nustatymai</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">DI funkcijos</string>
     <string name="duck_chat_settings_activity_description_rebranding">„DuckDuckGo“ DI funkcijos yra privačios ir neprivalomos.Nenaudojame jūsų duomenų dirbtinio intelekto mokymui.\n<annotation type="learn_more_link">Sužinokite daugiau</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">„Duck.ai“ spartieji klavišai</string>
     <string name="duck_chat_assist_settings_title_rebranding">„Assist“ paieškos nustatymai</string>
     <string name="duck_chat_assist_settings_description_rebranding">Pasirink, kaip dažnai nori, kad tavo paieškose būtų rodomi DI generuojami atsakymai</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-lv/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-lv/strings-duckchat.xml
index 1a736947c096..cc00b090cfd5 100644
--- a/duckchat/duckchat-impl/src/main/res/values-lv/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-lv/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai ir papildu līdzeklis, kas ļauj anonīmi tērzēt ar populāriem trešo pušu Ml tērzēšanas modeļiem. Tavas tērzēšanas sarunas netiek izmantotas AMI apmācībai.\n<annotation type="learn_more_link">Uzzini vairāk</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Iespējot Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Saīsnes</string>
     <string name="duck_chat_visibility_setting">Pārlūka izvēlne</string>
     <string name="duck_chat_address_bar_visibility_setting">Adreses josla</string>
     <string name="duck_chat_assist_settings_title">Assist iestatījumi</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Mākslīgā intelekta funkcijas</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo MI funkcijas ir privātas un nav obligātas.Tavi dati netiek izmantoti mākslīgā intelekta apmācībai.\n<annotation type="learn_more_link">Uzzini vairāk</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Duck.ai īsceļi</string>
     <string name="duck_chat_assist_settings_title_rebranding">Meklēšanas Assist iestatījumi</string>
     <string name="duck_chat_assist_settings_description_rebranding">Izvēlies, cik bieži tu vēlies, lai MI atbalstītās atbildes parādītos tavos meklējumos.</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-nb/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-nb/strings-duckchat.xml
index 635162a4d2a2..60780367b59e 100644
--- a/duckchat/duckchat-impl/src/main/res/values-nb/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-nb/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai er en valgfri funksjon der du kan chatte anonymt med populære tredjeparts AI-chat-modeller. Chattene dine brukes ikke til å trene AI.\n<annotation type="learn_more_link">Les mer</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Aktiver Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Snarveier</string>
     <string name="duck_chat_visibility_setting">Nettlesermeny</string>
     <string name="duck_chat_address_bar_visibility_setting">Adressefelt</string>
     <string name="duck_chat_assist_settings_title">Assist-innstillinger</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">AI-funksjoner</string>
     <string name="duck_chat_settings_activity_description_rebranding">AI-funksjonene i DuckDuckGo er private og valgfrie.\nDataene dine brukes ikke til å trene AI.\n<annotation type="learn_more_link">Les mer</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Duck.ai-snarveier</string>
     <string name="duck_chat_assist_settings_title_rebranding">Innstillinger for Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Velg hvor ofte du vil at AI-assisterte svar skal vises i søkene dine</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-nl/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-nl/strings-duckchat.xml
index c7a7cded325f..d6a58a9fd35f 100644
--- a/duckchat/duckchat-impl/src/main/res/values-nl/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-nl/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai is een optionele functie waarmee je anoniem kunt chatten met populaire AI-chatmodellen van derden. Je chats worden niet gebruikt om AI te trainen.\n<annotation type="learn_more_link">Meer informatie</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Duck.ai inschakelen</string>
-    <string name="duck_chat_show_in_heading">Sneltoetsen</string>
     <string name="duck_chat_visibility_setting">Browsermenu</string>
     <string name="duck_chat_address_bar_visibility_setting">Adresbalk</string>
     <string name="duck_chat_assist_settings_title">Assist-instellingen</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">AI-functies</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo AI-functies zijn privé en optioneel.\nJe gegevens worden niet gebruikt om AI te trainen.\n<annotation type="learn_more_link">Meer informatie</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Duck.ai-snelkoppelingen</string>
     <string name="duck_chat_assist_settings_title_rebranding">Instellingen voor zoek Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Kies hoe vaak antwoorden op basis van AI in je zoekresultaten moeten worden weergegeven</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-pl/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-pl/strings-duckchat.xml
index 7fbb5199f90e..80b607932cf7 100644
--- a/duckchat/duckchat-impl/src/main/res/values-pl/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-pl/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai to opcjonalna funkcja, która umożliwia prowadzenie anonimowych rozmów z popularnymi modelami czatu AI innych firm. Twoje czaty nie są używane do trenowania AI.\n<annotation type="learn_more_link">Dowiedz się więcej</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Włącz Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Skróty</string>
     <string name="duck_chat_visibility_setting">Menu przeglądarki</string>
     <string name="duck_chat_address_bar_visibility_setting">Pasek adresu</string>
     <string name="duck_chat_assist_settings_title">Ustawienia Assist</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Funkcje AI</string>
     <string name="duck_chat_settings_activity_description_rebranding">Funkcje sztucznej inteligencji DuckDuckGo są prywatne i opcjonalne.Twoje dane nie są używane do trenowania AI.\n<annotation type="learn_more_link">Dowiedz się więcej</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Skróty Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Ustawienia wyszukiwania Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Wybierz, jak często w wyszukiwaniach mają pojawiać się odpowiedzi wspomagane przez sztuczną inteligencję</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-pt/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-pt/strings-duckchat.xml
index af4eb458607a..ed4bfa522b76 100644
--- a/duckchat/duckchat-impl/src/main/res/values-pt/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-pt/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">O Duck.ai é uma funcionalidade opcional que te permite conversar anonimamente com modelos de chat de IA populares de terceiros. As tuas conversas não são utilizadas para treinar a IA.\n<annotation type="learn_more_link">Sabe mais</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Ativar Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Atalhos</string>
     <string name="duck_chat_visibility_setting">Menu do navegador</string>
     <string name="duck_chat_address_bar_visibility_setting">Barra de endereço</string>
     <string name="duck_chat_assist_settings_title">Definições do Assist</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Funcionalidades de IA</string>
     <string name="duck_chat_settings_activity_description_rebranding">As funcionalidades de IA do DuckDuckGo são privadas e opcionais.Os teus dados não são utilizados para treinar a IA.\n<annotation type="learn_more_link">Sabe mais</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Atalhos Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Definições do Assist de pesquisa</string>
     <string name="duck_chat_assist_settings_description_rebranding">Escolhe a frequência com que queres que as respostas assistidas por IA apareçam nas suas pesquisas</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-ro/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-ro/strings-duckchat.xml
index 15ed40b04278..573992401727 100644
--- a/duckchat/duckchat-impl/src/main/res/values-ro/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-ro/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai este o caracteristică opțională care îți permite să discuți anonim cu modele populare de chat AI de la terțe părți. Chaturile tale nu sunt folosite pentru a antrena AI.\n<annotation type="learn_more_link">Află mai multe</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Activează Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Scurtături</string>
     <string name="duck_chat_visibility_setting">Meniu browser</string>
     <string name="duck_chat_address_bar_visibility_setting">Bara de adrese</string>
     <string name="duck_chat_assist_settings_title">Setări Assist</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Caracteristici AI</string>
     <string name="duck_chat_settings_activity_description_rebranding">Funcțiile IA ale DuckDuckGo sunt private și opționale.Datele tale nu sunt folosite pentru a antrena IA.\n<annotation type="learn_more_link">Află mai multe</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Comenzi rapide Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Setări Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Alege cât de des vrei să apară răspunsurile asistate de IA în căutările tale</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-ru/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-ru/strings-duckchat.xml
index e1d492c53ccf..6de77a8d2c56 100644
--- a/duckchat/duckchat-impl/src/main/res/values-ru/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-ru/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai — дополнительная функция, позволяющая анонимно беседовать с популярными сторонними чат-моделями на базе искусственного интеллекта. Содержимое чатов не применяется для обучения ИИ.\n<annotation type="learn_more_link">Подробнее...</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Включить Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Ярлыки</string>
     <string name="duck_chat_visibility_setting">Меню браузера</string>
     <string name="duck_chat_address_bar_visibility_setting">Адресная строка</string>
     <string name="duck_chat_assist_settings_title">Настройки Assist</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Функции ИИ</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo AI — дополнительный конфиденциальный сервис.\nВаши данные не применяются для обучения ИИ.\n<annotation type="learn_more_link">Подробнее...</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Ярлыки Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Настройки Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Выберите, как часто вы хотите видеть ответы от ИИ в результатах поиска.</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-sk/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-sk/strings-duckchat.xml
index 796c89529f7f..107b8d166bbc 100644
--- a/duckchat/duckchat-impl/src/main/res/values-sk/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-sk/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai je voliteľná funkcia, ktorá ti umožňuje anonymne chatovať s obľúbenými modelmi chatu s umelou inteligenciou tretích strán. Tvoje chaty sa nepoužívajú na trénovanie AI.\n<annotation type="learn_more_link">Viac informácií</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Povoliť Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Skratky</string>
     <string name="duck_chat_visibility_setting">Ponuka prehliadača</string>
     <string name="duck_chat_address_bar_visibility_setting">Riadok adresy</string>
     <string name="duck_chat_assist_settings_title">Nastavenia Assist</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Funkcie AI</string>
     <string name="duck_chat_settings_activity_description_rebranding">Funkcie DuckDuckGo AI sú súkromné a voliteľné.\nTvoje údaje sa nepoužívajú na trénovanie umelej inteligencie.\n<annotation type="learn_more_link">Viac informácií</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Skratky Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Nastavenia Assist vyhľadávania</string>
     <string name="duck_chat_assist_settings_description_rebranding">Vyber, ako často chceš, aby sa vo vyhľadávaní zobrazovali odpovede podporované AI</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-sl/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-sl/strings-duckchat.xml
index 11385f25e39f..b9d21a550bc6 100644
--- a/duckchat/duckchat-impl/src/main/res/values-sl/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-sl/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai je izbirna funkcija, ki vam omogoča anonimen klepet s priljubljenimi modeli za klepet z umetno inteligenco drugih ponudnikov. Vaši klepeti se ne uporabljajo za usposabljanje umetne inteligence.\n<annotation type="learn_more_link">Več o tem</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Omogoči Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Bližnjice</string>
     <string name="duck_chat_visibility_setting">Meni brskalnika</string>
     <string name="duck_chat_address_bar_visibility_setting">Naslovna vrstica</string>
     <string name="duck_chat_assist_settings_title">Nastavitve modula Assist</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">Lastnosti UI</string>
     <string name="duck_chat_settings_activity_description_rebranding">Funkcije umetne inteligence DuckDuckGo so zasebne in izbirne.\nVaši podatki se ne uporabljajo za usposabljanje umetne inteligence.\n<annotation type="learn_more_link">Več o tem</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Bližnjice do Duck.ai</string>
     <string name="duck_chat_assist_settings_title_rebranding">Nastavitve modula Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Izberite, kako pogosto želite, da se odgovori s pomočjo umetne inteligence prikazujejo v vaših iskanjih</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-sv/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-sv/strings-duckchat.xml
index d371f5bc4f1b..860559aeb74d 100644
--- a/duckchat/duckchat-impl/src/main/res/values-sv/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-sv/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai är en valfri funktion som låter dig chatta anonymt med populära AI-chattmodeller från tredje part. Dina chattar används inte för att träna AI.\n<annotation type="learn_more_link">Läs mer</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Aktivera Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Genvägar</string>
     <string name="duck_chat_visibility_setting">Webbläsarmeny</string>
     <string name="duck_chat_address_bar_visibility_setting">Adressfält</string>
     <string name="duck_chat_assist_settings_title">Assist-inställningar</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">AI-funktioner</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGos AI-funktioner är privata och valfria.\nDina data används inte för att träna AI.\n<annotation type="learn_more_link">Läs mer</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Duck.ai-genvägar</string>
     <string name="duck_chat_assist_settings_title_rebranding">Inställningar för Search Assist</string>
     <string name="duck_chat_assist_settings_description_rebranding">Välj hur ofta du vill att AI-assisterade svar ska visas i dina sökningar</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values-tr/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-tr/strings-duckchat.xml
index 0a6e193e9f60..dfed7b04b934 100644
--- a/duckchat/duckchat-impl/src/main/res/values-tr/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-tr/strings-duckchat.xml
@@ -39,7 +39,6 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai, popüler 3. taraf yapay zeka sohbet modelleriyle anonim olarak sohbet etmenizi sağlayan isteğe bağlı bir özelliktir. Sohbetler yapay zekayı eğitmek için kullanılmaz.\n<annotation type="learn_more_link">Daha Fazla Bilgi</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Duck.ai\'ı etkinleştir</string>
-    <string name="duck_chat_show_in_heading">Kısayollar</string>
     <string name="duck_chat_visibility_setting">Tarayıcı menüsü</string>
     <string name="duck_chat_address_bar_visibility_setting">Adres Çubuğu</string>
     <string name="duck_chat_assist_settings_title">Assist Ayarları</string>
@@ -64,7 +63,6 @@
     <string name="duck_chat_title_rebranding">AI Özellikleri</string>
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo AI özellikleri gizli ve isteğe bağlıdır.\nVerileriniz yapay zekayı eğitmek için kullanılmaz.\n<annotation type="learn_more_link">Daha Fazla Bilgi</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
-    <string name="duck_chat_show_in_heading_rebranding">Duck.ai Kısayolları</string>
     <string name="duck_chat_assist_settings_title_rebranding">Search Assist Ayarları</string>
     <string name="duck_chat_assist_settings_description_rebranding">Yapay zeka destekli yanıtların aramalarınızda ne sıklıkta görünmesini istediğinizi seçin</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml
index 4f2d9e0085f6..82a9ab68a64b 100644
--- a/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml
@@ -38,11 +38,12 @@
     <!-- Settings -->
     <string name="duck_chat_settings_activity_description">Duck.ai is an optional feature that lets you chat anonymously with popular 3rd-party Al chat models. Your chats are not used to train AI.\n<annotation type="learn_more_link">Learn More</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting">Enable Duck.ai</string>
-    <string name="duck_chat_show_in_heading">Shortcuts</string>
     <string name="duck_chat_visibility_setting">Browser Menu</string>
     <string name="duck_chat_address_bar_visibility_setting">Address Bar</string>
     <string name="duck_chat_assist_settings_title">Assist Settings</string>
     <string name="duck_chat_assist_settings_description">Choose how often you want AI-assisted answers to appear in your searches</string>
+    <string name="duck_ai_shortcut_settings_title">Duck.ai Shortcuts</string>
+    <string name="duck_ai_shortcut_settings_description">Choose which Duck.ai shortcuts to display</string>
 
     <!-- Input Screen  -->
     <string name="input_screen_search_tab">Search</string>
@@ -64,7 +65,6 @@
     <string name="duck_chat_settings_activity_description_rebranding">DuckDuckGo AI features are private and optional.\nYour data is not used to train AI.\n<annotation type="learn_more_link">Learn More</annotation></string>
     <string name="duck_chat_enable_duck_ai_setting_rebranding">Duck.ai</string>
     <string name="duck_chat_enable_duck_ai_setting_description_rebranding">Chat privately with popular 3rd-party AI models</string>
-    <string name="duck_chat_show_in_heading_rebranding">Duck.ai Shortcuts</string>
     <string name="duck_chat_assist_settings_title_rebranding">Search Assist Settings</string>
     <string name="duck_chat_assist_settings_description_rebranding">Choose how often you want AI-Assisted answers to appear in your searches</string>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsViewModelTest.kt b/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsViewModelTest.kt
new file mode 100644
index 000000000000..cfa5409cb2ee
--- /dev/null
+++ b/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsViewModelTest.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2025 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.duckchat.impl.ui.settings
+
+import app.cash.turbine.test
+import com.duckduckgo.common.test.CoroutineTestRule
+import com.duckduckgo.duckchat.impl.DuckChatInternal
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+
+class DuckAiShortcutSettingsViewModelTest {
+
+    @get:Rule
+    @Suppress("unused")
+    val coroutineRule = CoroutineTestRule()
+
+    private lateinit var testee: DuckAiShortcutSettingsViewModel
+
+    private val duckChat: DuckChatInternal = mock()
+
+    @Before
+    fun setUp() = runTest {
+        whenever(duckChat.observeShowInBrowserMenuUserSetting()).thenReturn(flowOf(false))
+        whenever(duckChat.observeShowInAddressBarUserSetting()).thenReturn(flowOf(false))
+        testee = DuckAiShortcutSettingsViewModel(duckChat)
+    }
+
+    @Test
+    fun whenViewModelIsCreatedAndShowInBrowserIsEnabledThenEmitEnabled() = runTest {
+        whenever(duckChat.observeShowInBrowserMenuUserSetting()).thenReturn(flowOf(true))
+        testee = DuckAiShortcutSettingsViewModel(duckChat)
+
+        testee.viewState.test {
+            assertTrue(awaitItem().showInBrowserMenu)
+        }
+    }
+
+    @Test
+    fun whenViewModelIsCreatedAndShowInBrowserIsDisabledThenEmitDisabled() = runTest {
+        whenever(duckChat.observeShowInBrowserMenuUserSetting()).thenReturn(flowOf(false))
+        testee = DuckAiShortcutSettingsViewModel(duckChat)
+
+        testee.viewState.test {
+            assertFalse(awaitItem().showInBrowserMenu)
+        }
+    }
+
+    @Test
+    fun whenViewModelIsCreatedAndShowInAddressBarIsEnabledThenEmitEnabled() = runTest {
+        whenever(duckChat.observeShowInAddressBarUserSetting()).thenReturn(flowOf(true))
+        testee = DuckAiShortcutSettingsViewModel(duckChat)
+
+        testee.viewState.test {
+            assertTrue(awaitItem().showInAddressBar)
+        }
+    }
+
+    @Test
+    fun whenViewModelIsCreatedAndShowInAddressBarIsDisabledThenEmitDisabled() = runTest {
+        whenever(duckChat.observeShowInAddressBarUserSetting()).thenReturn(flowOf(false))
+        testee = DuckAiShortcutSettingsViewModel(duckChat)
+
+        testee.viewState.test {
+            assertFalse(awaitItem().showInAddressBar)
+        }
+    }
+
+    @Test
+    fun whenAddressBarEntryPointEnabledTogglesShown() = runTest {
+        whenever(duckChat.isAddressBarEntryPointEnabled()).thenReturn(true)
+        testee = DuckAiShortcutSettingsViewModel(duckChat)
+
+        testee.viewState.test {
+            val state = awaitItem()
+            assertTrue(state.shouldShowAddressBarToggle)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun whenAddressBarEntryPointDisabledThenToggleHidden() = runTest {
+        whenever(duckChat.isAddressBarEntryPointEnabled()).thenReturn(false)
+        testee = DuckAiShortcutSettingsViewModel(duckChat)
+
+        testee.viewState.test {
+            val state = awaitItem()
+            assertFalse(state.shouldShowAddressBarToggle)
+        }
+    }
+}
diff --git a/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/DuckChatSettingsViewModelTest.kt b/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModelTest.kt
similarity index 69%
rename from duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/DuckChatSettingsViewModelTest.kt
rename to duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModelTest.kt
index 52dd1761b9c9..d81f6dc10c83 100644
--- a/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/DuckChatSettingsViewModelTest.kt
+++ b/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModelTest.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.duckchat.impl.ui
+package com.duckduckgo.duckchat.impl.ui.settings
 
 import app.cash.turbine.test
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.common.test.CoroutineTestRule
-import com.duckduckgo.common.ui.experiments.visual.store.ExperimentalThemingDataStore
 import com.duckduckgo.duckchat.impl.DuckChatInternal
 import com.duckduckgo.duckchat.impl.pixel.DuckChatPixelName
-import com.duckduckgo.duckchat.impl.ui.DuckChatSettingsViewModel.Command.OpenLink
-import com.duckduckgo.duckchat.impl.ui.DuckChatSettingsViewModel.Command.OpenLinkInNewTab
+import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenLink
+import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenLinkInNewTab
+import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenShortcutSettings
 import com.duckduckgo.subscriptions.api.SubscriptionRebrandingFeatureToggle
 import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.flow.flowOf
@@ -47,7 +47,6 @@ class DuckChatSettingsViewModelTest {
 
     private val duckChat: DuckChatInternal = mock()
     private val mockPixel: Pixel = mock()
-    private val mockExperimentalThemingDataStore: ExperimentalThemingDataStore = mock()
     private val mockRebrandingFeatureToggle: SubscriptionRebrandingFeatureToggle = mock()
 
     @Before
@@ -56,7 +55,7 @@ class DuckChatSettingsViewModelTest {
         whenever(duckChat.observeShowInBrowserMenuUserSetting()).thenReturn(flowOf(false))
         whenever(duckChat.observeShowInAddressBarUserSetting()).thenReturn(flowOf(false))
         whenever(duckChat.observeInputScreenUserSettingEnabled()).thenReturn(flowOf(false))
-        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockExperimentalThemingDataStore, mockRebrandingFeatureToggle)
+        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockRebrandingFeatureToggle)
     }
 
     @Test
@@ -107,78 +106,11 @@ class DuckChatSettingsViewModelTest {
         verify(duckChat).setInputScreenUserSetting(false)
     }
 
-    @Test
-    fun whenViewModelIsCreatedAndShowInBrowserIsEnabledThenEmitEnabled() = runTest {
-        whenever(duckChat.observeShowInBrowserMenuUserSetting()).thenReturn(flowOf(true))
-        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockExperimentalThemingDataStore, mockRebrandingFeatureToggle)
-
-        testee.viewState.test {
-            assertTrue(awaitItem().showInBrowserMenu)
-        }
-    }
-
-    @Test
-    fun whenViewModelIsCreatedAndShowInBrowserIsDisabledThenEmitDisabled() = runTest {
-        whenever(duckChat.observeShowInBrowserMenuUserSetting()).thenReturn(flowOf(false))
-        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockExperimentalThemingDataStore, mockRebrandingFeatureToggle)
-
-        testee.viewState.test {
-            assertFalse(awaitItem().showInBrowserMenu)
-        }
-    }
-
-    @Test
-    fun whenViewModelIsCreatedAndShowInAddressBarIsEnabledThenEmitEnabled() = runTest {
-        whenever(duckChat.observeShowInAddressBarUserSetting()).thenReturn(flowOf(true))
-        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockExperimentalThemingDataStore, mockRebrandingFeatureToggle)
-
-        testee.viewState.test {
-            assertTrue(awaitItem().showInAddressBar)
-        }
-    }
-
-    @Test
-    fun whenViewModelIsCreatedAndShowInAddressBarIsDisabledThenEmitDisabled() = runTest {
-        whenever(duckChat.observeShowInAddressBarUserSetting()).thenReturn(flowOf(false))
-        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockExperimentalThemingDataStore, mockRebrandingFeatureToggle)
-
-        testee.viewState.test {
-            assertFalse(awaitItem().showInAddressBar)
-        }
-    }
-
-    @Test
-    fun whenDuckChatEnabledAndAddressBarEntryPointEnabledThenBothSubTogglesShown() = runTest {
-        whenever(duckChat.observeEnableDuckChatUserSetting()).thenReturn(flowOf(true))
-        whenever(duckChat.isAddressBarEntryPointEnabled()).thenReturn(true)
-        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockExperimentalThemingDataStore, mockRebrandingFeatureToggle)
-
-        testee.viewState.test {
-            val state = awaitItem()
-            assertTrue(state.shouldShowBrowserMenuToggle)
-            assertTrue(state.shouldShowAddressBarToggle)
-            cancelAndIgnoreRemainingEvents()
-        }
-    }
-
-    @Test
-    fun whenDuckChatEnabledAndAddressBarEntryPointDisabledThenOnlyBrowserToggleShown() = runTest {
-        whenever(duckChat.observeInputScreenUserSettingEnabled()).thenReturn(flowOf(false))
-        whenever(duckChat.observeEnableDuckChatUserSetting()).thenReturn(flowOf(true))
-        whenever(duckChat.isAddressBarEntryPointEnabled()).thenReturn(false)
-        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockExperimentalThemingDataStore, mockRebrandingFeatureToggle)
-
-        testee.viewState.test {
-            val state = awaitItem()
-            assertTrue(state.shouldShowBrowserMenuToggle)
-            assertFalse(state.shouldShowAddressBarToggle)
-        }
-    }
 
     @Test
     fun `input screen - user preference enabled then set correct state`() = runTest {
         whenever(duckChat.observeInputScreenUserSettingEnabled()).thenReturn(flowOf(true))
-        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockExperimentalThemingDataStore, mockRebrandingFeatureToggle)
+        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockRebrandingFeatureToggle)
 
         testee.viewState.test {
             assertTrue(awaitItem().isInputScreenEnabled)
@@ -188,7 +120,7 @@ class DuckChatSettingsViewModelTest {
     @Test
     fun `input screen - user preference disabled then set correct state`() = runTest {
         whenever(duckChat.observeInputScreenUserSettingEnabled()).thenReturn(flowOf(false))
-        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockExperimentalThemingDataStore, mockRebrandingFeatureToggle)
+        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockRebrandingFeatureToggle)
 
         testee.viewState.test {
             assertFalse(awaitItem().isInputScreenEnabled)
@@ -199,7 +131,7 @@ class DuckChatSettingsViewModelTest {
     fun `input screen - when duck chat enabled and flag enabled, then emit enabled`() = runTest {
         whenever(duckChat.observeEnableDuckChatUserSetting()).thenReturn(flowOf(true))
         whenever(duckChat.isInputScreenFeatureAvailable()).thenReturn(true)
-        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockExperimentalThemingDataStore, mockRebrandingFeatureToggle)
+        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockRebrandingFeatureToggle)
 
         testee.viewState.test {
             val state = awaitItem()
@@ -211,7 +143,7 @@ class DuckChatSettingsViewModelTest {
     fun `input screen - when flag disabled, then emit disabled`() = runTest {
         whenever(duckChat.observeEnableDuckChatUserSetting()).thenReturn(flowOf(true))
         whenever(duckChat.isInputScreenFeatureAvailable()).thenReturn(false)
-        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockExperimentalThemingDataStore, mockRebrandingFeatureToggle)
+        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockRebrandingFeatureToggle)
 
         testee.viewState.test {
             val state = awaitItem()
@@ -222,14 +154,11 @@ class DuckChatSettingsViewModelTest {
     @Test
     fun whenDuckChatDisabledThenNoSubTogglesShown() = runTest {
         whenever(duckChat.observeEnableDuckChatUserSetting()).thenReturn(flowOf(false))
-        whenever(duckChat.isAddressBarEntryPointEnabled()).thenReturn(true)
         whenever(duckChat.observeInputScreenUserSettingEnabled()).thenReturn(flowOf(true))
-        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockExperimentalThemingDataStore, mockRebrandingFeatureToggle)
+        testee = DuckChatSettingsViewModel(duckChat, mockPixel, mockRebrandingFeatureToggle)
 
         testee.viewState.test {
             val state = awaitItem()
-            assertFalse(state.shouldShowBrowserMenuToggle)
-            assertFalse(state.shouldShowAddressBarToggle)
             assertFalse(state.shouldShowInputScreenToggle)
         }
     }
@@ -319,4 +248,15 @@ class DuckChatSettingsViewModelTest {
         testee.onShowDuckChatInAddressBarToggled(false)
         verify(mockPixel).fire(DuckChatPixelName.DUCK_CHAT_SEARCHBAR_SETTING_OFF)
     }
+
+    @Test
+    fun `when Duck ai shortcuts clicked, then dispatch launch command`() = runTest {
+        testee.onDuckAiShortcutsClicked()
+
+        testee.commands.test {
+            val command = awaitItem()
+            assertTrue(command is OpenShortcutSettings)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
 }

From 75f221ad8d314dcd8e0ba24da14f37bc76f4365d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lpaczos@duckduckgo.com>
Date: Thu, 14 Aug 2025 14:03:16 +0200
Subject: [PATCH 3/9] update Input Screen settings toggle

---
 .../input_screen/input_screen_chat_mode.yaml  |   4 +-
 .../input_screen_preference_management.yaml   |   4 +-
 .../input_screen_search_mode.yaml             |   4 +-
 .../res/values/design-experiments-theming.xml |   2 +
 .../main/res/values/design-system-colors.xml  |   1 +
 .../ui/settings/DuckChatSettingsActivity.kt   |  81 +++++++++++--
 .../ui/settings/DuckChatSettingsViewModel.kt  |  32 +++--
 .../res/drawable/searchbox_background.xml     |  24 ++++
 .../drawable/searchbox_background_active.xml  |  28 +++++
 .../main/res/drawable/searchbox_withai.xml    |  31 +++++
 .../res/drawable/searchbox_withai_active.xml  |  38 ++++++
 .../main/res/drawable/searchbox_withoutai.xml |  38 ++++++
 .../drawable/searchbox_withoutai_active.xml   |  38 ++++++
 .../layout/activity_duck_chat_settings.xml    | 112 ++++++++++++++++--
 .../main/res/values-bg/strings-duckchat.xml   |   2 -
 .../main/res/values-cs/strings-duckchat.xml   |   2 -
 .../main/res/values-da/strings-duckchat.xml   |   2 -
 .../main/res/values-de/strings-duckchat.xml   |   2 -
 .../main/res/values-el/strings-duckchat.xml   |   2 -
 .../main/res/values-es/strings-duckchat.xml   |   2 -
 .../main/res/values-et/strings-duckchat.xml   |   2 -
 .../main/res/values-fi/strings-duckchat.xml   |   2 -
 .../main/res/values-fr/strings-duckchat.xml   |   2 -
 .../main/res/values-hr/strings-duckchat.xml   |   2 -
 .../main/res/values-hu/strings-duckchat.xml   |   2 -
 .../main/res/values-it/strings-duckchat.xml   |   2 -
 .../main/res/values-lt/strings-duckchat.xml   |   2 -
 .../main/res/values-lv/strings-duckchat.xml   |   2 -
 .../main/res/values-nb/strings-duckchat.xml   |   2 -
 .../main/res/values-nl/strings-duckchat.xml   |   2 -
 .../main/res/values-pl/strings-duckchat.xml   |   2 -
 .../main/res/values-pt/strings-duckchat.xml   |   2 -
 .../main/res/values-ro/strings-duckchat.xml   |   2 -
 .../main/res/values-ru/strings-duckchat.xml   |   2 -
 .../main/res/values-sk/strings-duckchat.xml   |   2 -
 .../main/res/values-sl/strings-duckchat.xml   |   2 -
 .../main/res/values-sv/strings-duckchat.xml   |   2 -
 .../src/main/res/values-sw600dp/dimens.xml    |  19 +++
 .../main/res/values-tr/strings-duckchat.xml   |   2 -
 .../src/main/res/values/dimens.xml            |   1 +
 .../src/main/res/values/strings-duckchat.xml  |   5 +-
 .../settings/DuckChatSettingsViewModelTest.kt |  29 +++--
 42 files changed, 445 insertions(+), 94 deletions(-)
 create mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_background.xml
 create mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_background_active.xml
 create mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai.xml
 create mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_active.xml
 create mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai.xml
 create mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_active.xml
 create mode 100644 duckchat/duckchat-impl/src/main/res/values-sw600dp/dimens.xml

diff --git a/.maestro/input_screen/input_screen_chat_mode.yaml b/.maestro/input_screen/input_screen_chat_mode.yaml
index 9bb47b39c6a4..feb1f9c6e0d3 100644
--- a/.maestro/input_screen/input_screen_chat_mode.yaml
+++ b/.maestro/input_screen/input_screen_chat_mode.yaml
@@ -14,9 +14,7 @@ tags:
       # enable the Input Screen
       - runFlow: ../shared/open_ai_settings_screen.yaml
       - tapOn:
-          id: "trailingSwitch"
-          childOf:
-            id: "duckAiInputScreenEnabledToggle"
+          id: "duckAiInputScreenToggleWithAiImage"
       - action: back
       - action: back
 
diff --git a/.maestro/input_screen/input_screen_preference_management.yaml b/.maestro/input_screen/input_screen_preference_management.yaml
index 9d4e82a240b3..2b9844dca081 100644
--- a/.maestro/input_screen/input_screen_preference_management.yaml
+++ b/.maestro/input_screen/input_screen_preference_management.yaml
@@ -20,9 +20,7 @@ tags:
       # enable the Input Screen
       - runFlow: ../shared/open_ai_settings_screen.yaml
       - tapOn:
-          id: "trailingSwitch"
-          childOf:
-            id: "duckAiInputScreenEnabledToggle"
+          id: "duckAiInputScreenToggleWithAiImage"
       - action: back
       - action: back
 
diff --git a/.maestro/input_screen/input_screen_search_mode.yaml b/.maestro/input_screen/input_screen_search_mode.yaml
index a9148cd59132..77312593f355 100644
--- a/.maestro/input_screen/input_screen_search_mode.yaml
+++ b/.maestro/input_screen/input_screen_search_mode.yaml
@@ -14,9 +14,7 @@ tags:
       # enable the Input Screen
       - runFlow: ../shared/open_ai_settings_screen.yaml
       - tapOn:
-          id: "trailingSwitch"
-          childOf:
-            id: "duckAiInputScreenEnabledToggle"
+          id: "duckAiInputScreenToggleWithAiImage"
       - action: back
       - action: back
 
diff --git a/common/common-ui/src/main/res/values/design-experiments-theming.xml b/common/common-ui/src/main/res/values/design-experiments-theming.xml
index 694d1e0a58e0..e102c73a0266 100644
--- a/common/common-ui/src/main/res/values/design-experiments-theming.xml
+++ b/common/common-ui/src/main/res/values/design-experiments-theming.xml
@@ -40,6 +40,7 @@
         <item name="daxColorControlFillPrimary">@color/controls_fill_primary_dark</item>
         <item name="daxColorControlFillSecondary">@color/controls_fill_secondary_dark</item>
         <item name="daxColorControlFillTertiary">@color/controls_fill_tertiary_dark</item>
+        <item name="daxColorControlDecorationTertiary">@color/controls_decoration_tertiary_dark</item>
 
         <!-- Widgets -->
         <item name="daxColorToolbar">?attr/daxColorBackground</item>
@@ -83,6 +84,7 @@
         <item name="daxColorControlFillPrimary">@color/controls_fill_primary_light</item>
         <item name="daxColorControlFillSecondary">@color/controls_fill_secondary_light</item>
         <item name="daxColorControlFillTertiary">@color/controls_fill_tertiary_light</item>
+        <item name="daxColorControlDecorationTertiary">@color/controls_decoration_tertiary_light</item>
 
         <!-- Widgets -->
         <item name="daxColorToolbar">?attr/daxColorBackground</item>
diff --git a/common/common-ui/src/main/res/values/design-system-colors.xml b/common/common-ui/src/main/res/values/design-system-colors.xml
index 3c6e025e93a6..50a6a0dbaa6c 100644
--- a/common/common-ui/src/main/res/values/design-system-colors.xml
+++ b/common/common-ui/src/main/res/values/design-system-colors.xml
@@ -74,6 +74,7 @@
     <attr name="daxColorControlFillPrimary" format="color"/>
     <attr name="daxColorControlFillSecondary" format="color"/>
     <attr name="daxColorControlFillTertiary" format="color"/>
+    <attr name="daxColorControlDecorationTertiary" format="color"/>
 
     <attr name="daxColorButtonPrimaryContainer" format="color"/>
     <attr name="daxColorButtonPrimaryContainerPressed" format="color"/>
diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
index 8089daf6e521..5daf8db7407e 100644
--- a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
+++ b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
@@ -61,11 +61,6 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
             viewModel.onDuckChatUserEnabledToggled(isChecked)
         }
 
-    private val inputScreenToggleListener =
-        CompoundButton.OnCheckedChangeListener { _, isChecked ->
-            viewModel.onDuckAiInputScreenToggled(isChecked)
-        }
-
     @Inject
     lateinit var globalActivityStarter: GlobalActivityStarter
 
@@ -135,18 +130,38 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
             ),
         )
 
-        binding.duckAiInputScreenEnabledToggle.apply {
-            isVisible = viewState.shouldShowInputScreenToggle
-            quietlySetIsChecked(viewState.isInputScreenEnabled, inputScreenToggleListener)
-        }
+        binding.duckAiInputScreenToggleContainer.isVisible = viewState.shouldShowInputScreenToggle
+        configureInputScreenToggle(
+            withoutAi = InputScreenToggleButton.WithoutAi(isActive = !viewState.isInputScreenEnabled),
+            withAi = InputScreenToggleButton.WithAi(isActive = viewState.isInputScreenEnabled),
+        )
+
+        binding.duckAiInputScreenDescription.isVisible = viewState.shouldShowInputScreenToggle
+        binding.duckAiInputScreenDescription.addClickableSpan(
+            textSequence = getText(R.string.input_screen_user_pref_description),
+            spans = listOf(
+                "share_feedback" to object : DuckDuckGoClickableSpan() {
+                    override fun onClick(widget: View) {
+                        viewModel.duckAiInputScreenShareFeedbackClicked()
+                    }
+                },
+            ),
+        )
 
         binding.duckAiShortcuts.isVisible = viewState.shouldShowShortcuts
         binding.duckAiShortcuts.setOnClickListener {
             viewModel.onDuckAiShortcutsClicked()
         }
+
         binding.showDuckChatSearchSettingsLink.setOnClickListener {
             viewModel.duckChatSearchAISettingsClicked()
         }
+        binding.duckAiInputScreenWithoutAiContainer.setOnClickListener {
+            viewModel.onDuckAiInputScreenWithoutAiSelected()
+        }
+        binding.duckAiInputScreenWithAiContainer.setOnClickListener {
+            viewModel.onDuckAiInputScreenWithAiSelected()
+        }
     }
 
     private fun processCommand(command: DuckChatSettingsViewModel.Command) {
@@ -168,6 +183,54 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
                 val intent = Intent(this, DuckAiShortcutSettingsActivity::class.java)
                 startActivity(intent)
             }
+
+            is DuckChatSettingsViewModel.Command.LaunchFeedback -> {
+                globalActivityStarter.start(this, FeedbackActivityWithEmptyParams)
+            }
+        }
+    }
+
+    private fun configureInputScreenToggle(
+        withoutAi: InputScreenToggleButton,
+        withAi: InputScreenToggleButton,
+    ) = with(binding) {
+        val context = this@DuckChatSettingsActivity
+        duckAiInputScreenToggleWithoutAiImage.setImageDrawable(ContextCompat.getDrawable(context, withoutAi.imageRes))
+        duckAiInputScreenToggleWithoutAiImage.setBackgroundResource(withoutAi.backgroundRes)
+        duckAiInputScreenToggleWithoutAiCheck.setImageDrawable(ContextCompat.getDrawable(context, withoutAi.checkRes))
+
+        duckAiInputScreenToggleWithAiImage.setImageDrawable(ContextCompat.getDrawable(context, withAi.imageRes))
+        duckAiInputScreenToggleWithAiImage.setBackgroundResource(withAi.backgroundRes)
+        duckAiInputScreenToggleWithAiCheck.setImageDrawable(ContextCompat.getDrawable(context, withAi.checkRes))
+    }
+
+    private sealed class InputScreenToggleButton(isActive: Boolean) {
+        abstract val imageRes: Int
+        val backgroundRes: Int = if (isActive) {
+            R.drawable.searchbox_background_active
+        } else {
+            R.drawable.searchbox_background
+        }
+        val checkRes: Int = if (isActive) {
+            CommonR.drawable.ic_check_blue_round_24
+        } else {
+            CommonR.drawable.ic_shape_circle_24
+        }
+
+        class WithoutAi(isActive: Boolean): InputScreenToggleButton(isActive) {
+            override val imageRes: Int = if (isActive) {
+                R.drawable.searchbox_withoutai_active
+            } else {
+                R.drawable.searchbox_withoutai
+            }
+        }
+
+        class WithAi(isActive: Boolean): InputScreenToggleButton(isActive) {
+            override val imageRes: Int = if (isActive) {
+                R.drawable.searchbox_withai_active
+            } else {
+                R.drawable.searchbox_withai
+            }
         }
     }
 }
diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModel.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModel.kt
index d0c55884ff30..2a8ec919d589 100644
--- a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModel.kt
+++ b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModel.kt
@@ -71,6 +71,7 @@ class DuckChatSettingsViewModel @Inject constructor(
         data class OpenLink(val link: String) : Command()
         data class OpenLinkInNewTab(val link: String) : Command()
         data object OpenShortcutSettings : Command()
+        data object LaunchFeedback : Command()
     }
 
     fun onDuckChatUserEnabledToggled(checked: Boolean) {
@@ -84,17 +85,6 @@ class DuckChatSettingsViewModel @Inject constructor(
         }
     }
 
-    fun onDuckAiInputScreenToggled(checked: Boolean) {
-        viewModelScope.launch {
-            if (checked) {
-                pixel.fire(DuckChatPixelName.DUCK_CHAT_EXPERIMENTAL_ADDRESS_BAR_SETTING_ON)
-            } else {
-                pixel.fire(DuckChatPixelName.DUCK_CHAT_EXPERIMENTAL_ADDRESS_BAR_SETTING_OFF)
-            }
-            duckChat.setInputScreenUserSetting(checked)
-        }
-    }
-
     fun onShowDuckChatInMenuToggled(checked: Boolean) {
         viewModelScope.launch {
             if (checked) {
@@ -136,6 +126,26 @@ class DuckChatSettingsViewModel @Inject constructor(
         }
     }
 
+    fun onDuckAiInputScreenWithoutAiSelected() {
+        viewModelScope.launch {
+            pixel.fire(DuckChatPixelName.DUCK_CHAT_EXPERIMENTAL_ADDRESS_BAR_SETTING_OFF)
+            duckChat.setInputScreenUserSetting(enabled = false)
+        }
+    }
+
+    fun onDuckAiInputScreenWithAiSelected() {
+        viewModelScope.launch {
+            pixel.fire(DuckChatPixelName.DUCK_CHAT_EXPERIMENTAL_ADDRESS_BAR_SETTING_ON)
+            duckChat.setInputScreenUserSetting(enabled = true)
+        }
+    }
+
+    fun duckAiInputScreenShareFeedbackClicked() {
+        viewModelScope.launch {
+            commandChannel.send(Command.LaunchFeedback)
+        }
+    }
+
     companion object {
         const val DUCK_CHAT_LEARN_MORE_LINK = "https://duckduckgo.com/duckduckgo-help-pages/aichat/"
         const val DUCK_CHAT_SEARCH_AI_SETTINGS_LINK = "https://duckduckgo.com/settings?ko=-1#aifeatures"
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_background.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_background.xml
new file mode 100644
index 000000000000..92e9b8608745
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_background.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="16dp" />
+
+    <solid android:color="?attr/daxColorLines" />
+
+</shape>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_background_active.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_background_active.xml
new file mode 100644
index 000000000000..0fa50d58b7ff
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_background_active.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="16dp" />
+
+    <solid android:color="?attr/daxOmnibarTextColorHighlight" />
+
+    <stroke
+        android:width="1dp"
+        android:color="?attr/daxColorAccentBlue" />
+
+</shape>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai.xml
new file mode 100644
index 000000000000..ec49ef7b558b
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai.xml
@@ -0,0 +1,31 @@
+<!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="72dp"
+    android:viewportWidth="128"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"
+      android:fillColor="?attr/daxColorWindow"/>
+  <path
+      android:pathData="M112,36a8,8 0,0 1,8 8v8a8,8 0,0 1,-8 8H16a8,8 0,0 1,-8 -8v-8a8,8 0,0 1,8 -8h96ZM82,12c5.52,0 10,4.48 10,10s-4.48,10 -10,10H46c-5.52,0 -10,-4.48 -10,-10s4.48,-10 10,-10h36Z"
+      android:fillColor="?attr/daxColorControlFillPrimary"/>
+  <path
+      android:pathData="M116,0c6.63,0 12,5.37 12,12v60h-1L127,12c0,-6.07 -4.93,-11 -11,-11L12,1C5.93,1 1,5.93 1,12v60L0,72L0,12C0,5.37 5.37,0 12,0h104ZM112.41,36.01A8,8 0,0 1,120 44v8a8,8 0,0 1,-7.59 7.99L112,60L16,60a8,8 0,0 1,-7.99 -7.59L8,52v-8a8,8 0,0 1,8 -8h96l0.41,0.01ZM16,37a7,7 0,0 0,-7 7v8a7,7 0,0 0,7 7h96a7,7 0,0 0,7 -7v-8a7,7 0,0 0,-7 -7L16,37ZM82,12c5.52,0 10,4.48 10,10 0,5.35 -4.2,9.72 -9.48,9.99L82,32L46,32l-0.51,-0.01C40.2,31.72 36,27.35 36,22c0,-5.52 4.48,-10 10,-10h36ZM46,13a9,9 0,1 0,0 18h36a9,9 0,1 0,0 -18L46,13ZM56,14a8,8 0,1 1,0 16L46,30a8,8 0,1 1,0 -16h10ZM50.25,16a5.25,5.25 0,1 0,3.34 9.3l2.56,2.56 0.08,0.06a0.5,0.5 0,0 0,0.69 -0.69l-0.06,-0.08 -2.55,-2.55A5.25,5.25 0,0 0,50.25 16ZM77,16c3.31,0 6,2.39 6,5.34 0,2.24 -1.55,4.16 -3.74,4.95 -1.42,0.65 -4.91,1.31 -6.9,1.65a0.53,0.53 0,0 1,-0.49 -0.88l0.97,-1.12c0.21,-0.24 0.17,-0.61 -0.07,-0.82C71.68,24.16 71,22.82 71,21.34 71,18.39 73.69,16 77,16ZM77,17c-2.87,0 -5,2.05 -5,4.34 0,1.16 0.53,2.24 1.43,3.04 0.6,0.53 0.78,1.52 0.17,2.22l-0.11,0.12a68.24,68.24 0,0 0,2.32 -0.47c1.3,-0.29 2.43,-0.6 3.04,-0.88l0.04,-0.02 0.04,-0.01c1.87,-0.68 3.08,-2.26 3.08,-4.01C82,19.05 79.87,17 77,17ZM50.25,17a4.25,4.25 0,1 1,0 8.5,4.25 4.25,0 0,1 0,-8.5ZM76.71,18.45c0.07,-0.3 0.5,-0.3 0.57,0l0.16,0.66c0.22,0.88 0.91,1.56 1.78,1.78l0.66,0.16c0.3,0.07 0.3,0.5 0,0.57l-0.66,0.17a2.45,2.45 0,0 0,-1.78 1.78l-0.16,0.66c-0.07,0.3 -0.5,0.3 -0.57,0l-0.17,-0.66a2.45,2.45 0,0 0,-1.78 -1.78l-0.66,-0.17c-0.3,-0.07 -0.3,-0.5 0,-0.57l0.66,-0.17a2.45,2.45 0,0 0,1.78 -1.78l0.17,-0.66Z"
+      android:fillColor="?attr/daxColorControlDecorationTertiary"/>
+</vector>
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_active.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_active.xml
new file mode 100644
index 000000000000..00336913a387
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_active.xml
@@ -0,0 +1,38 @@
+<!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="72dp"
+    android:viewportWidth="128"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"
+      android:fillColor="?attr/daxColorWindow"/>
+  <path
+      android:pathData="M112,36a8,8 0,0 1,8 8v8a8,8 0,0 1,-8 8H16a8,8 0,0 1,-8 -8v-8a8,8 0,0 1,8 -8h96ZM82,12c5.52,0 10,4.48 10,10s-4.48,10 -10,10H46c-5.52,0 -10,-4.48 -10,-10s4.48,-10 10,-10h36Z"
+      android:fillColor="?attr/daxColorControlFillPrimary"/>
+  <group>
+    <clip-path
+        android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"/>
+    <path
+        android:pathData="M-1,12C-1,4.82 4.82,-1 12,-1h104c7.18,0 13,5.82 13,13h-2c0,-6.07 -4.93,-11 -11,-11L12,1C5.93,1 1,5.93 1,12h-2ZM128,72L0,72h128ZM-1,72L-1,12C-1,4.82 4.82,-1 12,-1v2C5.93,1 1,5.93 1,12v60h-2ZM116,-1c7.18,0 13,5.82 13,13v60h-2L127,12c0,-6.07 -4.93,-11 -11,-11v-2Z"
+        android:fillColor="?attr/daxColorAccentBlue"/>
+  </group>
+  <path
+      android:pathData="M112.41,36.01A8,8 0,0 1,120 44v8a8,8 0,0 1,-7.59 7.99L112,60L16,60a8,8 0,0 1,-7.99 -7.59L8,52v-8a8,8 0,0 1,8 -8h96l0.41,0.01ZM16,37a7,7 0,0 0,-7 7v8a7,7 0,0 0,7 7h96a7,7 0,0 0,7 -7v-8a7,7 0,0 0,-7 -7L16,37ZM82,12c5.52,0 10,4.48 10,10 0,5.35 -4.2,9.72 -9.48,9.99L82,32L46,32l-0.51,-0.01C40.2,31.72 36,27.35 36,22c0,-5.52 4.48,-10 10,-10h36ZM46,13a9,9 0,1 0,0 18h36a9,9 0,1 0,0 -18L46,13ZM56,14a8,8 0,1 1,0 16L46,30a8,8 0,1 1,0 -16h10ZM50.25,16a5.25,5.25 0,1 0,3.34 9.3l2.56,2.56 0.08,0.06a0.5,0.5 0,0 0,0.69 -0.69l-0.06,-0.08 -2.55,-2.55A5.25,5.25 0,0 0,50.25 16ZM77,16c3.31,0 6,2.39 6,5.34 0,2.24 -1.55,4.16 -3.74,4.95 -1.42,0.65 -4.91,1.31 -6.9,1.65a0.53,0.53 0,0 1,-0.49 -0.88l0.97,-1.12c0.21,-0.24 0.17,-0.61 -0.07,-0.82C71.68,24.16 71,22.82 71,21.34 71,18.39 73.69,16 77,16ZM77,17c-2.87,0 -5,2.05 -5,4.34 0,1.16 0.53,2.24 1.43,3.04 0.6,0.53 0.78,1.52 0.17,2.22l-0.11,0.12a68.24,68.24 0,0 0,2.32 -0.47c1.3,-0.29 2.43,-0.6 3.04,-0.88l0.04,-0.02 0.04,-0.01c1.87,-0.68 3.08,-2.26 3.08,-4.01C82,19.05 79.87,17 77,17ZM50.25,17a4.25,4.25 0,1 1,0 8.5,4.25 4.25,0 0,1 0,-8.5ZM76.71,18.45c0.07,-0.3 0.5,-0.3 0.57,0l0.16,0.66c0.22,0.88 0.91,1.56 1.78,1.78l0.66,0.16c0.3,0.07 0.3,0.5 0,0.57l-0.66,0.17a2.45,2.45 0,0 0,-1.78 1.78l-0.16,0.66c-0.07,0.3 -0.5,0.3 -0.57,0l-0.17,-0.66a2.45,2.45 0,0 0,-1.78 -1.78l-0.66,-0.17c-0.3,-0.07 -0.3,-0.5 0,-0.57l0.66,-0.17a2.45,2.45 0,0 0,1.78 -1.78l0.17,-0.66Z"
+      android:fillColor="?attr/daxColorAccentBlue"/>
+</vector>
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai.xml
new file mode 100644
index 000000000000..a03ae10c531f
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai.xml
@@ -0,0 +1,38 @@
+<!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="72dp"
+    android:viewportWidth="128"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"
+      android:fillColor="?attr/daxColorWindow"/>
+  <path
+      android:pathData="M112,28a8,8 0,0 1,8 8v8a8,8 0,0 1,-8 8H16a8,8 0,0 1,-8 -8v-8a8,8 0,0 1,8 -8h96Z"
+      android:fillColor="?attr/daxColorControlFillPrimary"/>
+  <group>
+    <clip-path
+        android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"/>
+    <path
+        android:pathData="M-1,12C-1,4.82 4.82,-1 12,-1h104c7.18,0 13,5.82 13,13h-2c0,-6.07 -4.93,-11 -11,-11L12,1C5.93,1 1,5.93 1,12h-2ZM128,72L0,72h128ZM-1,72L-1,12C-1,4.82 4.82,-1 12,-1v2C5.93,1 1,5.93 1,12v60h-2ZM116,-1c7.18,0 13,5.82 13,13v60h-2L127,12c0,-6.07 -4.93,-11 -11,-11v-2Z"
+        android:fillColor="?attr/daxColorControlDecorationTertiary"/>
+  </group>
+  <path
+      android:pathData="M112.41,28.01A8,8 0,0 1,120 36v8a8,8 0,0 1,-7.59 7.99L112,52L16,52a8,8 0,0 1,-7.99 -7.59L8,44v-8a8,8 0,0 1,8 -8h96l0.41,0.01ZM16,29a7,7 0,0 0,-7 7v8a7,7 0,0 0,7 7h96a7,7 0,0 0,7 -7v-8a7,7 0,0 0,-7 -7L16,29ZM19.25,34a5.25,5.25 0,0 1,4.05 8.59l2.56,2.56 0.06,0.08a0.5,0.5 0,0 1,-0.69 0.69l-0.08,-0.06 -2.55,-2.55A5.25,5.25 0,1 1,19.25 34ZM19.25,35a4.25,4.25 0,1 0,0 8.5,4.25 4.25,0 0,0 0,-8.5Z"
+      android:fillColor="?attr/daxColorControlDecorationTertiary"/>
+</vector>
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_active.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_active.xml
new file mode 100644
index 000000000000..4c001cf046be
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_active.xml
@@ -0,0 +1,38 @@
+<!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="72dp"
+    android:viewportWidth="128"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"
+      android:fillColor="?attr/daxColorWindow"/>
+  <path
+      android:pathData="M112,28a8,8 0,0 1,8 8v8a8,8 0,0 1,-8 8H16a8,8 0,0 1,-8 -8v-8a8,8 0,0 1,8 -8h96Z"
+      android:fillColor="?attr/daxColorControlFillPrimary"/>
+  <group>
+    <clip-path
+        android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"/>
+    <path
+        android:pathData="M-1,12C-1,4.82 4.82,-1 12,-1h104c7.18,0 13,5.82 13,13h-2c0,-6.07 -4.93,-11 -11,-11L12,1C5.93,1 1,5.93 1,12h-2ZM128,72L0,72h128ZM-1,72L-1,12C-1,4.82 4.82,-1 12,-1v2C5.93,1 1,5.93 1,12v60h-2ZM116,-1c7.18,0 13,5.82 13,13v60h-2L127,12c0,-6.07 -4.93,-11 -11,-11v-2Z"
+        android:fillColor="?attr/daxColorAccentBlue"/>
+  </group>
+  <path
+      android:pathData="M112.41,28.01A8,8 0,0 1,120 36v8a8,8 0,0 1,-7.59 7.99L112,52L16,52a8,8 0,0 1,-7.99 -7.59L8,44v-8a8,8 0,0 1,8 -8h96l0.41,0.01ZM16,29a7,7 0,0 0,-7 7v8a7,7 0,0 0,7 7h96a7,7 0,0 0,7 -7v-8a7,7 0,0 0,-7 -7L16,29ZM19.25,34a5.25,5.25 0,0 1,4.05 8.59l2.56,2.56 0.06,0.08a0.5,0.5 0,0 1,-0.69 0.69l-0.08,-0.06 -2.55,-2.55A5.25,5.25 0,1 1,19.25 34ZM19.25,35a4.25,4.25 0,1 0,0 8.5,4.25 4.25,0 0,0 0,-8.5Z"
+      android:fillColor="?attr/daxColorAccentBlue"/>
+</vector>
diff --git a/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml b/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
index dabaf6511d24..11fc28969026 100644
--- a/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
+++ b/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
@@ -19,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.DuckChatSettingsActivity">
+    tools:context=".ui.settings.DuckChatSettingsActivity">
 
     <include
         android:id="@+id/includeToolbar"
@@ -89,14 +89,112 @@
                 app:secondaryText="@string/duck_chat_enable_duck_ai_setting_description_rebranding"
                 app:showSwitch="true" />
 
-            <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
-                android:id="@+id/duckAiInputScreenEnabledToggle"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/duckAiInputScreenToggleContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:primaryText="@string/input_screen_user_pref_title"
-                app:secondaryText="@string/input_screen_user_pref_description"
-                app:showBetaPill="true"
-                app:showSwitch="true"/>
+                android:layout_marginTop="@dimen/keyline_4"
+                android:layout_marginHorizontal="@dimen/keyline_4">
+
+                <LinearLayout
+                    android:id="@+id/duckAiInputScreenWithoutAiContainer"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="@dimen/keyline_2"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    app:layout_constraintWidth_max="160dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/duckAiInputScreenWithAiContainer"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <ImageView
+                        android:id="@+id/duckAiInputScreenToggleWithoutAiImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:scaleType="fitCenter"
+                        android:background="@drawable/searchbox_background_active"
+                        android:paddingStart="16dp"
+                        android:paddingTop="16dp"
+                        android:paddingEnd="16dp"
+                        android:paddingBottom="1dp"
+                        android:src="@drawable/searchbox_withoutai_active" />
+
+                    <com.duckduckgo.common.ui.view.text.DaxTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:gravity="center"
+                        android:text="@string/input_screen_user_pref_without_ai"
+                        app:textType="primary"
+                        app:typography="caption" />
+
+                    <ImageView
+                        android:id="@+id/duckAiInputScreenToggleWithoutAiCheck"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:src="@drawable/ic_check_blue_round_24" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/duckAiInputScreenWithAiContainer"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/inputScreenUserPrefToggleSpacing"
+                    android:paddingBottom="@dimen/keyline_2"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    app:layout_constraintWidth_max="160dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/duckAiInputScreenWithoutAiContainer"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <ImageView
+                        android:id="@+id/duckAiInputScreenToggleWithAiImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:scaleType="fitCenter"
+                        android:background="@drawable/searchbox_background"
+                        android:paddingStart="16dp"
+                        android:paddingTop="16dp"
+                        android:paddingEnd="16dp"
+                        android:paddingBottom="1dp"
+                        android:src="@drawable/searchbox_withai" />
+
+                    <com.duckduckgo.common.ui.view.text.DaxTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:gravity="center"
+                        android:text="@string/input_screen_user_pref_with_ai"
+                        app:textType="primary"
+                        app:typography="caption" />
+
+                    <ImageView
+                        android:id="@+id/duckAiInputScreenToggleWithAiCheck"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:src="@drawable/ic_shape_circle_24" />
+
+                </LinearLayout>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <com.duckduckgo.common.ui.view.text.DaxTextView
+                android:id="@+id/duckAiInputScreenDescription"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/keyline_4"
+                android:layout_marginTop="@dimen/keyline_2"
+                android:layout_marginBottom="@dimen/keyline_4"
+                android:text="@string/input_screen_user_pref_description"
+                app:typography="body2" />
 
             <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
                 android:id="@+id/duckAiShortcuts"
diff --git a/duckchat/duckchat-impl/src/main/res/values-bg/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-bg/strings-duckchat.xml
index dc4a4aaba028..054ebe76b2f7 100644
--- a/duckchat/duckchat-impl/src/main/res/values-bg/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-bg/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Търсене или въвеждане на адрес</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Попитай Duck.ai</string>
-    <string name="input_screen_user_pref_title">Експериментална адресна лента</string>
-    <string name="input_screen_user_pref_description">Потърсете в мрежата или попитайте Duck.ai директно от адресната лента</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-cs/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-cs/strings-duckchat.xml
index 01a920ffd2ea..5ef8d96db45e 100644
--- a/duckchat/duckchat-impl/src/main/res/values-cs/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-cs/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Vyhledejte nebo zadejte adresu</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Zeptej se Duck.ai</string>
-    <string name="input_screen_user_pref_title">Experimentální adresní řádek</string>
-    <string name="input_screen_user_pref_description">Hledej na webu nebo se zeptej Duck.ai přímo v adresním řádku.</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-da/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-da/strings-duckchat.xml
index 32023ee913f0..da48fa695fe5 100644
--- a/duckchat/duckchat-impl/src/main/res/values-da/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-da/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Søg eller indtast adresse</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Spørg Duck.ai</string>
-    <string name="input_screen_user_pref_title">Eksperimentel adresselinje</string>
-    <string name="input_screen_user_pref_description">Søg på nettet eller spørg Duck.ai direkte fra adresselinjen</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-de/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-de/strings-duckchat.xml
index 5d644a211902..6f47e9c615bc 100644
--- a/duckchat/duckchat-impl/src/main/res/values-de/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-de/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Adresse suchen oder eingeben</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Frag Duck.ai</string>
-    <string name="input_screen_user_pref_title">Experimentelle Adressleiste</string>
-    <string name="input_screen_user_pref_description">Suche im Web oder frag Duck.ai direkt über die Adressleiste</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-el/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-el/strings-duckchat.xml
index b821f998196e..f9dfe1e6fe78 100644
--- a/duckchat/duckchat-impl/src/main/res/values-el/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-el/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Αναζήτηση ή εισαγωγή διεύθυνσης</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Ρωτήστε το Duck.ai</string>
-    <string name="input_screen_user_pref_title">Πειραματική γραμμή διευθύνσεων</string>
-    <string name="input_screen_user_pref_description">Κάντε αναζήτηση στο διαδίκτυο ή ρωτήστε το Duck.ai απευθείας από τη Γραμμή διευθύνσεων</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-es/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-es/strings-duckchat.xml
index 534a58bc1222..07b538032318 100644
--- a/duckchat/duckchat-impl/src/main/res/values-es/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-es/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Buscar o introducir dirección</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Pregúntale a Duck.ai</string>
-    <string name="input_screen_user_pref_title">Barra de direcciones experimental</string>
-    <string name="input_screen_user_pref_description">Busca en la web o pregúntale a Duck.ai directamente desde la barra de direcciones</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-et/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-et/strings-duckchat.xml
index 3847ae24b6ed..0f5c674e2233 100644
--- a/duckchat/duckchat-impl/src/main/res/values-et/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-et/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Otsi või sisesta aadress</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Küsi Duck.ai käest</string>
-    <string name="input_screen_user_pref_title">Eksperimentaalne aadressiriba</string>
-    <string name="input_screen_user_pref_description">Otsi veebist või küsi Duck.ai-lt otse aadressiribal</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-fi/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-fi/strings-duckchat.xml
index 229a5afb3ebb..ff2966177f6f 100644
--- a/duckchat/duckchat-impl/src/main/res/values-fi/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-fi/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Hae tai anna osoite</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Kysy Duck.ai:lta</string>
-    <string name="input_screen_user_pref_title">Kokeellinen osoitekenttä</string>
-    <string name="input_screen_user_pref_description">Hae verkosta tai kysy Duck.ai:lta kirjoittamalla suoraan osoiteriville</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-fr/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-fr/strings-duckchat.xml
index e5eefc386859..3b7956d3a77b 100644
--- a/duckchat/duckchat-impl/src/main/res/values-fr/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-fr/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Rechercher ou saisir une adresse</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Demandez à Duck.ai</string>
-    <string name="input_screen_user_pref_title">Barre d\'adresse expérimentale</string>
-    <string name="input_screen_user_pref_description">Effectuez une recherche sur le Web ou interrogez Duck.ai directement à partir de la barre d’adresse</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-hr/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-hr/strings-duckchat.xml
index ed89d1ef95ed..8b716c3fab42 100644
--- a/duckchat/duckchat-impl/src/main/res/values-hr/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-hr/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Pretraži ili unesi adresu</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Pitaj Duck.ai</string>
-    <string name="input_screen_user_pref_title">Eksperimentalna adresna traka</string>
-    <string name="input_screen_user_pref_description">Pretraži mrežu ili pitaj Duck.ai izravno iz adresne trake</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-hu/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-hu/strings-duckchat.xml
index 0e047a79ed8f..2ce86c4e1f6f 100644
--- a/duckchat/duckchat-impl/src/main/res/values-hu/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-hu/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Keresés vagy cím megadása</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Duck.ai kérdezése</string>
-    <string name="input_screen_user_pref_title">Kísérleti címsor</string>
-    <string name="input_screen_user_pref_description">Keresés a weben vagy a Duck.ai megkérdezése közvetlenül a címsorból</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-it/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-it/strings-duckchat.xml
index dfa527fae3c0..2efad85de650 100644
--- a/duckchat/duckchat-impl/src/main/res/values-it/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-it/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Cerca o digita l\'indirizzo</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Chiedi a Duck.ai</string>
-    <string name="input_screen_user_pref_title">Barra degli indirizzi sperimentale</string>
-    <string name="input_screen_user_pref_description">Cerca sul web o chiedi a Duck.ai direttamente dalla barra degli indirizzi</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-lt/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-lt/strings-duckchat.xml
index 5cbe75429a37..6e2e71c86755 100644
--- a/duckchat/duckchat-impl/src/main/res/values-lt/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-lt/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Ieškoti arba įvesti adresą</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Paklausk „Duck.ai“</string>
-    <string name="input_screen_user_pref_title">Eksperimentinė adreso juosta</string>
-    <string name="input_screen_user_pref_description">Ieškok internete arba klausk „Duck.ai“ tiesiai iš adreso juostos</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-lv/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-lv/strings-duckchat.xml
index cc00b090cfd5..e9434cc1bcf5 100644
--- a/duckchat/duckchat-impl/src/main/res/values-lv/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-lv/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Meklē vai ievadi adresi</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Pajautā Duck.ai</string>
-    <string name="input_screen_user_pref_title">Eksperimentālā adreses josla</string>
-    <string name="input_screen_user_pref_description">Meklē tīmeklī vai jautā Duck.ai tieši adrešu joslā</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-nb/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-nb/strings-duckchat.xml
index 60780367b59e..cb89f9793bd6 100644
--- a/duckchat/duckchat-impl/src/main/res/values-nb/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-nb/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Søk eller skriv inn adresse</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Spør Duck.ai</string>
-    <string name="input_screen_user_pref_title">Eksperimentell adresselinje</string>
-    <string name="input_screen_user_pref_description">Søk på nettet eller spør Duck.ai direkte fra adressefeltet</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-nl/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-nl/strings-duckchat.xml
index d6a58a9fd35f..f03d8a563bf5 100644
--- a/duckchat/duckchat-impl/src/main/res/values-nl/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-nl/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Zoek of voer een adres in</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Vraag stellen aan Duck.ai</string>
-    <string name="input_screen_user_pref_title">Experimentele adresbalk</string>
-    <string name="input_screen_user_pref_description">Zoeken op het web of direct een vraag stellen aan Duck.ai vanuit de adresbalk</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-pl/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-pl/strings-duckchat.xml
index 80b607932cf7..93ce8c3afe11 100644
--- a/duckchat/duckchat-impl/src/main/res/values-pl/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-pl/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Wyszukaj lub wprowadź adres</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Zapytaj Duck.ai</string>
-    <string name="input_screen_user_pref_title">Eksperymentalny Pasek Adresu</string>
-    <string name="input_screen_user_pref_description">Wyszukaj w Internecie lub zapytaj Duck.ai bezpośrednio z paska adresu</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-pt/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-pt/strings-duckchat.xml
index ed4bfa522b76..7b5cc8ecb1f6 100644
--- a/duckchat/duckchat-impl/src/main/res/values-pt/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-pt/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Pesquisar ou inserir endereço</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Pergunta ao Duck.ai</string>
-    <string name="input_screen_user_pref_title">Barra de endereços experimental</string>
-    <string name="input_screen_user_pref_description">Pesquise na web ou pergunte diretamente ao Duck.ai na barra de endereços</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-ro/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-ro/strings-duckchat.xml
index 573992401727..802af54372ab 100644
--- a/duckchat/duckchat-impl/src/main/res/values-ro/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-ro/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Caută sau introdu adresa</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Întreabă Duck.ai</string>
-    <string name="input_screen_user_pref_title">Bară de adrese experimentală</string>
-    <string name="input_screen_user_pref_description">Caută pe web sau întreabă Duck.ai direct din bara de adrese</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-ru/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-ru/strings-duckchat.xml
index 6de77a8d2c56..9ad4a742345d 100644
--- a/duckchat/duckchat-impl/src/main/res/values-ru/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-ru/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Введите поисковый запрос или адрес сайта</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Спросить у Duck.ai</string>
-    <string name="input_screen_user_pref_title">Пробная адресная строка</string>
-    <string name="input_screen_user_pref_description">Выполнить поиск в интернете или задать вопрос ИИ-ассистенту Duck.ai можно прямо из адресной строки.</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-sk/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-sk/strings-duckchat.xml
index 107b8d166bbc..052f7286a283 100644
--- a/duckchat/duckchat-impl/src/main/res/values-sk/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-sk/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Vyhľadajte alebo zadajte adresu</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Spýtaj sa Duck.ai</string>
-    <string name="input_screen_user_pref_title">Experimentálny riadok adresy</string>
-    <string name="input_screen_user_pref_description">Vyhľadaj na webe alebo sa opýtaj Duck.ai priamo z riadku pre adresu</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-sl/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-sl/strings-duckchat.xml
index b9d21a550bc6..0157be7f17e8 100644
--- a/duckchat/duckchat-impl/src/main/res/values-sl/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-sl/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Poišči ali vnesi naslov</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Vprašajte Duck.ai</string>
-    <string name="input_screen_user_pref_title">Eksperimentalna naslovna vrstica</string>
-    <string name="input_screen_user_pref_description">Išči po spletu ali vprašaj Duck.ai neposredno iz naslovne vrstice</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-sv/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-sv/strings-duckchat.xml
index 860559aeb74d..cabcab2935e4 100644
--- a/duckchat/duckchat-impl/src/main/res/values-sv/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-sv/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Sök eller ange adress</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Fråga Duck.ai</string>
-    <string name="input_screen_user_pref_title">Experimentell adressfält</string>
-    <string name="input_screen_user_pref_description">Sök på webben eller fråga Duck.ai direkt i adressfältet</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values-sw600dp/dimens.xml b/duckchat/duckchat-impl/src/main/res/values-sw600dp/dimens.xml
new file mode 100644
index 000000000000..440a2c1ae035
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/values-sw600dp/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <dimen name="inputScreenUserPrefToggleSpacing">160dp</dimen>
+</resources>
diff --git a/duckchat/duckchat-impl/src/main/res/values-tr/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values-tr/strings-duckchat.xml
index dfed7b04b934..29d7fbfee455 100644
--- a/duckchat/duckchat-impl/src/main/res/values-tr/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values-tr/strings-duckchat.xml
@@ -49,8 +49,6 @@
     <string name="input_screen_search_hint">Adres ara veya gir</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Duck.ai\'a sor</string>
-    <string name="input_screen_user_pref_title">Deneysel Adres Çubuğu</string>
-    <string name="input_screen_user_pref_description">Web\'de arama yapın veya doğrudan Adres Çubuğundan Duck.ai\'a sorun</string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/main/res/values/dimens.xml b/duckchat/duckchat-impl/src/main/res/values/dimens.xml
index 1d31b9523d65..67f1d03b2f99 100644
--- a/duckchat/duckchat-impl/src/main/res/values/dimens.xml
+++ b/duckchat/duckchat-impl/src/main/res/values/dimens.xml
@@ -19,4 +19,5 @@
     <dimen name="inputModeTabIndicatorHeight">34dp</dimen>
     <dimen name="inputModeTabIndicatorHorizontalInset">2dp</dimen>
     <dimen name="inputModeTabIndicatorElevation">5dp</dimen>
+    <dimen name="inputScreenUserPrefToggleSpacing">16dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml
index 82a9ab68a64b..d98184690982 100644
--- a/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml
@@ -50,8 +50,9 @@
     <string name="input_screen_search_hint">Search or enter address</string>
     <string name="input_screen_chat_tab">Duck.ai</string>
     <string name="input_screen_chat_hint">Ask Duck.ai</string>
-    <string name="input_screen_user_pref_title">Experimental Address Bar</string>
-    <string name="input_screen_user_pref_description">Search the web or ask Duck.ai directly from the Address Bar</string>
+    <string name="input_screen_user_pref_without_ai">Search Only\n(Default)</string>
+    <string name="input_screen_user_pref_with_ai">Search &amp; Duck.ai\n(Experimental)</string>
+    <string name="input_screen_user_pref_description">Search the web or ask Duck.ai directly from the Address Bar. <annotation type="share_feedback">Share Feedback</annotation></string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>
diff --git a/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModelTest.kt b/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModelTest.kt
index d81f6dc10c83..cae2b4136ae3 100644
--- a/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModelTest.kt
+++ b/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModelTest.kt
@@ -19,8 +19,10 @@ package com.duckduckgo.duckchat.impl.ui.settings
 import app.cash.turbine.test
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.common.test.CoroutineTestRule
+import com.duckduckgo.common.ui.experiments.visual.store.ExperimentalThemingDataStore
 import com.duckduckgo.duckchat.impl.DuckChatInternal
 import com.duckduckgo.duckchat.impl.pixel.DuckChatPixelName
+import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.LaunchFeedback
 import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenLink
 import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenLinkInNewTab
 import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenShortcutSettings
@@ -95,14 +97,14 @@ class DuckChatSettingsViewModelTest {
     }
 
     @Test
-    fun `when onDuckAiInputScreen enabled then set user setting`() = runTest {
-        testee.onDuckAiInputScreenToggled(true)
+    fun `when onDuckAiInputScreenWithAiSelected selected then set user setting`() = runTest {
+        testee.onDuckAiInputScreenWithAiSelected()
         verify(duckChat).setInputScreenUserSetting(true)
     }
 
     @Test
-    fun `when onDuckAiInputScreen disabled then set user setting`() = runTest {
-        testee.onDuckAiInputScreenToggled(false)
+    fun `when onDuckAiInputScreenWithoutAiSelected selected then set user setting`() = runTest {
+        testee.onDuckAiInputScreenWithoutAiSelected()
         verify(duckChat).setInputScreenUserSetting(false)
     }
 
@@ -214,14 +216,14 @@ class DuckChatSettingsViewModelTest {
     }
 
     @Test
-    fun `when onDuckAiInputScreenToggled true then on pixel fired`() = runTest {
-        testee.onDuckAiInputScreenToggled(true)
+    fun `when onDuckAiInputScreenWithAiSelected true then on pixel fired`() = runTest {
+        testee.onDuckAiInputScreenWithAiSelected()
         verify(mockPixel).fire(DuckChatPixelName.DUCK_CHAT_EXPERIMENTAL_ADDRESS_BAR_SETTING_ON)
     }
 
     @Test
-    fun `when onDuckAiInputScreenToggled false then off pixel fired`() = runTest {
-        testee.onDuckAiInputScreenToggled(false)
+    fun `when onDuckAiInputScreenWithoutAiSelected false then off pixel fired`() = runTest {
+        testee.onDuckAiInputScreenWithoutAiSelected()
         verify(mockPixel).fire(DuckChatPixelName.DUCK_CHAT_EXPERIMENTAL_ADDRESS_BAR_SETTING_OFF)
     }
 
@@ -259,4 +261,15 @@ class DuckChatSettingsViewModelTest {
             cancelAndIgnoreRemainingEvents()
         }
     }
+
+    @Test
+    fun `when input toggle share feedback clicked, then dispatch launch command`() = runTest {
+        testee.duckAiInputScreenShareFeedbackClicked()
+
+        testee.commands.test {
+            val command = awaitItem()
+            assertTrue(command is LaunchFeedback)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
 }

From d4b845536e04ddc65061deaed32d3366b5745577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lpaczos@duckduckgo.com>
Date: Thu, 14 Aug 2025 14:25:16 +0200
Subject: [PATCH 4/9] lint fixes

---
 .../impl/ui/settings/DuckAiShortcutSettingsViewModel.kt  | 9 ---------
 .../impl/ui/settings/DuckChatSettingsActivity.kt         | 6 +++---
 .../duckchat-impl/src/main/res/drawable/ic_ai_128.xml    | 4 ++--
 .../impl/ui/settings/DuckChatSettingsViewModelTest.kt    | 2 --
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsViewModel.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsViewModel.kt
index c7040a71315d..b311c74fcab5 100644
--- a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsViewModel.kt
+++ b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckAiShortcutSettingsViewModel.kt
@@ -19,20 +19,11 @@ package com.duckduckgo.duckchat.impl.ui.settings
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.duckduckgo.anvil.annotations.ContributesViewModel
-import com.duckduckgo.app.statistics.pixels.Pixel
-import com.duckduckgo.common.ui.experiments.visual.store.ExperimentalThemingDataStore
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.duckchat.impl.DuckChatInternal
-import com.duckduckgo.duckchat.impl.pixel.DuckChatPixelName
-import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenLink
-import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenLinkInNewTab
-import com.duckduckgo.subscriptions.api.SubscriptionRebrandingFeatureToggle
 import javax.inject.Inject
-import kotlinx.coroutines.channels.BufferOverflow.DROP_OLDEST
-import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 
diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
index 5daf8db7407e..06cdae501dc1 100644
--- a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
+++ b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
@@ -43,11 +43,11 @@ import com.duckduckgo.duckchat.impl.R
 import com.duckduckgo.duckchat.impl.databinding.ActivityDuckChatSettingsBinding
 import com.duckduckgo.duckchat.impl.pixel.DuckChatPixelName.DUCK_CHAT_SETTINGS_DISPLAYED
 import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.ViewState
+import com.duckduckgo.mobile.android.R as CommonR
 import com.duckduckgo.navigation.api.GlobalActivityStarter
 import javax.inject.Inject
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import com.duckduckgo.mobile.android.R as CommonR
 
 @InjectWith(ActivityScope::class)
 @ContributeToActivityStarter(DuckChatSettingsNoParams::class, screenName = "duckai.settings")
@@ -217,7 +217,7 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
             CommonR.drawable.ic_shape_circle_24
         }
 
-        class WithoutAi(isActive: Boolean): InputScreenToggleButton(isActive) {
+        class WithoutAi(isActive: Boolean) : InputScreenToggleButton(isActive) {
             override val imageRes: Int = if (isActive) {
                 R.drawable.searchbox_withoutai_active
             } else {
@@ -225,7 +225,7 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
             }
         }
 
-        class WithAi(isActive: Boolean): InputScreenToggleButton(isActive) {
+        class WithAi(isActive: Boolean) : InputScreenToggleButton(isActive) {
             override val imageRes: Int = if (isActive) {
                 R.drawable.searchbox_withai_active
             } else {
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/ic_ai_128.xml b/duckchat/duckchat-impl/src/main/res/drawable/ic_ai_128.xml
index be9e62673d9f..e25a2f97b39c 100644
--- a/duckchat/duckchat-impl/src/main/res/drawable/ic_ai_128.xml
+++ b/duckchat/duckchat-impl/src/main/res/drawable/ic_ai_128.xml
@@ -53,7 +53,7 @@
   <path
       android:pathData="M64.02,24C65.14,24 66.25,24.67 66.59,26L68.07,31.93C70.04,39.83 76.21,46 84.11,47.97L90.04,49.45C91.38,49.79 92.05,50.92 92.04,52.04C92.03,53.15 91.36,54.26 90.04,54.59L84.11,56.07C76.21,58.04 70.04,64.21 68.07,72.11L66.59,78.04C66.25,79.37 65.14,80.04 64.02,80.04C63.86,80.04 63.71,80.03 63.55,80H60V73H60.19L59.97,72.11C58,64.21 51.83,58.04 43.93,56.07L38.01,54.59C36.68,54.26 36.01,53.15 36,52.04C35.99,50.92 36.66,49.79 38.01,49.45L43.93,47.97C51.83,46 58,39.83 59.97,31.93L60.2,31H60V24H64.02Z">
     <aapt:attr name="android:fillColor">
-      <gradient 
+      <gradient
           android:startX="64.02"
           android:startY="80.04"
           android:endX="64.02"
@@ -67,7 +67,7 @@
   <path
       android:pathData="M57.45,26C57.79,24.67 58.9,24 60.02,24C61.14,24 62.25,24.67 62.59,26L64.07,31.93C66.04,39.83 72.21,46 80.11,47.97L86.04,49.45C87.38,49.79 88.05,50.92 88.04,52.04C88.03,53.15 87.36,54.26 86.04,54.59L80.11,56.07C72.21,58.04 66.04,64.21 64.07,72.11L62.59,78.04C62.25,79.37 61.14,80.04 60.02,80.04C58.9,80.04 57.79,79.37 57.45,78.04L55.97,72.11C54,64.21 47.83,58.04 39.93,56.07L34,54.59C32.68,54.26 32.01,53.15 32,52.04C31.99,50.92 32.66,49.79 34,49.45L39.93,47.97C47.83,46 54,39.83 55.97,31.93L57.45,26Z">
     <aapt:attr name="android:fillColor">
-      <gradient 
+      <gradient
           android:startX="60.02"
           android:startY="80.04"
           android:endX="60.02"
diff --git a/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModelTest.kt b/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModelTest.kt
index cae2b4136ae3..96434520a6b0 100644
--- a/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModelTest.kt
+++ b/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModelTest.kt
@@ -19,7 +19,6 @@ package com.duckduckgo.duckchat.impl.ui.settings
 import app.cash.turbine.test
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.common.test.CoroutineTestRule
-import com.duckduckgo.common.ui.experiments.visual.store.ExperimentalThemingDataStore
 import com.duckduckgo.duckchat.impl.DuckChatInternal
 import com.duckduckgo.duckchat.impl.pixel.DuckChatPixelName
 import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.LaunchFeedback
@@ -108,7 +107,6 @@ class DuckChatSettingsViewModelTest {
         verify(duckChat).setInputScreenUserSetting(false)
     }
 
-
     @Test
     fun `input screen - user preference enabled then set correct state`() = runTest {
         whenever(duckChat.observeInputScreenUserSettingEnabled()).thenReturn(flowOf(true))

From 9341caca2b2bdba866f58b33276745213148d517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lpaczos@duckduckgo.com>
Date: Tue, 19 Aug 2025 11:04:32 +0200
Subject: [PATCH 5/9] update radio buttons description copy

---
 duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml b/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml
index d98184690982..a9e4102e8c2f 100644
--- a/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml
+++ b/duckchat/duckchat-impl/src/main/res/values/strings-duckchat.xml
@@ -52,7 +52,7 @@
     <string name="input_screen_chat_hint">Ask Duck.ai</string>
     <string name="input_screen_user_pref_without_ai">Search Only\n(Default)</string>
     <string name="input_screen_user_pref_with_ai">Search &amp; Duck.ai\n(Experimental)</string>
-    <string name="input_screen_user_pref_description">Search the web or ask Duck.ai directly from the Address Bar. <annotation type="share_feedback">Share Feedback</annotation></string>
+    <string name="input_screen_user_pref_description">Try our experimental option to ask Duck.ai directly from the Address Bar. <annotation type="share_feedback">Share Feedback</annotation></string>
 
     <!-- Duck.ai Pro settings -->
     <string name="duck_ai_paid_settings_title">Duck.ai</string>

From de79e0c165d4b3ba667e9691a07a19b1d7dfdac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lpaczos@duckduckgo.com>
Date: Tue, 19 Aug 2025 12:19:28 +0200
Subject: [PATCH 6/9] update pictograms to use integrated backgrounds

---
 .../ui/settings/DuckChatSettingsActivity.kt   | 38 +++++-----
 .../res/drawable/searchbox_background.xml     | 24 -------
 .../drawable/searchbox_background_active.xml  | 28 --------
 .../main/res/drawable/searchbox_withai.xml    | 31 --------
 .../res/drawable/searchbox_withai_active.xml  | 69 +++++++++---------
 .../drawable/searchbox_withai_active_dark.xml | 43 ++++++++++++
 .../drawable/searchbox_withai_inactive.xml    | 67 ++++++++++++++++++
 .../searchbox_withai_inactive_dark.xml        | 70 +++++++++++++++++++
 .../main/res/drawable/searchbox_withoutai.xml | 38 ----------
 .../drawable/searchbox_withoutai_active.xml   | 66 ++++++++---------
 .../searchbox_withoutai_active_dark.xml       | 39 +++++++++++
 .../drawable/searchbox_withoutai_inactive.xml | 41 +++++++++++
 .../searchbox_withoutai_inactive_dark.xml     | 46 ++++++++++++
 .../layout/activity_duck_chat_settings.xml    | 12 +---
 14 files changed, 395 insertions(+), 217 deletions(-)
 delete mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_background.xml
 delete mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_background_active.xml
 delete mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai.xml
 create mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_active_dark.xml
 create mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_inactive.xml
 create mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_inactive_dark.xml
 delete mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai.xml
 create mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_active_dark.xml
 create mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_inactive.xml
 create mode 100644 duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_inactive_dark.xml

diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
index 06cdae501dc1..1fdf1c0dea45 100644
--- a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
+++ b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
@@ -33,6 +33,7 @@ import com.duckduckgo.browser.api.ui.BrowserScreens.FeedbackActivityWithEmptyPar
 import com.duckduckgo.browser.api.ui.BrowserScreens.WebViewActivityWithParams
 import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.common.ui.spans.DuckDuckGoClickableSpan
+import com.duckduckgo.common.ui.store.AppTheme
 import com.duckduckgo.common.ui.view.addClickableSpan
 import com.duckduckgo.common.ui.view.gone
 import com.duckduckgo.common.ui.view.show
@@ -70,6 +71,9 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
     @Inject
     lateinit var pixel: Pixel
 
+    @Inject
+    lateinit var appTheme: AppTheme
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -132,8 +136,8 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
 
         binding.duckAiInputScreenToggleContainer.isVisible = viewState.shouldShowInputScreenToggle
         configureInputScreenToggle(
-            withoutAi = InputScreenToggleButton.WithoutAi(isActive = !viewState.isInputScreenEnabled),
-            withAi = InputScreenToggleButton.WithAi(isActive = viewState.isInputScreenEnabled),
+            withoutAi = InputScreenToggleButton.WithoutAi(isActive = !viewState.isInputScreenEnabled, appTheme.isLightModeEnabled()),
+            withAi = InputScreenToggleButton.WithAi(isActive = viewState.isInputScreenEnabled, appTheme.isLightModeEnabled()),
         )
 
         binding.duckAiInputScreenDescription.isVisible = viewState.shouldShowInputScreenToggle
@@ -196,40 +200,36 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
     ) = with(binding) {
         val context = this@DuckChatSettingsActivity
         duckAiInputScreenToggleWithoutAiImage.setImageDrawable(ContextCompat.getDrawable(context, withoutAi.imageRes))
-        duckAiInputScreenToggleWithoutAiImage.setBackgroundResource(withoutAi.backgroundRes)
         duckAiInputScreenToggleWithoutAiCheck.setImageDrawable(ContextCompat.getDrawable(context, withoutAi.checkRes))
 
         duckAiInputScreenToggleWithAiImage.setImageDrawable(ContextCompat.getDrawable(context, withAi.imageRes))
-        duckAiInputScreenToggleWithAiImage.setBackgroundResource(withAi.backgroundRes)
         duckAiInputScreenToggleWithAiCheck.setImageDrawable(ContextCompat.getDrawable(context, withAi.checkRes))
     }
 
     private sealed class InputScreenToggleButton(isActive: Boolean) {
         abstract val imageRes: Int
-        val backgroundRes: Int = if (isActive) {
-            R.drawable.searchbox_background_active
-        } else {
-            R.drawable.searchbox_background
-        }
+
         val checkRes: Int = if (isActive) {
             CommonR.drawable.ic_check_blue_round_24
         } else {
             CommonR.drawable.ic_shape_circle_24
         }
 
-        class WithoutAi(isActive: Boolean) : InputScreenToggleButton(isActive) {
-            override val imageRes: Int = if (isActive) {
-                R.drawable.searchbox_withoutai_active
-            } else {
-                R.drawable.searchbox_withoutai
+        class WithoutAi(isActive: Boolean, isLightMode: Boolean) : InputScreenToggleButton(isActive) {
+            override val imageRes: Int = when {
+                isActive && isLightMode -> R.drawable.searchbox_withoutai_active
+                isActive && !isLightMode -> R.drawable.searchbox_withoutai_active_dark
+                !isActive && isLightMode -> R.drawable.searchbox_withoutai_inactive
+                else -> R.drawable.searchbox_withoutai_inactive_dark
             }
         }
 
-        class WithAi(isActive: Boolean) : InputScreenToggleButton(isActive) {
-            override val imageRes: Int = if (isActive) {
-                R.drawable.searchbox_withai_active
-            } else {
-                R.drawable.searchbox_withai
+        class WithAi(isActive: Boolean, isLightMode: Boolean) : InputScreenToggleButton(isActive) {
+            override val imageRes: Int = when {
+                isActive && isLightMode -> R.drawable.searchbox_withai_active
+                isActive && !isLightMode -> R.drawable.searchbox_withai_active_dark
+                !isActive && isLightMode -> R.drawable.searchbox_withai_inactive
+                else -> R.drawable.searchbox_withai_inactive_dark
             }
         }
     }
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_background.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_background.xml
deleted file mode 100644
index 92e9b8608745..000000000000
--- a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_background.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2025 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="16dp" />
-
-    <solid android:color="?attr/daxColorLines" />
-
-</shape>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_background_active.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_background_active.xml
deleted file mode 100644
index 0fa50d58b7ff..000000000000
--- a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_background_active.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2025 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="16dp" />
-
-    <solid android:color="?attr/daxOmnibarTextColorHighlight" />
-
-    <stroke
-        android:width="1dp"
-        android:color="?attr/daxColorAccentBlue" />
-
-</shape>
\ No newline at end of file
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai.xml
deleted file mode 100644
index ec49ef7b558b..000000000000
--- a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-  ~ Copyright (c) 2025 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="72dp"
-    android:viewportWidth="128"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"
-      android:fillColor="?attr/daxColorWindow"/>
-  <path
-      android:pathData="M112,36a8,8 0,0 1,8 8v8a8,8 0,0 1,-8 8H16a8,8 0,0 1,-8 -8v-8a8,8 0,0 1,8 -8h96ZM82,12c5.52,0 10,4.48 10,10s-4.48,10 -10,10H46c-5.52,0 -10,-4.48 -10,-10s4.48,-10 10,-10h36Z"
-      android:fillColor="?attr/daxColorControlFillPrimary"/>
-  <path
-      android:pathData="M116,0c6.63,0 12,5.37 12,12v60h-1L127,12c0,-6.07 -4.93,-11 -11,-11L12,1C5.93,1 1,5.93 1,12v60L0,72L0,12C0,5.37 5.37,0 12,0h104ZM112.41,36.01A8,8 0,0 1,120 44v8a8,8 0,0 1,-7.59 7.99L112,60L16,60a8,8 0,0 1,-7.99 -7.59L8,52v-8a8,8 0,0 1,8 -8h96l0.41,0.01ZM16,37a7,7 0,0 0,-7 7v8a7,7 0,0 0,7 7h96a7,7 0,0 0,7 -7v-8a7,7 0,0 0,-7 -7L16,37ZM82,12c5.52,0 10,4.48 10,10 0,5.35 -4.2,9.72 -9.48,9.99L82,32L46,32l-0.51,-0.01C40.2,31.72 36,27.35 36,22c0,-5.52 4.48,-10 10,-10h36ZM46,13a9,9 0,1 0,0 18h36a9,9 0,1 0,0 -18L46,13ZM56,14a8,8 0,1 1,0 16L46,30a8,8 0,1 1,0 -16h10ZM50.25,16a5.25,5.25 0,1 0,3.34 9.3l2.56,2.56 0.08,0.06a0.5,0.5 0,0 0,0.69 -0.69l-0.06,-0.08 -2.55,-2.55A5.25,5.25 0,0 0,50.25 16ZM77,16c3.31,0 6,2.39 6,5.34 0,2.24 -1.55,4.16 -3.74,4.95 -1.42,0.65 -4.91,1.31 -6.9,1.65a0.53,0.53 0,0 1,-0.49 -0.88l0.97,-1.12c0.21,-0.24 0.17,-0.61 -0.07,-0.82C71.68,24.16 71,22.82 71,21.34 71,18.39 73.69,16 77,16ZM77,17c-2.87,0 -5,2.05 -5,4.34 0,1.16 0.53,2.24 1.43,3.04 0.6,0.53 0.78,1.52 0.17,2.22l-0.11,0.12a68.24,68.24 0,0 0,2.32 -0.47c1.3,-0.29 2.43,-0.6 3.04,-0.88l0.04,-0.02 0.04,-0.01c1.87,-0.68 3.08,-2.26 3.08,-4.01C82,19.05 79.87,17 77,17ZM50.25,17a4.25,4.25 0,1 1,0 8.5,4.25 4.25,0 0,1 0,-8.5ZM76.71,18.45c0.07,-0.3 0.5,-0.3 0.57,0l0.16,0.66c0.22,0.88 0.91,1.56 1.78,1.78l0.66,0.16c0.3,0.07 0.3,0.5 0,0.57l-0.66,0.17a2.45,2.45 0,0 0,-1.78 1.78l-0.16,0.66c-0.07,0.3 -0.5,0.3 -0.57,0l-0.17,-0.66a2.45,2.45 0,0 0,-1.78 -1.78l-0.66,-0.17c-0.3,-0.07 -0.3,-0.5 0,-0.57l0.66,-0.17a2.45,2.45 0,0 0,1.78 -1.78l0.17,-0.66Z"
-      android:fillColor="?attr/daxColorControlDecorationTertiary"/>
-</vector>
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_active.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_active.xml
index 00336913a387..0b17064478f7 100644
--- a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_active.xml
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_active.xml
@@ -1,38 +1,41 @@
-<!--
-  ~ Copyright (c) 2025 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="72dp"
-    android:viewportWidth="128"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"
-      android:fillColor="?attr/daxColorWindow"/>
-  <path
-      android:pathData="M112,36a8,8 0,0 1,8 8v8a8,8 0,0 1,-8 8H16a8,8 0,0 1,-8 -8v-8a8,8 0,0 1,8 -8h96ZM82,12c5.52,0 10,4.48 10,10s-4.48,10 -10,10H46c-5.52,0 -10,-4.48 -10,-10s4.48,-10 10,-10h36Z"
-      android:fillColor="?attr/daxColorControlFillPrimary"/>
+    android:width="160dp"
+    android:height="88dp"
+    android:viewportWidth="160"
+    android:viewportHeight="88">
   <group>
     <clip-path
-        android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"/>
-    <path
-        android:pathData="M-1,12C-1,4.82 4.82,-1 12,-1h104c7.18,0 13,5.82 13,13h-2c0,-6.07 -4.93,-11 -11,-11L12,1C5.93,1 1,5.93 1,12h-2ZM128,72L0,72h128ZM-1,72L-1,12C-1,4.82 4.82,-1 12,-1v2C5.93,1 1,5.93 1,12v60h-2ZM116,-1c7.18,0 13,5.82 13,13v60h-2L127,12c0,-6.07 -4.93,-11 -11,-11v-2Z"
-        android:fillColor="?attr/daxColorAccentBlue"/>
+        android:pathData="M0,0h160v88H0z"/>
+    <group>
+      <clip-path
+          android:pathData="M26,0L134,0A26,26 0,0 1,160 26L160,62A26,26 0,0 1,134 88L26,88A26,26 0,0 1,0 62L0,26A26,26 0,0 1,26 0z"/>
+      <path
+          android:pathData="M0,0h160v88H0z"
+          android:fillColor="#3969EF"
+          android:fillAlpha="0.2"/>
+      <path
+          android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"
+          android:fillColor="#3969EF"
+          android:fillAlpha="0.2"/>
+      <path
+          android:pathData="M38,52L122,52A8,8 0,0 1,130 60L130,64A8,8 0,0 1,122 72L38,72A8,8 0,0 1,30 64L30,60A8,8 0,0 1,38 52z"
+          android:fillColor="#fff"/>
+      <group>
+        <clip-path
+            android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"/>
+        <path
+            android:pathData="M11,38C11,20.88 24.88,7 42,7h76c17.12,0 31,13.88 31,31h-10c0,-11.6 -9.4,-21 -21,-21L42,17c-11.6,0 -21,9.4 -21,21L11,38ZM144,88L16,88h128ZM11,88L11,38C11,20.88 24.88,7 42,7v10c-11.6,0 -21,9.4 -21,21v50L11,88ZM118,7c17.12,0 31,13.88 31,31v50h-10L139,38c0,-11.6 -9.4,-21 -21,-21L118,7Z"
+            android:fillColor="#3969EF"/>
+      </group>
+      <path
+          android:pathData="M62,26L98,26A10,10 0,0 1,108 36L108,36A10,10 0,0 1,98 46L62,46A10,10 0,0 1,52 36L52,36A10,10 0,0 1,62 26z"
+          android:fillColor="#fff"/>
+      <path
+          android:pathData="M93,30c3.31,0 6,2.39 6,5.34 0,2.24 -1.55,4.16 -3.74,4.95 -1.42,0.65 -4.91,1.31 -6.9,1.65a0.53,0.53 0,0 1,-0.49 -0.88l0.97,-1.12c0.21,-0.24 0.17,-0.61 -0.07,-0.82C87.68,38.16 87,36.82 87,35.34 87,32.39 89.69,30 93,30ZM93,31c-2.87,0 -5,2.05 -5,4.34 0,1.16 0.53,2.24 1.43,3.04 0.6,0.53 0.78,1.52 0.17,2.22l-0.11,0.12a68.24,68.24 0,0 0,2.32 -0.47c1.3,-0.29 2.43,-0.6 3.04,-0.88l0.04,-0.02 0.04,-0.01c1.87,-0.68 3.08,-2.26 3.08,-4.01C98,33.05 95.87,31 93,31ZM92.71,32.45c0.07,-0.3 0.5,-0.3 0.57,0l0.16,0.66c0.22,0.88 0.91,1.56 1.78,1.78l0.66,0.16c0.3,0.07 0.3,0.5 0,0.57l-0.66,0.17a2.45,2.45 0,0 0,-1.78 1.78l-0.16,0.66c-0.07,0.3 -0.5,0.3 -0.57,0l-0.17,-0.66a2.45,2.45 0,0 0,-1.78 -1.78l-0.66,-0.17c-0.3,-0.07 -0.3,-0.5 0,-0.57l0.66,-0.16a2.45,2.45 0,0 0,1.78 -1.78l0.17,-0.66ZM72,28a8,8 0,1 1,0 16L62,44a8,8 0,1 1,0 -16h10ZM66.25,30a5.25,5.25 0,1 0,3.34 9.3l2.56,2.55 0.08,0.06a0.5,0.5 0,0 0,0.69 -0.69l-0.06,-0.08 -2.55,-2.56A5.25,5.25 0,0 0,66.25 30ZM66.25,31a4.25,4.25 0,1 1,0 8.5,4.25 4.25,0 0,1 0,-8.5Z"
+          android:fillColor="#3969EF"/>
+      <path
+          android:pathData="M38.5,56L38.5,56A0.5,0.5 0,0 1,39 56.5L39,67.5A0.5,0.5 0,0 1,38.5 68L38.5,68A0.5,0.5 0,0 1,38 67.5L38,56.5A0.5,0.5 0,0 1,38.5 56z"
+          android:fillColor="#3969EF"/>
+    </group>
   </group>
-  <path
-      android:pathData="M112.41,36.01A8,8 0,0 1,120 44v8a8,8 0,0 1,-7.59 7.99L112,60L16,60a8,8 0,0 1,-7.99 -7.59L8,52v-8a8,8 0,0 1,8 -8h96l0.41,0.01ZM16,37a7,7 0,0 0,-7 7v8a7,7 0,0 0,7 7h96a7,7 0,0 0,7 -7v-8a7,7 0,0 0,-7 -7L16,37ZM82,12c5.52,0 10,4.48 10,10 0,5.35 -4.2,9.72 -9.48,9.99L82,32L46,32l-0.51,-0.01C40.2,31.72 36,27.35 36,22c0,-5.52 4.48,-10 10,-10h36ZM46,13a9,9 0,1 0,0 18h36a9,9 0,1 0,0 -18L46,13ZM56,14a8,8 0,1 1,0 16L46,30a8,8 0,1 1,0 -16h10ZM50.25,16a5.25,5.25 0,1 0,3.34 9.3l2.56,2.56 0.08,0.06a0.5,0.5 0,0 0,0.69 -0.69l-0.06,-0.08 -2.55,-2.55A5.25,5.25 0,0 0,50.25 16ZM77,16c3.31,0 6,2.39 6,5.34 0,2.24 -1.55,4.16 -3.74,4.95 -1.42,0.65 -4.91,1.31 -6.9,1.65a0.53,0.53 0,0 1,-0.49 -0.88l0.97,-1.12c0.21,-0.24 0.17,-0.61 -0.07,-0.82C71.68,24.16 71,22.82 71,21.34 71,18.39 73.69,16 77,16ZM77,17c-2.87,0 -5,2.05 -5,4.34 0,1.16 0.53,2.24 1.43,3.04 0.6,0.53 0.78,1.52 0.17,2.22l-0.11,0.12a68.24,68.24 0,0 0,2.32 -0.47c1.3,-0.29 2.43,-0.6 3.04,-0.88l0.04,-0.02 0.04,-0.01c1.87,-0.68 3.08,-2.26 3.08,-4.01C82,19.05 79.87,17 77,17ZM50.25,17a4.25,4.25 0,1 1,0 8.5,4.25 4.25,0 0,1 0,-8.5ZM76.71,18.45c0.07,-0.3 0.5,-0.3 0.57,0l0.16,0.66c0.22,0.88 0.91,1.56 1.78,1.78l0.66,0.16c0.3,0.07 0.3,0.5 0,0.57l-0.66,0.17a2.45,2.45 0,0 0,-1.78 1.78l-0.16,0.66c-0.07,0.3 -0.5,0.3 -0.57,0l-0.17,-0.66a2.45,2.45 0,0 0,-1.78 -1.78l-0.66,-0.17c-0.3,-0.07 -0.3,-0.5 0,-0.57l0.66,-0.17a2.45,2.45 0,0 0,1.78 -1.78l0.17,-0.66Z"
-      android:fillColor="?attr/daxColorAccentBlue"/>
 </vector>
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_active_dark.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_active_dark.xml
new file mode 100644
index 000000000000..8ca722a7cc17
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_active_dark.xml
@@ -0,0 +1,43 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="160dp"
+    android:height="88dp"
+    android:viewportWidth="160"
+    android:viewportHeight="88">
+  <group>
+    <clip-path
+        android:pathData="M0,0h160v88H0z"/>
+    <group>
+      <clip-path
+          android:pathData="M26,0L134,0A26,26 0,0 1,160 26L160,62A26,26 0,0 1,134 88L26,88A26,26 0,0 1,0 62L0,26A26,26 0,0 1,26 0z"/>
+      <path
+          android:pathData="M0,0h160v88H0z"
+          android:fillColor="#7295F6"
+          android:fillAlpha="0.3"/>
+      <path
+          android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"
+          android:fillColor="#7295F6"
+          android:fillAlpha="0.46"/>
+      <path
+          android:pathData="M38,52L122,52A8,8 0,0 1,130 60L130,64A8,8 0,0 1,122 72L38,72A8,8 0,0 1,30 64L30,60A8,8 0,0 1,38 52z"
+          android:fillColor="#000"
+          android:fillAlpha="0.3"/>
+      <group>
+        <clip-path
+            android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"/>
+        <path
+            android:pathData="M11,38C11,20.88 24.88,7 42,7h76c17.12,0 31,13.88 31,31h-10c0,-11.6 -9.4,-21 -21,-21L42,17c-11.6,0 -21,9.4 -21,21L11,38ZM144,88L16,88h128ZM11,88L11,38C11,20.88 24.88,7 42,7v10c-11.6,0 -21,9.4 -21,21v50L11,88ZM118,7c17.12,0 31,13.88 31,31v50h-10L139,38c0,-11.6 -9.4,-21 -21,-21L118,7Z"
+            android:fillColor="#7295F6"/>
+      </group>
+      <path
+          android:pathData="M62,26L98,26A10,10 0,0 1,108 36L108,36A10,10 0,0 1,98 46L62,46A10,10 0,0 1,52 36L52,36A10,10 0,0 1,62 26z"
+          android:fillColor="#000"
+          android:fillAlpha="0.3"/>
+      <path
+          android:pathData="M93,30c3.31,0 6,2.39 6,5.34 0,2.24 -1.55,4.16 -3.74,4.95 -1.42,0.65 -4.91,1.31 -6.9,1.65a0.53,0.53 0,0 1,-0.49 -0.88l0.97,-1.12c0.21,-0.24 0.17,-0.61 -0.07,-0.82C87.68,38.16 87,36.82 87,35.34 87,32.39 89.69,30 93,30ZM93,31c-2.87,0 -5,2.05 -5,4.34 0,1.16 0.53,2.24 1.43,3.04 0.6,0.53 0.78,1.52 0.17,2.22l-0.11,0.12a68.24,68.24 0,0 0,2.32 -0.47c1.3,-0.29 2.43,-0.6 3.04,-0.88l0.04,-0.02 0.04,-0.01c1.87,-0.68 3.08,-2.26 3.08,-4.01C98,33.05 95.87,31 93,31ZM92.71,32.45c0.07,-0.3 0.5,-0.3 0.57,0l0.16,0.66c0.22,0.88 0.91,1.56 1.78,1.78l0.66,0.16c0.3,0.07 0.3,0.5 0,0.57l-0.66,0.17a2.45,2.45 0,0 0,-1.78 1.78l-0.16,0.66c-0.07,0.3 -0.5,0.3 -0.57,0l-0.17,-0.66a2.45,2.45 0,0 0,-1.78 -1.78l-0.66,-0.17c-0.3,-0.07 -0.3,-0.5 0,-0.57l0.66,-0.16a2.45,2.45 0,0 0,1.78 -1.78l0.17,-0.66ZM72,28a8,8 0,1 1,0 16L62,44a8,8 0,1 1,0 -16h10ZM66.25,30a5.25,5.25 0,1 0,3.34 9.3l2.56,2.55 0.08,0.06a0.5,0.5 0,0 0,0.69 -0.69l-0.06,-0.08 -2.55,-2.56A5.25,5.25 0,0 0,66.25 30ZM66.25,31a4.25,4.25 0,1 1,0 8.5,4.25 4.25,0 0,1 0,-8.5Z"
+          android:fillColor="#7295F6"/>
+      <path
+          android:pathData="M38.5,56L38.5,56A0.5,0.5 0,0 1,39 56.5L39,67.5A0.5,0.5 0,0 1,38.5 68L38.5,68A0.5,0.5 0,0 1,38 67.5L38,56.5A0.5,0.5 0,0 1,38.5 56z"
+          android:fillColor="#7295F6"/>
+    </group>
+  </group>
+</vector>
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_inactive.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_inactive.xml
new file mode 100644
index 000000000000..3c548419585f
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_inactive.xml
@@ -0,0 +1,67 @@
+<!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="160dp"
+    android:height="88dp"
+    android:viewportWidth="160"
+    android:viewportHeight="88">
+  <group>
+    <clip-path
+        android:pathData="M0,0h160v88H0z"/>
+    <group>
+      <clip-path
+          android:pathData="M26,0L134,0A26,26 0,0 1,160 26L160,62A26,26 0,0 1,134 88L26,88A26,26 0,0 1,0 62L0,26A26,26 0,0 1,26 0z"/>
+      <path
+          android:pathData="M0,0h160v88H0z"
+          android:fillColor="#000"
+          android:fillAlpha="0.06"/>
+      <path
+          android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"
+          android:fillColor="#000"
+          android:fillAlpha="0.1"/>
+      <path
+          android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"
+          android:fillColor="#fff"/>
+      <group>
+        <clip-path
+            android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"/>
+        <path
+            android:pathData="M11,38C11,20.88 24.88,7 42,7h76c17.12,0 31,13.88 31,31h-10c0,-11.6 -9.4,-21 -21,-21L42,17c-11.6,0 -21,9.4 -21,21L11,38ZM144,88L16,88h128ZM11,88L11,38C11,20.88 24.88,7 42,7v10c-11.6,0 -21,9.4 -21,21v50L11,88ZM118,7c17.12,0 31,13.88 31,31v50h-10L139,38c0,-11.6 -9.4,-21 -21,-21L118,7Z"
+            android:fillColor="#000"
+            android:fillAlpha="0.26"/>
+      </group>
+      <path
+          android:pathData="M62,26L98,26A10,10 0,0 1,108 36L108,36A10,10 0,0 1,98 46L62,46A10,10 0,0 1,52 36L52,36A10,10 0,0 1,62 26z"
+          android:fillColor="#000"
+          android:fillAlpha="0.2"/>
+      <path
+          android:pathData="M93,30c3.31,0 6,2.39 6,5.34 0,2.24 -1.55,4.16 -3.74,4.95 -1.42,0.65 -4.91,1.31 -6.9,1.65a0.53,0.53 0,0 1,-0.49 -0.88l0.97,-1.12c0.21,-0.24 0.17,-0.61 -0.07,-0.82C87.68,38.16 87,36.82 87,35.34 87,32.39 89.69,30 93,30ZM93,31c-2.87,0 -5,2.05 -5,4.34 0,1.16 0.53,2.24 1.43,3.04 0.6,0.53 0.78,1.52 0.17,2.22l-0.11,0.12a68.24,68.24 0,0 0,2.32 -0.47c1.3,-0.29 2.43,-0.6 3.04,-0.88l0.04,-0.02 0.04,-0.01c1.87,-0.68 3.08,-2.26 3.08,-4.01C98,33.05 95.87,31 93,31ZM92.71,32.45c0.07,-0.3 0.5,-0.3 0.57,0l0.16,0.66c0.22,0.88 0.91,1.56 1.78,1.78l0.66,0.16c0.3,0.07 0.3,0.5 0,0.57l-0.66,0.17a2.45,2.45 0,0 0,-1.78 1.78l-0.16,0.66c-0.07,0.3 -0.5,0.3 -0.57,0l-0.17,-0.66a2.45,2.45 0,0 0,-1.78 -1.78l-0.66,-0.17c-0.3,-0.07 -0.3,-0.5 0,-0.57l0.66,-0.16a2.45,2.45 0,0 0,1.78 -1.78l0.17,-0.66Z"
+          android:fillColor="#fff"/>
+      <path
+          android:pathData="M38,52L122,52A8,8 0,0 1,130 60L130,64A8,8 0,0 1,122 72L38,72A8,8 0,0 1,30 64L30,60A8,8 0,0 1,38 52z"
+          android:fillColor="#000"
+          android:fillAlpha="0.1"/>
+      <path
+          android:pathData="M72,28a8,8 0,1 1,0 16L62,44a8,8 0,1 1,0 -16h10ZM66.25,30a5.25,5.25 0,1 0,3.34 9.3l2.56,2.55 0.08,0.06a0.5,0.5 0,0 0,0.69 -0.69l-0.06,-0.08 -2.55,-2.56A5.25,5.25 0,0 0,66.25 30ZM66.25,31a4.25,4.25 0,1 1,0 8.5,4.25 4.25,0 0,1 0,-8.5Z"
+          android:fillColor="#fff"/>
+      <path
+          android:pathData="M38.5,56L38.5,56A0.5,0.5 0,0 1,39 56.5L39,67.5A0.5,0.5 0,0 1,38.5 68L38.5,68A0.5,0.5 0,0 1,38 67.5L38,56.5A0.5,0.5 0,0 1,38.5 56z"
+          android:fillColor="#000"
+          android:fillAlpha="0.26"/>
+    </group>
+  </group>
+</vector>
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_inactive_dark.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_inactive_dark.xml
new file mode 100644
index 000000000000..caba46f7a00b
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withai_inactive_dark.xml
@@ -0,0 +1,70 @@
+<!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="160dp"
+    android:height="88dp"
+    android:viewportWidth="160"
+    android:viewportHeight="88">
+  <group>
+    <clip-path
+        android:pathData="M0,0h160v88H0z"/>
+    <group>
+      <clip-path
+          android:pathData="M26,0L134,0A26,26 0,0 1,160 26L160,62A26,26 0,0 1,134 88L26,88A26,26 0,0 1,0 62L0,26A26,26 0,0 1,26 0z"/>
+      <path
+          android:pathData="M0,0h160v88H0z"
+          android:fillColor="#fff"
+          android:fillAlpha="0.08"/>
+      <path
+          android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"
+          android:fillColor="#fff"
+          android:fillAlpha="0.1"/>
+      <path
+          android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"
+          android:fillColor="#000"
+          android:fillAlpha="0.3"/>
+      <group>
+        <clip-path
+            android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"/>
+        <path
+            android:pathData="M11,38C11,20.88 24.88,7 42,7h76c17.12,0 31,13.88 31,31h-10c0,-11.6 -9.4,-21 -21,-21L42,17c-11.6,0 -21,9.4 -21,21L11,38ZM144,88L16,88h128ZM11,88L11,38C11,20.88 24.88,7 42,7v10c-11.6,0 -21,9.4 -21,21v50L11,88ZM118,7c17.12,0 31,13.88 31,31v50h-10L139,38c0,-11.6 -9.4,-21 -21,-21L118,7Z"
+            android:fillColor="#fff"
+            android:fillAlpha="0.2"/>
+      </group>
+      <path
+          android:pathData="M62,26L98,26A10,10 0,0 1,108 36L108,36A10,10 0,0 1,98 46L62,46A10,10 0,0 1,52 36L52,36A10,10 0,0 1,62 26z"
+          android:fillColor="#fff"
+          android:fillAlpha="0.08"/>
+      <path
+          android:pathData="M93,30c3.31,0 6,2.39 6,5.34 0,2.24 -1.55,4.16 -3.74,4.95 -1.42,0.65 -4.91,1.31 -6.9,1.65a0.53,0.53 0,0 1,-0.49 -0.88l0.97,-1.12c0.21,-0.24 0.17,-0.61 -0.07,-0.82C87.68,38.16 87,36.82 87,35.34 87,32.39 89.69,30 93,30ZM93,31c-2.87,0 -5,2.05 -5,4.34 0,1.16 0.53,2.24 1.43,3.04 0.6,0.53 0.78,1.52 0.17,2.22l-0.11,0.12a68.24,68.24 0,0 0,2.32 -0.47c1.3,-0.29 2.43,-0.6 3.04,-0.88l0.04,-0.02 0.04,-0.01c1.87,-0.68 3.08,-2.26 3.08,-4.01C98,33.05 95.87,31 93,31ZM92.71,32.45c0.07,-0.3 0.5,-0.3 0.57,0l0.16,0.66c0.22,0.88 0.91,1.56 1.78,1.78l0.66,0.16c0.3,0.07 0.3,0.5 0,0.57l-0.66,0.17a2.45,2.45 0,0 0,-1.78 1.78l-0.16,0.66c-0.07,0.3 -0.5,0.3 -0.57,0l-0.17,-0.66a2.45,2.45 0,0 0,-1.78 -1.78l-0.66,-0.17c-0.3,-0.07 -0.3,-0.5 0,-0.57l0.66,-0.16a2.45,2.45 0,0 0,1.78 -1.78l0.17,-0.66Z"
+          android:fillColor="#000"
+          android:fillAlpha="0.4"/>
+      <path
+          android:pathData="M38,52L122,52A8,8 0,0 1,130 60L130,64A8,8 0,0 1,122 72L38,72A8,8 0,0 1,30 64L30,60A8,8 0,0 1,38 52z"
+          android:fillColor="#fff"
+          android:fillAlpha="0.08"/>
+      <path
+          android:pathData="M72,28a8,8 0,1 1,0 16L62,44a8,8 0,1 1,0 -16h10ZM66.25,30a5.25,5.25 0,1 0,3.34 9.3l2.56,2.55 0.08,0.06a0.5,0.5 0,0 0,0.69 -0.69l-0.06,-0.08 -2.55,-2.56A5.25,5.25 0,0 0,66.25 30ZM66.25,31a4.25,4.25 0,1 1,0 8.5,4.25 4.25,0 0,1 0,-8.5Z"
+          android:fillColor="#000"
+          android:fillAlpha="0.3"/>
+      <path
+          android:pathData="M38.5,56L38.5,56A0.5,0.5 0,0 1,39 56.5L39,67.5A0.5,0.5 0,0 1,38.5 68L38.5,68A0.5,0.5 0,0 1,38 67.5L38,56.5A0.5,0.5 0,0 1,38.5 56z"
+          android:fillColor="#000"
+          android:fillAlpha="0.4"/>
+    </group>
+  </group>
+</vector>
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai.xml
deleted file mode 100644
index a03ae10c531f..000000000000
--- a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-  ~ Copyright (c) 2025 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="72dp"
-    android:viewportWidth="128"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"
-      android:fillColor="?attr/daxColorWindow"/>
-  <path
-      android:pathData="M112,28a8,8 0,0 1,8 8v8a8,8 0,0 1,-8 8H16a8,8 0,0 1,-8 -8v-8a8,8 0,0 1,8 -8h96Z"
-      android:fillColor="?attr/daxColorControlFillPrimary"/>
-  <group>
-    <clip-path
-        android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"/>
-    <path
-        android:pathData="M-1,12C-1,4.82 4.82,-1 12,-1h104c7.18,0 13,5.82 13,13h-2c0,-6.07 -4.93,-11 -11,-11L12,1C5.93,1 1,5.93 1,12h-2ZM128,72L0,72h128ZM-1,72L-1,12C-1,4.82 4.82,-1 12,-1v2C5.93,1 1,5.93 1,12v60h-2ZM116,-1c7.18,0 13,5.82 13,13v60h-2L127,12c0,-6.07 -4.93,-11 -11,-11v-2Z"
-        android:fillColor="?attr/daxColorControlDecorationTertiary"/>
-  </group>
-  <path
-      android:pathData="M112.41,28.01A8,8 0,0 1,120 36v8a8,8 0,0 1,-7.59 7.99L112,52L16,52a8,8 0,0 1,-7.99 -7.59L8,44v-8a8,8 0,0 1,8 -8h96l0.41,0.01ZM16,29a7,7 0,0 0,-7 7v8a7,7 0,0 0,7 7h96a7,7 0,0 0,7 -7v-8a7,7 0,0 0,-7 -7L16,29ZM19.25,34a5.25,5.25 0,0 1,4.05 8.59l2.56,2.56 0.06,0.08a0.5,0.5 0,0 1,-0.69 0.69l-0.08,-0.06 -2.55,-2.55A5.25,5.25 0,1 1,19.25 34ZM19.25,35a4.25,4.25 0,1 0,0 8.5,4.25 4.25,0 0,0 0,-8.5Z"
-      android:fillColor="?attr/daxColorControlDecorationTertiary"/>
-</vector>
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_active.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_active.xml
index 4c001cf046be..d1131427e889 100644
--- a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_active.xml
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_active.xml
@@ -1,38 +1,38 @@
-<!--
-  ~ Copyright (c) 2025 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="72dp"
-    android:viewportWidth="128"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"
-      android:fillColor="?attr/daxColorWindow"/>
-  <path
-      android:pathData="M112,28a8,8 0,0 1,8 8v8a8,8 0,0 1,-8 8H16a8,8 0,0 1,-8 -8v-8a8,8 0,0 1,8 -8h96Z"
-      android:fillColor="?attr/daxColorControlFillPrimary"/>
+    android:width="160dp"
+    android:height="88dp"
+    android:viewportWidth="160"
+    android:viewportHeight="88">
   <group>
     <clip-path
-        android:pathData="M0,12C0,5.37 5.37,0 12,0h104c6.63,0 12,5.37 12,12v60H0V12Z"/>
-    <path
-        android:pathData="M-1,12C-1,4.82 4.82,-1 12,-1h104c7.18,0 13,5.82 13,13h-2c0,-6.07 -4.93,-11 -11,-11L12,1C5.93,1 1,5.93 1,12h-2ZM128,72L0,72h128ZM-1,72L-1,12C-1,4.82 4.82,-1 12,-1v2C5.93,1 1,5.93 1,12v60h-2ZM116,-1c7.18,0 13,5.82 13,13v60h-2L127,12c0,-6.07 -4.93,-11 -11,-11v-2Z"
-        android:fillColor="?attr/daxColorAccentBlue"/>
+        android:pathData="M0,0h160v88H0z"/>
+    <group>
+      <clip-path
+          android:pathData="M26,0L134,0A26,26 0,0 1,160 26L160,62A26,26 0,0 1,134 88L26,88A26,26 0,0 1,0 62L0,26A26,26 0,0 1,26 0z"/>
+      <path
+          android:pathData="M0,0h160v88H0z"
+          android:fillColor="#3969EF"
+          android:fillAlpha="0.2"/>
+      <path
+          android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"
+          android:fillColor="#3969EF"
+          android:fillAlpha="0.2"/>
+      <path
+          android:pathData="M38,44L122,44A8,8 0,0 1,130 52L130,56A8,8 0,0 1,122 64L38,64A8,8 0,0 1,30 56L30,52A8,8 0,0 1,38 44z"
+          android:fillColor="#fff"/>
+      <path
+          android:pathData="M49.5,48L49.5,48A0.5,0.5 0,0 1,50 48.5L50,59.5A0.5,0.5 0,0 1,49.5 60L49.5,60A0.5,0.5 0,0 1,49 59.5L49,48.5A0.5,0.5 0,0 1,49.5 48z"
+          android:fillColor="#3969EF"/>
+      <group>
+        <clip-path
+            android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"/>
+        <path
+            android:pathData="M11,38C11,20.88 24.88,7 42,7h76c17.12,0 31,13.88 31,31h-10c0,-11.6 -9.4,-21 -21,-21L42,17c-11.6,0 -21,9.4 -21,21L11,38ZM144,88L16,88h128ZM11,88L11,38C11,20.88 24.88,7 42,7v10c-11.6,0 -21,9.4 -21,21v50L11,88ZM118,7c17.12,0 31,13.88 31,31v50h-10L139,38c0,-11.6 -9.4,-21 -21,-21L118,7Z"
+            android:fillColor="#3969EF"/>
+      </group>
+      <path
+          android:pathData="M39.25,48a5.25,5.25 0,0 1,4.05 8.59l2.55,2.56 0.06,0.08a0.5,0.5 0,0 1,-0.69 0.69l-0.08,-0.06 -2.56,-2.55A5.25,5.25 0,1 1,39.25 48ZM39.25,49a4.25,4.25 0,1 0,0 8.5,4.25 4.25,0 0,0 0,-8.5Z"
+          android:fillColor="#3969EF"/>
+    </group>
   </group>
-  <path
-      android:pathData="M112.41,28.01A8,8 0,0 1,120 36v8a8,8 0,0 1,-7.59 7.99L112,52L16,52a8,8 0,0 1,-7.99 -7.59L8,44v-8a8,8 0,0 1,8 -8h96l0.41,0.01ZM16,29a7,7 0,0 0,-7 7v8a7,7 0,0 0,7 7h96a7,7 0,0 0,7 -7v-8a7,7 0,0 0,-7 -7L16,29ZM19.25,34a5.25,5.25 0,0 1,4.05 8.59l2.56,2.56 0.06,0.08a0.5,0.5 0,0 1,-0.69 0.69l-0.08,-0.06 -2.55,-2.55A5.25,5.25 0,1 1,19.25 34ZM19.25,35a4.25,4.25 0,1 0,0 8.5,4.25 4.25,0 0,0 0,-8.5Z"
-      android:fillColor="?attr/daxColorAccentBlue"/>
 </vector>
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_active_dark.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_active_dark.xml
new file mode 100644
index 000000000000..08c42a5f0e41
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_active_dark.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="160dp"
+    android:height="88dp"
+    android:viewportWidth="160"
+    android:viewportHeight="88">
+  <group>
+    <clip-path
+        android:pathData="M0,0h160v88H0z"/>
+    <group>
+      <clip-path
+          android:pathData="M26,0L134,0A26,26 0,0 1,160 26L160,62A26,26 0,0 1,134 88L26,88A26,26 0,0 1,0 62L0,26A26,26 0,0 1,26 0z"/>
+      <path
+          android:pathData="M0,0h160v88H0z"
+          android:fillColor="#7295F6"
+          android:fillAlpha="0.3"/>
+      <path
+          android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"
+          android:fillColor="#7295F6"
+          android:fillAlpha="0.46"/>
+      <path
+          android:pathData="M38,44L122,44A8,8 0,0 1,130 52L130,56A8,8 0,0 1,122 64L38,64A8,8 0,0 1,30 56L30,52A8,8 0,0 1,38 44z"
+          android:fillColor="#000"
+          android:fillAlpha="0.3"/>
+      <group>
+        <clip-path
+            android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"/>
+        <path
+            android:pathData="M11,38C11,20.88 24.88,7 42,7h76c17.12,0 31,13.88 31,31h-10c0,-11.6 -9.4,-21 -21,-21L42,17c-11.6,0 -21,9.4 -21,21L11,38ZM144,88L16,88h128ZM11,88L11,38C11,20.88 24.88,7 42,7v10c-11.6,0 -21,9.4 -21,21v50L11,88ZM118,7c17.12,0 31,13.88 31,31v50h-10L139,38c0,-11.6 -9.4,-21 -21,-21L118,7Z"
+            android:fillColor="#7295F6"/>
+      </group>
+      <path
+          android:pathData="M39.25,48a5.25,5.25 0,0 1,4.05 8.59l2.55,2.56 0.06,0.08a0.5,0.5 0,0 1,-0.69 0.69l-0.08,-0.06 -2.56,-2.55A5.25,5.25 0,1 1,39.25 48ZM39.25,49a4.25,4.25 0,1 0,0 8.5,4.25 4.25,0 0,0 0,-8.5Z"
+          android:fillColor="#7295F6"/>
+      <path
+          android:pathData="M49.5,48L49.5,48A0.5,0.5 0,0 1,50 48.5L50,59.5A0.5,0.5 0,0 1,49.5 60L49.5,60A0.5,0.5 0,0 1,49 59.5L49,48.5A0.5,0.5 0,0 1,49.5 48z"
+          android:fillColor="#7295F6"/>
+    </group>
+  </group>
+</vector>
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_inactive.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_inactive.xml
new file mode 100644
index 000000000000..7b31f00c4752
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_inactive.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="160dp"
+    android:height="88dp"
+    android:viewportWidth="160"
+    android:viewportHeight="88">
+  <group>
+    <clip-path
+        android:pathData="M0,0h160v88H0z"/>
+    <group>
+      <clip-path
+          android:pathData="M26,0L134,0A26,26 0,0 1,160 26L160,62A26,26 0,0 1,134 88L26,88A26,26 0,0 1,0 62L0,26A26,26 0,0 1,26 0z"/>
+      <path
+          android:pathData="M0,0h160v88H0z"
+          android:fillColor="#000"
+          android:fillAlpha="0.06"/>
+      <path
+          android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"
+          android:fillColor="#fff"/>
+      <path
+          android:pathData="M38,44L122,44A8,8 0,0 1,130 52L130,56A8,8 0,0 1,122 64L38,64A8,8 0,0 1,30 56L30,52A8,8 0,0 1,38 44z"
+          android:fillColor="#000"
+          android:fillAlpha="0.1"/>
+      <group>
+        <clip-path
+            android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"/>
+        <path
+            android:pathData="M11,38C11,20.88 24.88,7 42,7h76c17.12,0 31,13.88 31,31h-10c0,-11.6 -9.4,-21 -21,-21L42,17c-11.6,0 -21,9.4 -21,21L11,38ZM144,88L16,88h128ZM11,88L11,38C11,20.88 24.88,7 42,7v10c-11.6,0 -21,9.4 -21,21v50L11,88ZM118,7c17.12,0 31,13.88 31,31v50h-10L139,38c0,-11.6 -9.4,-21 -21,-21L118,7Z"
+            android:fillColor="#000"
+            android:fillAlpha="0.26"/>
+      </group>
+      <path
+          android:pathData="M39.25,48a5.25,5.25 0,0 1,4.05 8.59l2.55,2.56 0.06,0.08a0.5,0.5 0,0 1,-0.69 0.69l-0.08,-0.06 -2.56,-2.55A5.25,5.25 0,1 1,39.25 48ZM39.25,49a4.25,4.25 0,1 0,0 8.5,4.25 4.25,0 0,0 0,-8.5Z"
+          android:fillColor="#000"
+          android:fillAlpha="0.26"/>
+      <path
+          android:pathData="M49.5,48L49.5,48A0.5,0.5 0,0 1,50 48.5L50,59.5A0.5,0.5 0,0 1,49.5 60L49.5,60A0.5,0.5 0,0 1,49 59.5L49,48.5A0.5,0.5 0,0 1,49.5 48z"
+          android:fillColor="#000"
+          android:fillAlpha="0.26"/>
+    </group>
+  </group>
+</vector>
diff --git a/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_inactive_dark.xml b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_inactive_dark.xml
new file mode 100644
index 000000000000..fafb85ee5911
--- /dev/null
+++ b/duckchat/duckchat-impl/src/main/res/drawable/searchbox_withoutai_inactive_dark.xml
@@ -0,0 +1,46 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="160dp"
+    android:height="88dp"
+    android:viewportWidth="160"
+    android:viewportHeight="88">
+  <group>
+    <clip-path
+        android:pathData="M0,0h160v88H0z"/>
+    <group>
+      <clip-path
+          android:pathData="M26,0L134,0A26,26 0,0 1,160 26L160,62A26,26 0,0 1,134 88L26,88A26,26 0,0 1,0 62L0,26A26,26 0,0 1,26 0z"/>
+      <path
+          android:pathData="M0,0h160v88H0z"
+          android:fillColor="#fff"
+          android:fillAlpha="0.08"/>
+      <path
+          android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"
+          android:fillColor="#fff"
+          android:fillAlpha="0.1"/>
+      <path
+          android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"
+          android:fillColor="#000"
+          android:fillAlpha="0.3"/>
+      <group>
+        <clip-path
+            android:pathData="M16,38c0,-14.36 11.64,-26 26,-26h76c14.36,0 26,11.64 26,26v50H16V38Z"/>
+        <path
+            android:pathData="M11,38C11,20.88 24.88,7 42,7h76c17.12,0 31,13.88 31,31h-10c0,-11.6 -9.4,-21 -21,-21L42,17c-11.6,0 -21,9.4 -21,21L11,38ZM144,88L16,88h128ZM11,88L11,38C11,20.88 24.88,7 42,7v10c-11.6,0 -21,9.4 -21,21v50L11,88ZM118,7c17.12,0 31,13.88 31,31v50h-10L139,38c0,-11.6 -9.4,-21 -21,-21L118,7Z"
+            android:fillColor="#fff"
+            android:fillAlpha="0.2"/>
+      </group>
+      <path
+          android:pathData="M38,44L122,44A8,8 0,0 1,130 52L130,56A8,8 0,0 1,122 64L38,64A8,8 0,0 1,30 56L30,52A8,8 0,0 1,38 44z"
+          android:fillColor="#fff"
+          android:fillAlpha="0.08"/>
+      <path
+          android:pathData="M39.25,48a5.25,5.25 0,0 1,4.05 8.59l2.55,2.56 0.06,0.08a0.5,0.5 0,0 1,-0.69 0.69l-0.08,-0.06 -2.56,-2.55A5.25,5.25 0,1 1,39.25 48ZM39.25,49a4.25,4.25 0,1 0,0 8.5,4.25 4.25,0 0,0 0,-8.5Z"
+          android:fillColor="#000"
+          android:fillAlpha="0.4"/>
+      <path
+          android:pathData="M49.5,48L49.5,48A0.5,0.5 0,0 1,50 48.5L50,59.5A0.5,0.5 0,0 1,49.5 60L49.5,60A0.5,0.5 0,0 1,49 59.5L49,48.5A0.5,0.5 0,0 1,49.5 48z"
+          android:fillColor="#000"
+          android:fillAlpha="0.4"/>
+    </group>
+  </group>
+</vector>
diff --git a/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml b/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
index 11fc28969026..f6f8c2d4574c 100644
--- a/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
+++ b/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
@@ -115,11 +115,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:scaleType="fitCenter"
-                        android:background="@drawable/searchbox_background_active"
-                        android:paddingStart="16dp"
-                        android:paddingTop="16dp"
-                        android:paddingEnd="16dp"
-                        android:paddingBottom="1dp"
                         android:src="@drawable/searchbox_withoutai_active" />
 
                     <com.duckduckgo.common.ui.view.text.DaxTextView
@@ -159,12 +154,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:scaleType="fitCenter"
-                        android:background="@drawable/searchbox_background"
-                        android:paddingStart="16dp"
-                        android:paddingTop="16dp"
-                        android:paddingEnd="16dp"
-                        android:paddingBottom="1dp"
-                        android:src="@drawable/searchbox_withai" />
+                        android:src="@drawable/searchbox_withai_inactive" />
 
                     <com.duckduckgo.common.ui.view.text.DaxTextView
                         android:layout_width="wrap_content"

From 4fad082c864bc5da3a6ed612f178b67115c780a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lpaczos@duckduckgo.com>
Date: Tue, 19 Aug 2025 13:41:16 +0200
Subject: [PATCH 7/9] update the used check icon

---
 .../main/res/drawable/ic_check_accent_24.xml  | 28 +++++++++++++++++++
 .../drawable/ic_shape_circle_disabled_24.xml  | 10 +++++++
 .../res/values/design-experiments-colors.xml  |  6 ++++
 .../main/res/values/design-system-colors.xml  |  2 ++
 .../main/res/values/design-system-theming.xml |  2 ++
 .../ui/settings/DuckChatSettingsActivity.kt   |  4 +--
 .../layout/activity_duck_chat_settings.xml    |  2 +-
 7 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 common/common-ui/src/main/res/drawable/ic_check_accent_24.xml
 create mode 100644 common/common-ui/src/main/res/drawable/ic_shape_circle_disabled_24.xml

diff --git a/common/common-ui/src/main/res/drawable/ic_check_accent_24.xml b/common/common-ui/src/main/res/drawable/ic_check_accent_24.xml
new file mode 100644
index 000000000000..2bbf0cf41b5a
--- /dev/null
+++ b/common/common-ui/src/main/res/drawable/ic_check_accent_24.xml
@@ -0,0 +1,28 @@
+<!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2C6.477,2 2,6.477 2,12s4.477,10 10,10 10,-4.477 10,-10S17.523,2 12,2Z"
+      android:fillColor="?attr/daxColorAccentBlue"/>
+  <path
+      android:pathData="M16.775,9.214c0.296,0.29 0.3,0.765 0.011,1.06l-4.494,4.589c-0.785,0.8 -2.074,0.8 -2.859,0l-2.219,-2.265a0.75,0.75 0,0 1,1.072 -1.05l2.219,2.265c0.196,0.2 0.519,0.2 0.715,0l4.494,-4.588a0.75,0.75 0,0 1,1.061 -0.01Z"
+      android:fillColor="?attr/daxColorAccentContentPrimary"/>
+</vector>
diff --git a/common/common-ui/src/main/res/drawable/ic_shape_circle_disabled_24.xml b/common/common-ui/src/main/res/drawable/ic_shape_circle_disabled_24.xml
new file mode 100644
index 000000000000..9e1cde8e666e
--- /dev/null
+++ b/common/common-ui/src/main/res/drawable/ic_shape_circle_disabled_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2C17.523,2 22,6.477 22,12C22,17.523 17.523,22 12,22C6.477,22 2,17.523 2,12C2,6.477 6.477,2 12,2ZM12,3.5C7.306,3.5 3.5,7.306 3.5,12C3.5,16.694 7.306,20.5 12,20.5C16.694,20.5 20.5,16.694 20.5,12C20.5,7.306 16.694,3.5 12,3.5Z"
+      android:fillColor="?attr/daxColorIconDisabled"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/common/common-ui/src/main/res/values/design-experiments-colors.xml b/common/common-ui/src/main/res/values/design-experiments-colors.xml
index 9a1da601e848..3a8554671e45 100644
--- a/common/common-ui/src/main/res/values/design-experiments-colors.xml
+++ b/common/common-ui/src/main/res/values/design-experiments-colors.xml
@@ -21,6 +21,9 @@
     <!-- Inside each category there are different colors, which define where are applied -->
 
     <!-- Dark Palette -->
+    <!-- Accents -->
+    <color name="accent_content_primary_dark">@color/blue80</color>
+
     <!-- Backgrounds -->
     <color name="background_background_dark">#27282A</color>
     <color name="background_surface_dark">#333538</color>
@@ -47,6 +50,9 @@
     <color name="controls_decoration_tertiary_dark">#B8F9F9F9</color>
 
     <!-- Light Palette -->
+    <!-- Accents -->
+    <color name="accent_content_primary_light">@color/white</color>
+
     <!-- Backgrounds -->
     <color name="background_background_light">#F2F2F2</color>
     <color name="background_surface_light">#F9F9F9</color>
diff --git a/common/common-ui/src/main/res/values/design-system-colors.xml b/common/common-ui/src/main/res/values/design-system-colors.xml
index 50a6a0dbaa6c..7ad9847e9c6c 100644
--- a/common/common-ui/src/main/res/values/design-system-colors.xml
+++ b/common/common-ui/src/main/res/values/design-system-colors.xml
@@ -60,6 +60,7 @@
     <attr name="daxColorLines" format="color"/>
     <attr name="daxColorAccentBlue" format="color"/>
     <attr name="daxColorAccentYellow" format="color"/>
+    <attr name="daxColorAccentContentPrimary" format="color"/>
     <attr name="daxColorContainerDisabled" format="color"/>
     <attr name="daxColorTextDisabled" format="color"/>
     <attr name="daxColorRipple" format="color"/>
@@ -192,6 +193,7 @@
     <color name="blue50_14">#243969EF</color>
     <color name="blue60">#2B55CA</color>
     <color name="blue70">#1E42A4</color>
+    <color name="blue80">#14307E</color>
 
     <color name="black84">#D6000000</color>
     <color name="black60">#99000000</color>
diff --git a/common/common-ui/src/main/res/values/design-system-theming.xml b/common/common-ui/src/main/res/values/design-system-theming.xml
index b9652a4ea36e..bfeadbe25b27 100644
--- a/common/common-ui/src/main/res/values/design-system-theming.xml
+++ b/common/common-ui/src/main/res/values/design-system-theming.xml
@@ -181,6 +181,7 @@
         <item name="daxColorLines">@color/white9</item>
         <item name="daxColorAccentBlue">@color/blue30</item>
         <item name="daxColorAccentYellow">@color/yellow50</item>
+        <item name="daxColorAccentContentPrimary">@color/accent_content_primary_dark</item>
         <item name="daxColorRipple">@color/white12</item>
         <item name="daxLogoTitleText">@color/white</item>
         <item name="daxOmnibarTextColorHighlight">@color/blue30_20</item>
@@ -289,6 +290,7 @@
         <item name="daxColorLines">@color/black9</item>
         <item name="daxColorAccentBlue">@color/blue50</item>
         <item name="daxColorAccentYellow">@color/yellow50</item>
+        <item name="daxColorAccentContentPrimary">@color/accent_content_primary_light</item>
         <item name="daxColorRipple">@color/black6</item>
         <item name="daxLogoTitleText">@color/gray85</item>
         <item name="daxOmnibarTextColorHighlight">@color/blue50_20</item>
diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
index 1fdf1c0dea45..e51374c0749f 100644
--- a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
+++ b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
@@ -210,9 +210,9 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
         abstract val imageRes: Int
 
         val checkRes: Int = if (isActive) {
-            CommonR.drawable.ic_check_blue_round_24
+            CommonR.drawable.ic_check_accent_24
         } else {
-            CommonR.drawable.ic_shape_circle_24
+            CommonR.drawable.ic_shape_circle_disabled_24
         }
 
         class WithoutAi(isActive: Boolean, isLightMode: Boolean) : InputScreenToggleButton(isActive) {
diff --git a/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml b/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
index f6f8c2d4574c..84813cff8954 100644
--- a/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
+++ b/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
@@ -131,7 +131,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="6dp"
-                        android:src="@drawable/ic_check_blue_round_24" />
+                        android:src="@drawable/ic_check_accent_24" />
 
                 </LinearLayout>
 

From 7d045b264ed38986fe2171f0ccae6421c2d6cd02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lpaczos@duckduckgo.com>
Date: Tue, 19 Aug 2025 15:07:22 +0200
Subject: [PATCH 8/9] align content with main Duck.ai toggle

---
 .../ui/settings/DuckChatSettingsActivity.kt   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
index e51374c0749f..28cd6736cc84 100644
--- a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
+++ b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
@@ -17,11 +17,13 @@
 package com.duckduckgo.duckchat.impl.ui.settings
 
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.View
 import android.widget.CompoundButton
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
@@ -108,6 +110,20 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
             binding.userEnabledDuckChatToggleRebranding.show()
             binding.showDuckChatSearchSettingsLink.setPrimaryText(getString(R.string.duck_chat_assist_settings_title_rebranding))
             binding.showDuckChatSearchSettingsLink.setSecondaryText(getString(R.string.duck_chat_assist_settings_description_rebranding))
+
+            // align content with the main Duck.ai toggle's text
+            val offset = resources.getDimensionPixelSize(CommonR.dimen.listItemImageContainerSize) +
+                resources.getDimensionPixelSize(CommonR.dimen.keyline_4)
+            val orientation = resources.configuration.orientation
+            binding.duckAiInputScreenToggleContainer.updatePadding(
+                left = if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+                    0
+                } else {
+                    offset
+                },
+            )
+            binding.duckAiInputScreenDescription.updatePadding(left = offset)
+            binding.duckAiShortcuts.updatePadding(left = offset)
         } else {
             binding.includeToolbar.toolbar.title = getString(R.string.duck_ai_paid_settings_title)
             binding.duckChatSettingsIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.chat_private_128))
@@ -117,6 +133,11 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
             binding.userEnabledDuckChatToggleRebranding.gone()
             binding.showDuckChatSearchSettingsLink.setPrimaryText(getString(R.string.duck_chat_assist_settings_title))
             binding.showDuckChatSearchSettingsLink.setSecondaryText(getString(R.string.duck_chat_assist_settings_description))
+
+            val offset = 0
+            binding.duckAiInputScreenToggleContainer.updatePadding(left = offset)
+            binding.duckAiInputScreenDescription.updatePadding(left = offset)
+            binding.duckAiShortcuts.updatePadding(left = offset)
         }
 
         binding.duckChatSettingsText.addClickableSpan(

From 4d96b04f4cf181eb9a8cc0589187ce09b17c5bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lpaczos@duckduckgo.com>
Date: Tue, 19 Aug 2025 16:39:31 +0200
Subject: [PATCH 9/9] update text type

---
 .../src/main/res/layout/activity_duck_chat_settings.xml         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml b/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
index 84813cff8954..329910efbc6a 100644
--- a/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
+++ b/duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
@@ -64,6 +64,7 @@
                 android:layout_marginBottom="@dimen/keyline_6"
                 android:text="@string/duck_chat_settings_activity_description"
                 android:gravity="center"
+                app:textType="secondary"
                 app:typography="body2"/>
 
             <com.duckduckgo.common.ui.view.divider.HorizontalDivider
@@ -184,6 +185,7 @@
                 android:layout_marginTop="@dimen/keyline_2"
                 android:layout_marginBottom="@dimen/keyline_4"
                 android:text="@string/input_screen_user_pref_description"
+                app:textType="secondary"
                 app:typography="body2" />
 
             <com.duckduckgo.common.ui.view.listitem.TwoLineListItem