diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPCompanyTrackersActivity.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPCompanyTrackersActivity.kt
index aaf122905745..ea44bc42f80e 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPCompanyTrackersActivity.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPCompanyTrackersActivity.kt
@@ -29,11 +29,10 @@ import androidx.lifecycle.lifecycleScope
 import com.bumptech.glide.Glide
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.di.AppCoroutineScope
-import com.duckduckgo.app.global.*
 import com.duckduckgo.browser.api.ui.BrowserScreens.WebViewActivityWithParams
 import com.duckduckgo.common.ui.DuckDuckGoActivity
+import com.duckduckgo.common.ui.view.DaxSwitch
 import com.duckduckgo.common.ui.view.InfoPanel
-import com.duckduckgo.common.ui.view.SwitchView
 import com.duckduckgo.common.ui.view.addClickableLink
 import com.duckduckgo.common.ui.view.gone
 import com.duckduckgo.common.ui.view.quietlySetIsChecked
@@ -233,7 +232,7 @@ class AppTPCompanyTrackersActivity : DuckDuckGoActivity() {
         menuInflater.inflate(R.menu.menu_company_trackers_activity, menu)
 
         val switchMenuItem = menu.findItem(R.id.deviceShieldSwitch)
-        appEnabledSwitch = switchMenuItem?.actionView as SwitchView
+        appEnabledSwitch = switchMenuItem?.actionView as DaxSwitch
         appEnabledSwitch.setOnCheckedChangeListener(toggleAppSwitchListener)
         return true
     }
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt
index 88eea3174e09..2f6a514e0672 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt
@@ -35,9 +35,9 @@ import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.browser.api.ui.BrowserScreens.WebViewActivityWithParams
 import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.common.ui.view.DaxDialogListener
+import com.duckduckgo.common.ui.view.DaxSwitch
 import com.duckduckgo.common.ui.view.InfoPanel.Companion.APPTP_SETTINGS_ANNOTATION
 import com.duckduckgo.common.ui.view.InfoPanel.Companion.REPORT_ISSUES_ANNOTATION
-import com.duckduckgo.common.ui.view.SwitchView
 import com.duckduckgo.common.ui.view.TypewriterDaxDialog
 import com.duckduckgo.common.ui.view.dialog.StackedAlertDialogBuilder
 import com.duckduckgo.common.ui.view.dialog.TextAlertDialogBuilder
@@ -113,7 +113,7 @@ class DeviceShieldTrackerActivity :
 
     private val binding: ActivityDeviceShieldActivityBinding by viewBinding()
 
-    private lateinit var deviceShieldSwitch: SwitchView
+    private lateinit var deviceShieldSwitch: DaxSwitch
 
     // we might get an update before options menu has been populated; temporarily cache value to use when menu populated
     private var vpnCachedState: VpnState? = null
@@ -596,7 +596,7 @@ class DeviceShieldTrackerActivity :
         menuInflater.inflate(R.menu.menu_device_tracker_activity, menu)
 
         val switchMenuItem = menu.findItem(R.id.deviceShieldSwitch)
-        deviceShieldSwitch = switchMenuItem?.actionView as SwitchView
+        deviceShieldSwitch = switchMenuItem?.actionView as DaxSwitch
         deviceShieldSwitch.setOnCheckedChangeListener(enableAppTPSwitchListener)
         return true
     }
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/menu_item_device_tracker_switch.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/menu_item_device_tracker_switch.xml
index 2ba4f1af0b43..d56996af376d 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/menu_item_device_tracker_switch.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/menu_item_device_tracker_switch.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<com.duckduckgo.common.ui.view.SwitchView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.duckduckgo.common.ui.view.DaxSwitch xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/deviceShieldTrackerSwitch"
     android:layout_width="wrap_content"
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_app.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_app.xml
index 874170485601..289ca0246555 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_app.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_app.xml
@@ -22,7 +22,7 @@
     android:gravity="center"
     android:orientation="horizontal"
     android:background="?attr/selectableItemBackground"
-    android:minHeight="@dimen/twoLineItemWithLargeImageHeight">
+    android:minHeight="@dimen/oneLineItemWithLargeImageHeight">
 
     <ImageView
         android:id="@+id/deviceShieldAppEntryIcon"
@@ -58,7 +58,7 @@
         app:typography="caption"
         tools:text="App issues may occur if enabled" />
 
-    <com.duckduckgo.common.ui.view.SwitchView
+    <com.duckduckgo.common.ui.view.DaxSwitch
         android:id="@+id/deviceShieldAppEntryShieldEnabled"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -86,7 +86,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.541"
         app:layout_constraintVertical_chainStyle="packed"
-        app:typography="h4"
+        app:typography="body1"
         tools:text="Facebook" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarkListItem.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarkListItem.kt
deleted file mode 100644
index b21512d5fa09..000000000000
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarkListItem.kt
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (c) 2024 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.app.bookmarks.ui
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.drawable.Drawable
-import android.text.TextUtils.TruncateAt
-import android.util.AttributeSet
-import android.view.View
-import android.widget.CompoundButton.OnCheckedChangeListener
-import android.widget.ImageView
-import androidx.annotation.ColorRes
-import androidx.annotation.DrawableRes
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.content.ContextCompat
-import com.duckduckgo.common.ui.view.SwitchView
-import com.duckduckgo.common.ui.view.gone
-import com.duckduckgo.common.ui.view.quietlySetIsChecked
-import com.duckduckgo.common.ui.view.recursiveEnable
-import com.duckduckgo.common.ui.view.setEnabledOpacity
-import com.duckduckgo.common.ui.view.show
-import com.duckduckgo.common.ui.view.text.DaxTextView
-import com.duckduckgo.mobile.android.R
-
-abstract class BookmarkListItem(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int,
-) : ConstraintLayout(context, attrs, defStyleAttr) {
-
-    internal abstract val primaryText: DaxTextView
-    internal abstract val secondaryText: DaxTextView?
-    internal abstract val leadingIcon: ImageView
-    internal abstract val leadingIconContainer: View
-    internal abstract val trailingIcon: ImageView
-    internal abstract val trailingIconContainer: View
-    internal abstract val trailingSwitch: SwitchView
-    internal abstract val favoriteStar: ImageView?
-    internal abstract val itemContainer: View
-    internal abstract val verticalPadding: Int
-
-    /** Sets the item click listener */
-    fun setClickListener(onClick: () -> Unit) {
-        itemContainer.setOnClickListener { onClick() }
-    }
-
-    /** Sets the primary text title */
-    fun setPrimaryText(title: String?) {
-        primaryText.text = title
-    }
-
-    /** Sets primary text color */
-    fun setPrimaryTextColor(@ColorRes colorRes: Int) {
-        primaryText.setTextColor(ContextCompat.getColorStateList(context, colorRes))
-    }
-
-    /** Sets primary text color state list */
-    fun setPrimaryTextColorStateList(stateList: ColorStateList?) {
-        primaryText.setTextColor(stateList)
-    }
-
-    /** Sets primary text truncation */
-    fun setPrimaryTextTruncation(truncated: Boolean) {
-        if (truncated) {
-            primaryText.maxLines = 1
-            primaryText.ellipsize = TruncateAt.END
-        } else {
-            primaryText.maxLines = Int.MAX_VALUE
-        }
-    }
-
-    /** Sets the secondary text title */
-    fun setSecondaryText(title: String?) {
-        secondaryText?.text = title
-    }
-
-    /** Sets secondary text color */
-    fun setSecondaryTextColor(@ColorRes colorRes: Int) {
-        secondaryText?.setTextColor(ContextCompat.getColorStateList(context, colorRes))
-    }
-
-    /** Sets secondary text color state list */
-    fun setSecondaryTextColorStateList(stateList: ColorStateList?) {
-        secondaryText?.setTextColor(stateList)
-    }
-
-    /** Sets the leading icon image drawable */
-    fun setLeadingIconDrawable(drawable: Drawable) {
-        leadingIcon.setImageDrawable(drawable)
-        setLeadingIconVisibility(true)
-    }
-
-    /** Sets the leading icon image resource */
-    fun setLeadingIconResource(@DrawableRes idRes: Int) {
-        leadingIcon.setImageResource(idRes)
-        setLeadingIconVisibility(true)
-    }
-
-    /** Sets the leading image content description */
-    fun setLeadingIconContentDescription(description: String) {
-        leadingIcon.contentDescription = description
-    }
-
-    /** Sets the leading icon image visibility */
-    fun setLeadingIconVisibility(visible: Boolean) {
-        if (visible) {
-            val padding = resources.getDimensionPixelSize(verticalPadding)
-            itemContainer.setPadding(0, padding, 0, padding)
-            leadingIconContainer.show()
-        } else {
-            leadingIconContainer.gone()
-        }
-    }
-
-    /** Sets the leading icon background image type */
-    fun setLeadingIconBackgroundType(type: ImageBackground) {
-        leadingIconContainer.setBackgroundResource(ImageBackground.background(type))
-        setLeadingIconVisibility(true)
-    }
-
-    /** Sets the leading icon background image type */
-    fun setLeadingIconSize(imageSize: LeadingIconSize) {
-        val size = resources.getDimensionPixelSize(LeadingIconSize.dimension(imageSize))
-        leadingIcon.layoutParams.width = size
-        leadingIcon.layoutParams.height = size
-    }
-
-    /** Returns the binding of the leading icon */
-    fun leadingIcon() = leadingIcon
-
-    /** Sets the trailing icon image drawable */
-    fun setTrailingIconDrawable(drawable: Drawable) {
-        trailingIcon.setImageDrawable(drawable)
-        showTrailingIcon()
-    }
-
-    /** Sets the trailing icon image resource */
-    fun setTrailingIconResource(@DrawableRes idRes: Int) {
-        trailingIcon.setImageResource(idRes)
-        showTrailingIcon()
-    }
-
-    /** Sets the trailing image content description */
-    fun setTrailingIconContentDescription(description: String) {
-        trailingIcon.contentDescription = description
-    }
-
-    /** Sets the item overflow menu click listener */
-    fun setLeadingIconClickListener(onClick: (View) -> Unit) {
-        leadingIcon.setOnClickListener { onClick(leadingIcon) }
-    }
-
-    /** Sets the item overflow menu click listener */
-    fun setTrailingIconClickListener(onClick: (View) -> Unit) {
-        trailingIconContainer.setOnClickListener { onClick(trailingIcon) }
-    }
-
-    /** Sets the Switch Visible */
-    fun showSwitch() {
-        trailingIconContainer.gone()
-        trailingSwitch.show()
-    }
-
-    fun setSwitchEnabled(enabled: Boolean) {
-        if (enabled) {
-            trailingSwitch.setEnabledOpacity(true)
-            trailingSwitch.isEnabled = true
-        } else {
-            trailingSwitch.setEnabledOpacity(false)
-            trailingSwitch.isEnabled = false
-        }
-    }
-
-    /** Sets the trailing icon Visible */
-    fun showTrailingIcon() {
-        trailingIconContainer.show()
-        trailingSwitch.gone()
-    }
-
-    /** Hides all trailing items */
-    fun hideTrailingItems() {
-        trailingIconContainer.gone()
-        trailingSwitch.gone()
-    }
-
-    /** Hides all leading items */
-    fun hideLeadingItems() {
-        leadingIconContainer.gone()
-        val padding = resources.getDimensionPixelSize(R.dimen.twoLineItemVerticalBigPadding)
-        itemContainer.setPadding(0, padding, 0, padding)
-    }
-
-    /** Sets the favorite star visibility */
-    fun setFavoriteStarVisible(isVisible: Boolean) {
-        if (isVisible) {
-            favoriteStar?.show()
-        } else {
-            favoriteStar?.gone()
-        }
-    }
-
-    /** Sets the switch value */
-    fun setIsChecked(isChecked: Boolean) {
-        trailingSwitch.isChecked = isChecked
-    }
-
-    /** Sets the checked change listener for the switch */
-    fun setOnCheckedChangeListener(onCheckedChangeListener: OnCheckedChangeListener) {
-        trailingSwitch.setOnCheckedChangeListener(onCheckedChangeListener)
-    }
-
-    /** Allows to set a new value to the switch, without triggering the onChangeListener */
-    fun quietlySetIsChecked(
-        newCheckedState: Boolean,
-        changeListener: OnCheckedChangeListener?,
-    ) {
-        trailingSwitch.quietlySetIsChecked(newCheckedState, changeListener)
-    }
-
-    /** Sets the switch as enabled or not */
-    override fun setEnabled(enabled: Boolean) {
-        setEnabledOpacity(enabled)
-        recursiveEnable(enabled)
-        super.setEnabled(enabled)
-    }
-
-    enum class ImageBackground {
-        None,
-        Circular,
-        Rounded,
-        ;
-
-        companion object {
-            fun from(value: Int): ImageBackground {
-                // same order as attrs-lists.xml
-                return when (value) {
-                    0 -> None
-                    1 -> Circular
-                    2 -> Rounded
-                    else -> None
-                }
-            }
-
-            fun background(type: ImageBackground): Int {
-                return when (type) {
-                    None -> android.R.color.transparent
-                    Circular -> R.drawable.list_item_image_circular_background
-                    Rounded -> R.drawable.list_item_image_round_background
-                }
-            }
-        }
-    }
-
-    enum class LeadingIconSize {
-        Small,
-        Medium,
-        Large,
-        ;
-
-        companion object {
-            fun from(size: Int): LeadingIconSize {
-                // same order as attrs-lists.xml
-                return when (size) {
-                    0 -> Small
-                    1 -> Medium
-                    2 -> Large
-                    else -> Medium
-                }
-            }
-
-            fun dimension(size: LeadingIconSize): Int {
-                return when (size) {
-                    Small -> R.dimen.listItemImageSmallSize
-                    Medium -> R.dimen.listItemImageMediumSize
-                    Large -> R.dimen.listItemImageLargeSize
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/res/layout/activity_appearance.xml b/app/src/main/res/layout/activity_appearance.xml
index f710930271b8..e17a9b80cb75 100644
--- a/app/src/main/res/layout/activity_appearance.xml
+++ b/app/src/main/res/layout/activity_appearance.xml
@@ -74,7 +74,7 @@
                     android:layout_weight="1"
                     android:gravity="center_vertical"
                     android:text="@string/changeIconCtaLabel"
-                    app:typography="h4" />
+                    app:typography="body1" />
 
                 <ImageView
                     android:id="@+id/changeAppIcon"
diff --git a/app/src/main/res/layout/activity_private_search.xml b/app/src/main/res/layout/activity_private_search.xml
index 02e794881c73..86513596b64c 100644
--- a/app/src/main/res/layout/activity_private_search.xml
+++ b/app/src/main/res/layout/activity_private_search.xml
@@ -83,46 +83,31 @@
                 android:layout_height="wrap_content"
                 app:primaryText="@string/privateSearchHeadingSearchSettings" />
 
-            <com.duckduckgo.common.ui.view.listitem.OneLineListItem
+            <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
                 android:id="@+id/privateSearchAutocompleteToggle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:primaryText="@string/privateSearchAutocompleteToggle"
+                app:secondaryText="@string/privateSearchAutocompleteHint"
                 app:showSwitch="true" />
 
-            <com.duckduckgo.common.ui.view.text.DaxTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:textType="secondary"
-                app:typography="body2"
-                android:layout_marginHorizontal="@dimen/keyline_4"
-                android:text="@string/privateSearchAutocompleteHint"/>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:id="@+id/privateSearchAutocompleteRecentlyVisitedSites"
                 android:orientation="vertical">
 
-                <com.duckduckgo.common.ui.view.listitem.OneLineListItem
+                <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
                     android:id="@+id/privateSearchAutocompleteRecentlyVisitedSitesToggle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:primaryText="@string/privateSearchAutocompleteRecentlyVisitedSitesToggle"
+                    app:secondaryText="@string/privateSearchAutocompleteRecentlyVisitedSitesHint"
                     app:showSwitch="true" />
 
-                <com.duckduckgo.common.ui.view.text.DaxTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:textType="secondary"
-                    app:typography="body2"
-                    android:layout_marginHorizontal="@dimen/keyline_4"
-                    android:text="@string/privateSearchAutocompleteRecentlyVisitedSitesHint"/>
-
                 <com.duckduckgo.common.ui.view.divider.HorizontalDivider
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/keyline_4"/>
+                    android:layout_height="wrap_content" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_add_bookmark.xml b/app/src/main/res/layout/bottom_sheet_add_bookmark.xml
index 9de14b2d7478..aed85ba08530 100644
--- a/app/src/main/res/layout/bottom_sheet_add_bookmark.xml
+++ b/app/src/main/res/layout/bottom_sheet_add_bookmark.xml
@@ -47,7 +47,7 @@
             app:leadingIconBackground="circular"
             app:primaryText="Primary Item" />
 
-        <com.duckduckgo.common.ui.view.SwitchView
+        <com.duckduckgo.common.ui.view.DaxSwitch
             android:id="@+id/bookmarksBottomSheetSwitch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_fragment_saved_site.xml b/app/src/main/res/layout/dialog_fragment_saved_site.xml
index fb5c32db3140..9ac4956a16a3 100644
--- a/app/src/main/res/layout/dialog_fragment_saved_site.xml
+++ b/app/src/main/res/layout/dialog_fragment_saved_site.xml
@@ -95,7 +95,7 @@
             app:primaryText="@string/addToFavorites"
             app:leadingIconBackground="circular"/>
 
-        <com.duckduckgo.common.ui.view.SwitchView
+        <com.duckduckgo.common.ui.view.DaxSwitch
             android:id="@+id/addToFavoritesSwitch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/row_bookmark_two_line_item.xml b/app/src/main/res/layout/row_bookmark_two_line_item.xml
index e125d40084ab..f5fd0217079e 100644
--- a/app/src/main/res/layout/row_bookmark_two_line_item.xml
+++ b/app/src/main/res/layout/row_bookmark_two_line_item.xml
@@ -15,7 +15,7 @@
   -->
 
 
-<com.duckduckgo.app.bookmarks.ui.BookmarkTwoLineListItem
+<com.duckduckgo.common.ui.view.listitem.BookmarksListItem
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/view_site_protections_toggle.xml b/app/src/main/res/layout/view_site_protections_toggle.xml
index 5e792f0ef429..75d8ebf068b4 100644
--- a/app/src/main/res/layout/view_site_protections_toggle.xml
+++ b/app/src/main/res/layout/view_site_protections_toggle.xml
@@ -38,7 +38,7 @@
         app:layout_constraintVertical_bias="0"
         tools:text="@string/brokenSiteProtectionsOn" />
 
-    <com.duckduckgo.common.ui.view.SwitchView
+    <com.duckduckgo.common.ui.view.DaxSwitch
         android:id="@+id/protectionsSwitch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/SwitchView.kt b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/DaxSwitch.kt
similarity index 80%
rename from common/common-ui/src/main/java/com/duckduckgo/common/ui/view/SwitchView.kt
rename to common/common-ui/src/main/java/com/duckduckgo/common/ui/view/DaxSwitch.kt
index 581656bf8ae0..c3225abbec5c 100644
--- a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/SwitchView.kt
+++ b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/DaxSwitch.kt
@@ -19,20 +19,20 @@ package com.duckduckgo.common.ui.view
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.CompoundButton
-import com.google.android.material.R
-import com.google.android.material.switchmaterial.SwitchMaterial
+import com.duckduckgo.mobile.android.R
+import com.google.android.material.materialswitch.MaterialSwitch
 
-class SwitchView @JvmOverloads constructor(
+class DaxSwitch @JvmOverloads constructor(
     ctx: Context,
     attrs: AttributeSet,
-    defStyleAttr: Int = R.attr.switchStyle,
-) : SwitchMaterial(
+    defStyleAttr: Int = R.attr.daxSwitchStyle,
+) : MaterialSwitch(
     ctx,
     attrs,
     defStyleAttr,
 )
 
-fun SwitchView.quietlySetIsChecked(
+fun DaxSwitch.quietlySetIsChecked(
     newCheckedState: Boolean,
     changeListener: CompoundButton.OnCheckedChangeListener?,
 ) {
diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarkTwoLineListItem.kt b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/BookmarksListItem.kt
similarity index 84%
rename from app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarkTwoLineListItem.kt
rename to common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/BookmarksListItem.kt
index 2379a51c121f..953ee2b56972 100644
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarkTwoLineListItem.kt
+++ b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/BookmarksListItem.kt
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-@file:Suppress("MemberVisibilityCanBePrivate")
-
-package com.duckduckgo.app.bookmarks.ui
+package com.duckduckgo.common.ui.view.listitem
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.ImageView
-import com.duckduckgo.app.browser.databinding.ViewBookmarkTwoLineItemBinding
-import com.duckduckgo.common.ui.view.SwitchView
+import com.duckduckgo.common.ui.view.DaxSwitch
+import com.duckduckgo.common.ui.view.gone
+import com.duckduckgo.common.ui.view.show
 import com.duckduckgo.common.ui.view.text.DaxTextView
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.mobile.android.R
+import com.duckduckgo.mobile.android.databinding.ViewBookmarkTwoLineItemBinding
 
-class BookmarkTwoLineListItem @JvmOverloads constructor(
+class BookmarksListItem @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = R.attr.twoLineListItemStyle,
-) : BookmarkListItem(context, attrs, defStyleAttr) {
+) : DaxListItem(context, attrs, defStyleAttr) {
 
     private val binding: ViewBookmarkTwoLineItemBinding by viewBinding()
 
@@ -49,10 +49,10 @@ class BookmarkTwoLineListItem @JvmOverloads constructor(
         get() = binding.trailingIcon
     override val trailingIconContainer: View
         get() = binding.trailingIconContainer
-    override val trailingSwitch: SwitchView
+    override val trailingSwitch: DaxSwitch
         get() = binding.trailingSwitch
-    override val favoriteStar: ImageView
-        get() = binding.favoriteStar
+    override val betaPill: ImageView?
+        get() = null
 
     override val itemContainer: View
         get() = binding.itemContainer
@@ -60,6 +60,18 @@ class BookmarkTwoLineListItem @JvmOverloads constructor(
     override val verticalPadding: Int
         get() = R.dimen.twoLineItemVerticalPadding
 
+    val favoriteStar: ImageView?
+        get() = binding.favoriteStar
+
+    /** Sets the favorite star visibility */
+    fun setFavoriteStarVisible(isVisible: Boolean) {
+        if (isVisible) {
+            favoriteStar?.show()
+        } else {
+            favoriteStar?.gone()
+        }
+    }
+
     init {
         context.obtainStyledAttributes(
             attrs,
@@ -98,8 +110,7 @@ class BookmarkTwoLineListItem @JvmOverloads constructor(
             }
 
             if (hasValue(R.styleable.TwoLineListItem_leadingIconSize)) {
-                val imageSize =
-                    LeadingIconSize.from(getInt(R.styleable.TwoLineListItem_leadingIconSize, 1))
+                val imageSize = LeadingIconSize.from(getInt(R.styleable.TwoLineListItem_leadingIconSize, 1))
                 setLeadingIconSize(imageSize)
             }
 
diff --git a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/DaxListItem.kt b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/DaxListItem.kt
index c078e762afec..5a620b9b6e09 100644
--- a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/DaxListItem.kt
+++ b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/DaxListItem.kt
@@ -28,7 +28,7 @@ import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
-import com.duckduckgo.common.ui.view.SwitchView
+import com.duckduckgo.common.ui.view.DaxSwitch
 import com.duckduckgo.common.ui.view.gone
 import com.duckduckgo.common.ui.view.quietlySetIsChecked
 import com.duckduckgo.common.ui.view.recursiveEnable
@@ -49,7 +49,7 @@ abstract class DaxListItem(
     internal abstract val leadingIconContainer: View
     internal abstract val trailingIcon: ImageView
     internal abstract val trailingIconContainer: View
-    internal abstract val trailingSwitch: SwitchView
+    internal abstract val trailingSwitch: DaxSwitch
     internal abstract val betaPill: ImageView?
     internal abstract val itemContainer: View
     internal abstract val verticalPadding: Int
@@ -140,6 +140,27 @@ abstract class DaxListItem(
         leadingIcon.layoutParams.height = size
     }
 
+    /** Sets the leading icon size and the background type
+     * The need to be set together because the size of the leading background container
+     * depends on the size of the image
+     */
+
+    fun setLeadingIconSize(imageSize: LeadingIconSize, type: ImageBackground) {
+        val iconSize = resources.getDimensionPixelSize(LeadingIconSize.dimension(imageSize))
+        val backgroundSize = if (type == ImageBackground.None) {
+            iconSize
+        } else {
+            resources.getDimensionPixelSize(R.dimen.listItemImageContainerSize)
+        }
+
+        leadingIcon.layoutParams.width = iconSize
+        leadingIcon.layoutParams.height = iconSize
+
+        leadingIconContainer.setBackgroundResource(ImageBackground.background(type))
+        leadingIconContainer.layoutParams.width = backgroundSize
+        leadingIconContainer.layoutParams.height = backgroundSize
+    }
+
     /** Returns the binding of the leading icon */
     fun leadingIcon() = leadingIcon
 
diff --git a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/OneLineListItem.kt b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/OneLineListItem.kt
index 68498b3d4a28..9971561f021f 100644
--- a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/OneLineListItem.kt
+++ b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/OneLineListItem.kt
@@ -20,7 +20,8 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.ImageView
-import com.duckduckgo.common.ui.view.SwitchView
+import com.duckduckgo.common.ui.view.DaxSwitch
+import com.duckduckgo.common.ui.view.listitem.DaxListItem.LeadingIconSize.Medium
 import com.duckduckgo.common.ui.view.text.DaxTextView
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.mobile.android.R
@@ -46,7 +47,7 @@ class OneLineListItem @JvmOverloads constructor(
         get() = binding.trailingIcon
     override val trailingIconContainer: View
         get() = binding.trailingIconContainer
-    override val trailingSwitch: SwitchView
+    override val trailingSwitch: DaxSwitch
         get() = binding.trailingSwitch
 
     override val betaPill: ImageView?
@@ -81,22 +82,25 @@ class OneLineListItem @JvmOverloads constructor(
                 setLeadingIconVisibility(false)
             }
 
-            if (hasValue(R.styleable.OneLineListItem_leadingIconBackground)) {
-                val type = ImageBackground.from(
+            val leadingIconBackground = if (hasValue(R.styleable.OneLineListItem_leadingIconBackground)) {
+                ImageBackground.from(
                     getInt(
                         R.styleable.OneLineListItem_leadingIconBackground,
                         0,
                     ),
                 )
-                setLeadingIconBackgroundType(type)
+            } else {
+                ImageBackground.None
             }
 
-            if (hasValue(R.styleable.OneLineListItem_leadingIconSize)) {
-                val imageSize =
-                    LeadingIconSize.from(getInt(R.styleable.OneLineListItem_leadingIconSize, 1))
-                setLeadingIconSize(imageSize)
+            val leadingIconSize = if (hasValue(R.styleable.OneLineListItem_leadingIconSize)) {
+                LeadingIconSize.from(getInt(R.styleable.OneLineListItem_leadingIconSize, 1))
+            } else {
+                Medium
             }
 
+            setLeadingIconSize(leadingIconSize, leadingIconBackground)
+
             val showTrailingIcon = hasValue(R.styleable.OneLineListItem_trailingIcon)
             val showSwitch = getBoolean(R.styleable.OneLineListItem_showSwitch, false)
             when {
diff --git a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/TwoLineListItem.kt b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/TwoLineListItem.kt
index 48437f00df33..da88bf0c09c9 100644
--- a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/TwoLineListItem.kt
+++ b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/TwoLineListItem.kt
@@ -22,7 +22,8 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.ImageView
-import com.duckduckgo.common.ui.view.SwitchView
+import com.duckduckgo.common.ui.view.DaxSwitch
+import com.duckduckgo.common.ui.view.listitem.DaxListItem.LeadingIconSize.Medium
 import com.duckduckgo.common.ui.view.text.DaxTextView
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.mobile.android.R
@@ -49,7 +50,7 @@ class TwoLineListItem @JvmOverloads constructor(
         get() = binding.trailingIcon
     override val trailingIconContainer: View
         get() = binding.trailingIconContainer
-    override val trailingSwitch: SwitchView
+    override val trailingSwitch: DaxSwitch
         get() = binding.trailingSwitch
     override val betaPill: ImageView
         get() = binding.betaPill
@@ -87,22 +88,25 @@ class TwoLineListItem @JvmOverloads constructor(
                 hideLeadingItems()
             }
 
-            if (hasValue(R.styleable.TwoLineListItem_leadingIconBackground)) {
-                val type = ImageBackground.from(
+            val leadingIconBackground = if (hasValue(R.styleable.TwoLineListItem_leadingIconBackground)) {
+                ImageBackground.from(
                     getInt(
                         R.styleable.TwoLineListItem_leadingIconBackground,
                         0,
                     ),
                 )
-                setLeadingIconBackgroundType(type)
+            } else {
+                ImageBackground.None
             }
 
-            if (hasValue(R.styleable.TwoLineListItem_leadingIconSize)) {
-                val imageSize =
-                    LeadingIconSize.from(getInt(R.styleable.TwoLineListItem_leadingIconSize, 1))
-                setLeadingIconSize(imageSize)
+            val leadingIconSize = if (hasValue(R.styleable.TwoLineListItem_leadingIconSize)) {
+                LeadingIconSize.from(getInt(R.styleable.TwoLineListItem_leadingIconSize, 1))
+            } else {
+                Medium
             }
 
+            setLeadingIconSize(leadingIconSize, leadingIconBackground)
+
             if (hasValue(R.styleable.TwoLineListItem_primaryTextColorOverlay)) {
                 setPrimaryTextColorStateList(getColorStateList(R.styleable.TwoLineListItem_primaryTextColorOverlay))
             }
diff --git a/common/common-ui/src/main/res/color/switch_thumb_tint.xml b/common/common-ui/src/main/res/color/switch_thumb_tint.xml
index 51431927e302..1267318154f3 100644
--- a/common/common-ui/src/main/res/color/switch_thumb_tint.xml
+++ b/common/common-ui/src/main/res/color/switch_thumb_tint.xml
@@ -14,7 +14,33 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
+<!--<selector xmlns:android="http://schemas.android.com/apk/res/android">-->
+<!--    <item android:color="?attr/daxColorSwitchThumbOn" android:state_checked="true"/>-->
+<!--    <item android:color="?attr/daxColorSwitchThumbOff"/>-->
+<!--</selector>-->
+
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/daxColorSwitchThumbOn" android:state_checked="true"/>
-    <item android:color="?attr/daxColorSwitchThumbOff"/>
+<!-- State Disabled, Unchecked -->
+<item
+    android:alpha="0.38"
+    android:color="?attr/daxColorSwitchThumbOff"
+    android:state_enabled="false" android:state_checked="false"/>
+
+<!-- State Disabled, Checked -->
+<item
+    android:alpha="0.38"
+    android:color="?attr/daxColorSwitchThumbOn"
+    android:state_enabled="false" android:state_checked="true"/>
+
+<!-- State Checked, Pressed -->
+<item android:color="?attr/daxColorSwitchThumbOn" android:state_checked="true" android:state_pressed="true"/>
+
+<!-- State Checked -->
+<item android:color="?attr/daxColorSwitchThumbOn" android:state_checked="true"/>
+
+<!-- State Unchecked, Pressed -->
+<item android:color="?attr/daxColorSwitchThumbOn" android:state_pressed="true"/>
+
+<!-- State Unchecked -->
+<item android:color="?attr/daxColorSwitchThumbOff"/>
 </selector>
diff --git a/common/common-ui/src/main/res/color/switch_track_tint.xml b/common/common-ui/src/main/res/color/switch_track_tint.xml
index 29ac9fa47896..9722c253f999 100644
--- a/common/common-ui/src/main/res/color/switch_track_tint.xml
+++ b/common/common-ui/src/main/res/color/switch_track_tint.xml
@@ -14,7 +14,25 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
 -->
+<!--<selector xmlns:android="http://schemas.android.com/apk/res/android">-->
+<!--    <item android:alpha="0.5" android:color="?attr/daxColorSwitchTrackOn" android:state_checked="true"/>-->
+<!--    <item android:alpha="0.5"  android:color="?attr/daxColorSwitchTrackOff"/>-->
+<!--</selector>-->
+
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.5" android:color="?attr/daxColorSwitchTrackOn" android:state_checked="true"/>
-    <item android:alpha="0.5"  android:color="?attr/daxColorSwitchTrackOff"/>
-</selector>
+<!-- State Disabled, Unchecked -->
+<item android:alpha="0.5"
+    android:color="?attr/daxColorSwitchTrackOff"
+    android:state_enabled="false" android:state_checked="false"/>
+
+<!-- State Disabled, Checked -->
+<item android:alpha="0.5"
+    android:color="?attr/daxColorSwitchTrackOff"
+    android:state_enabled="false" android:state_checked="true"/>
+
+<!-- State Checked -->
+<item android:color="?attr/daxColorSwitchTrackOn" android:state_checked="true"/>
+
+<!-- State Unchecked -->
+<item android:color="?attr/daxColorSwitchTrackOff"/>
+</selector>
\ No newline at end of file
diff --git a/common/common-ui/src/main/res/drawable/switch_thumb.xml b/common/common-ui/src/main/res/drawable/switch_thumb.xml
new file mode 100644
index 000000000000..6f76a7033597
--- /dev/null
+++ b/common/common-ui/src/main/res/drawable/switch_thumb.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2024 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.
+  -->
+
+<animated-selector 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:width="@dimen/mtrl_switch_thumb_size"
+  android:height="@dimen/mtrl_switch_thumb_size"
+  tools:ignore="NewApi">
+
+  <item
+    android:id="@+id/pressed"
+    android:drawable="@drawable/mtrl_switch_thumb_pressed"
+    android:state_pressed="true" />
+
+  <item
+    android:id="@+id/checked"
+    android:drawable="@drawable/mtrl_switch_thumb_checked"
+    android:state_checked="true" />
+
+  <item
+    android:id="@+id/with_icon"
+    android:drawable="@drawable/mtrl_switch_thumb_checked"
+    app:state_with_icon="true" />
+
+  <item
+    android:id="@+id/unchecked"
+    android:drawable="@drawable/mtrl_switch_thumb_checked" />
+
+</animated-selector>
diff --git a/common/common-ui/src/main/res/layout/component_one_line_item.xml b/common/common-ui/src/main/res/layout/component_one_line_item.xml
index 03ca419dae28..549245122ea8 100644
--- a/common/common-ui/src/main/res/layout/component_one_line_item.xml
+++ b/common/common-ui/src/main/res/layout/component_one_line_item.xml
@@ -50,6 +50,19 @@
         app:leadingIcon="@drawable/ic_dax_icon"
         app:primaryText="Item with Small Leading Image " />
 
+    <com.duckduckgo.common.ui.view.listitem.OneLineListItem
+        android:id="@+id/oneLineListItemWithSmallImageAndBg"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/keyline_2"
+        app:leadingIconSize="small"
+        app:leadingIconBackground="circular"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/oneLineListItemWithSmallImage"
+        app:leadingIcon="@drawable/ic_dax_icon"
+        app:primaryText="Item with Small Leading Image " />
+
     <com.duckduckgo.common.ui.view.listitem.OneLineListItem
         android:id="@+id/oneLineListItemWithMediumImage"
         android:layout_width="match_parent"
@@ -58,7 +71,20 @@
         app:leadingIconSize="medium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/oneLineListItemWithSmallImage"
+        app:layout_constraintTop_toBottomOf="@id/oneLineListItemWithSmallImageAndBg"
+        app:leadingIcon="@drawable/ic_dax_icon"
+        app:primaryText="Item with Medium Leading Image " />
+
+    <com.duckduckgo.common.ui.view.listitem.OneLineListItem
+        android:id="@+id/oneLineListItemWithMediumImageAndBg"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/keyline_2"
+        app:leadingIconSize="medium"
+        app:leadingIconBackground="circular"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/oneLineListItemWithMediumImage"
         app:leadingIcon="@drawable/ic_dax_icon"
         app:primaryText="Item with Medium Leading Image " />
 
@@ -70,7 +96,20 @@
         app:leadingIconSize="large"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/oneLineListItemWithMediumImage"
+        app:layout_constraintTop_toBottomOf="@id/oneLineListItemWithMediumImageAndBg"
+        app:leadingIcon="@drawable/ic_dax_icon"
+        app:primaryText="Item with Large Leading Image " />
+
+    <com.duckduckgo.common.ui.view.listitem.OneLineListItem
+        android:id="@+id/oneLineListItemWithLargeImageAndBG"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/keyline_2"
+        app:leadingIconSize="large"
+        app:leadingIconBackground="circular"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/oneLineListItemWithLargeImage"
         app:leadingIcon="@drawable/ic_dax_icon"
         app:primaryText="Item with Large Leading Image " />
 
@@ -82,18 +121,31 @@
         app:leadingIconSize="extra_large"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/oneLineListItemWithLargeImage"
+        app:layout_constraintTop_toBottomOf="@id/oneLineListItemWithLargeImageAndBG"
         app:leadingIcon="@drawable/ic_dax_icon"
         app:primaryText="Item with Extra Large Leading Image " />
 
     <com.duckduckgo.common.ui.view.listitem.OneLineListItem
-        android:id="@+id/oneLineListItemWithTrailingIcon"
+        android:id="@+id/oneLineListItemWithExtraLargeImageAndBG"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/keyline_2"
+        app:leadingIconSize="extra_large"
+        app:leadingIconBackground="circular"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/oneLineListItemWithExtraLargeImage"
+        app:leadingIcon="@drawable/ic_dax_icon"
+        app:primaryText="Item with Extra Large Leading Image " />
+
+    <com.duckduckgo.common.ui.view.listitem.OneLineListItem
+        android:id="@+id/oneLineListItemWithTrailingIcon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/keyline_2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/oneLineListItemWithExtraLargeImageAndBG"
         app:primaryText="Item With Trailing Icon"
         app:trailingIcon="@drawable/ic_menu_vertical_24" />
 
diff --git a/common/common-ui/src/main/res/layout/component_switch.xml b/common/common-ui/src/main/res/layout/component_switch.xml
index a3de7e9d4e39..c107877031b5 100644
--- a/common/common-ui/src/main/res/layout/component_switch.xml
+++ b/common/common-ui/src/main/res/layout/component_switch.xml
@@ -33,27 +33,48 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
-    <com.duckduckgo.common.ui.view.SwitchView
-        android:id="@+id/switch_one"
+    <com.duckduckgo.common.ui.view.DaxSwitch
+        android:id="@+id/dax_switch_one"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/keyline_4"
         android:layout_marginEnd="@dimen/keyline_2"
         android:checked="false"
-        app:layout_constraintEnd_toStartOf="@+id/switch_two"
+        app:layout_constraintTop_toBottomOf="@+id/label"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/label"/>
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <com.duckduckgo.common.ui.view.DaxSwitch
+        android:id="@+id/dax_switch_two"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/keyline_2"
+        android:checked="true"
+        app:layout_constraintBottom_toBottomOf="@+id/dax_switch_one"
+        app:layout_constraintStart_toEndOf="@+id/dax_switch_one"
+        app:layout_constraintTop_toTopOf="@+id/dax_switch_one"/>
+
+    <com.duckduckgo.common.ui.view.DaxSwitch
+        android:id="@+id/dax_switch_three"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/keyline_2"
+        android:checked="false"
+        android:enabled="false"
+        app:layout_constraintBottom_toBottomOf="@+id/dax_switch_two"
+        app:layout_constraintStart_toEndOf="@+id/dax_switch_two"
+        app:layout_constraintTop_toTopOf="@+id/dax_switch_two"/>
 
-    <com.duckduckgo.common.ui.view.SwitchView
-        android:id="@+id/switch_two"
+    <com.duckduckgo.common.ui.view.DaxSwitch
+        android:id="@+id/dax_switch_four"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/keyline_2"
         android:checked="true"
-        app:layout_constraintBottom_toBottomOf="@+id/switch_one"
-        app:layout_constraintStart_toEndOf="@+id/switch_one"
-        app:layout_constraintTop_toTopOf="@+id/switch_one"/>
+        android:enabled="false"
+        app:layout_constraintBottom_toBottomOf="@+id/dax_switch_three"
+        app:layout_constraintStart_toEndOf="@+id/dax_switch_three"
+        app:layout_constraintTop_toTopOf="@+id/dax_switch_three"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/common/common-ui/src/main/res/layout/component_two_line_item.xml b/common/common-ui/src/main/res/layout/component_two_line_item.xml
index f7c38212372c..efc6dc6bc3c3 100644
--- a/common/common-ui/src/main/res/layout/component_two_line_item.xml
+++ b/common/common-ui/src/main/res/layout/component_two_line_item.xml
@@ -14,20 +14,20 @@
   ~ limitations under the License.
   -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
-                                                   android:layout_width="match_parent"
-                                                   android:layout_height="wrap_content"
-                                                   android:clipToPadding="false"
-                                                   android:paddingTop="@dimen/keyline_5"
-                                                   android:paddingBottom="@dimen/keyline_5">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clipToPadding="false"
+    android:paddingTop="@dimen/keyline_5"
+    android:paddingBottom="@dimen/keyline_5">
 
     <com.duckduckgo.common.ui.view.listitem.SectionHeaderListItem
         android:id="@+id/label"
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        app:primaryText="Two Line Items"
+        android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent"
+        app:primaryText="Two Line Items" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineListItemWithoutImage"
@@ -38,230 +38,286 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/label"
         app:primaryText="Two Line Item"
-        app:secondaryText="Without Image"/>
+        app:secondaryText="Without Image" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineListItemWithImage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:leadingIcon="@drawable/ic_globe_gray_16dp"
-        app:primaryText="Two Line Item"
-        app:secondaryText="With Leading Image"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithoutImage"/>
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithoutImage"
+        app:leadingIcon="@drawable/ic_globe_gray_16dp"
+        app:primaryText="Two Line Item"
+        app:secondaryText="With Leading Image" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineListItemWithSmallImageAndTrailingIcon"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithImage"
         app:leadingIcon="@drawable/ic_dax_icon"
         app:leadingIconSize="small"
         app:primaryText="Two Line Item"
         app:secondaryText="With Small Leading and Trailing Image"
-        app:trailingIcon="@drawable/ic_menu_vertical_24"
+        app:trailingIcon="@drawable/ic_menu_vertical_24" />
+
+    <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
+        android:id="@+id/twoLineListItemWithSmallImageAndTrailingIconAndBG"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithImage"/>
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithSmallImageAndTrailingIcon"
+        app:leadingIcon="@drawable/ic_dax_icon"
+        app:leadingIconBackground="circular"
+        app:leadingIconSize="small"
+        app:primaryText="Two Line Item"
+        app:secondaryText="With Small Leading with Background Trailing Image"
+        app:trailingIcon="@drawable/ic_menu_vertical_24" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineListItemWithMediumImageAndTrailingIcon"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithSmallImageAndTrailingIconAndBG"
         app:leadingIcon="@drawable/ic_dax_icon"
         app:leadingIconSize="medium"
         app:primaryText="Two Line Item"
         app:secondaryText="With Medium Leading and Trailing Image"
-        app:trailingIcon="@drawable/ic_menu_vertical_24"
+        app:trailingIcon="@drawable/ic_menu_vertical_24" />
+
+    <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
+        android:id="@+id/twoLineListItemWithMediumImageAndTrailingIconAndBG"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithSmallImageAndTrailingIcon"/>
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithMediumImageAndTrailingIcon"
+        app:leadingIcon="@drawable/ic_dax_icon"
+        app:leadingIconBackground="circular"
+        app:leadingIconSize="medium"
+        app:primaryText="Two Line Item"
+        app:secondaryText="With Medium Leading Background and Trailing Image"
+        app:trailingIcon="@drawable/ic_menu_vertical_24" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineListItemWithLargeImageAndTrailingIcon"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithMediumImageAndTrailingIconAndBG"
         app:leadingIcon="@drawable/ic_dax_icon"
         app:leadingIconSize="large"
         app:primaryText="Two Line Item"
         app:secondaryText="With Large Leading and Trailing Image"
-        app:trailingIcon="@drawable/ic_menu_vertical_24"
+        app:trailingIcon="@drawable/ic_menu_vertical_24" />
+
+    <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
+        android:id="@+id/twoLineListItemWithLargeImageAndTrailingIconAndBG"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithMediumImageAndTrailingIcon"/>
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithLargeImageAndTrailingIcon"
+        app:leadingIcon="@drawable/ic_dax_icon"
+        app:leadingIconBackground="circular"
+        app:leadingIconSize="large"
+        app:primaryText="Two Line Item"
+        app:secondaryText="With Large Leading Background and Trailing Image"
+        app:trailingIcon="@drawable/ic_menu_vertical_24" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineListItemWithExtraLargeImageAndTrailingIcon"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithLargeImageAndTrailingIconAndBG"
         app:leadingIcon="@drawable/ic_dax_icon"
         app:leadingIconSize="extra_large"
         app:primaryText="Two Line Item"
         app:secondaryText="With Extra Large Leading and Trailing Image"
-        app:trailingIcon="@drawable/ic_menu_vertical_24"
+        app:trailingIcon="@drawable/ic_menu_vertical_24" />
+
+    <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
+        android:id="@+id/twoLineListItemWithExtraLargeImageAndTrailingIconAndBG"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithLargeImageAndTrailingIcon"/>
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithExtraLargeImageAndTrailingIcon"
+        app:leadingIcon="@drawable/ic_dax_icon"
+        app:leadingIconBackground="circular"
+        app:leadingIconSize="extra_large"
+        app:primaryText="Two Line Item"
+        app:secondaryText="With Extra Large Leading and Trailing Image"
+        app:trailingIcon="@drawable/ic_menu_vertical_24" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineListItemWithTrailingIcon"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:primaryText="Two Line Item"
-        app:secondaryText="With Trailing Image"
-        app:trailingIcon="@drawable/ic_menu_vertical_24"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithExtraLargeImageAndTrailingIcon"/>
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithExtraLargeImageAndTrailingIconAndBG"
+        app:primaryText="Two Line Item"
+        app:secondaryText="With Trailing Image"
+        app:trailingIcon="@drawable/ic_menu_vertical_24" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineListItemWithBetaPill"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:primaryText="Two Line Item"
-        app:secondaryText="With Beta Pill"
-        app:showBetaPill="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithTrailingIcon"/>
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithTrailingIcon"
+        app:primaryText="Two Line Item"
+        app:secondaryText="With Beta Pill"
+        app:showBetaPill="true" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
-            android:id="@+id/twoLineListItemWithCircularImage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:leadingIcon="@drawable/ic_globe_gray_16dp"
-            app:leadingIconBackground="circular"
-            app:primaryText="Two Line Item"
-            app:secondaryText="With Leading Image over Circular Background"
-            app:trailingIcon="@drawable/ic_menu_vertical_24"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithBetaPill"/>
+        android:id="@+id/twoLineListItemWithCircularImage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithBetaPill"
+        app:leadingIcon="@drawable/ic_globe_gray_16dp"
+        app:leadingIconBackground="circular"
+        app:primaryText="Two Line Item"
+        app:secondaryText="With Leading Image over Circular Background"
+        app:trailingIcon="@drawable/ic_menu_vertical_24" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
-            android:id="@+id/twoLineListItemWitRoundImage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:leadingIcon="@drawable/ic_globe_gray_16dp"
-            app:leadingIconBackground="rounded"
-            app:primaryText="Two Line Item"
-            app:secondaryText="With Leading Image over Rounded Background"
-            app:trailingIcon="@drawable/ic_menu_vertical_24"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithCircularImage"/>
+        android:id="@+id/twoLineListItemWitRoundImage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWithCircularImage"
+        app:leadingIcon="@drawable/ic_globe_gray_16dp"
+        app:leadingIconBackground="rounded"
+        app:primaryText="Two Line Item"
+        app:secondaryText="With Leading Image over Rounded Background"
+        app:trailingIcon="@drawable/ic_menu_vertical_24" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineSwitchListItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:primaryText="Two Line Item"
-        app:secondaryText="With Switch"
-        app:showSwitch="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWitRoundImage"/>
+        app:layout_constraintTop_toBottomOf="@id/twoLineListItemWitRoundImage"
+        app:primaryText="Two Line Item"
+        app:secondaryText="With Switch"
+        app:showSwitch="true" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineSwitchListItemWithImage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:primaryText="Two Line Item"
-        app:secondaryText="With Leading Image and Switch"
-        app:leadingIcon="@drawable/ic_globe_gray_16dp"
-        app:showSwitch="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItem"/>
+        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItem"
+        app:leadingIcon="@drawable/ic_globe_gray_16dp"
+        app:primaryText="Two Line Item"
+        app:secondaryText="With Leading Image and Switch"
+        app:showSwitch="true" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineSwitchListItemWithPill"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithImage"
         app:primaryText="Two Line Item"
         app:secondaryText="With Beta Pill and Switch"
         app:showBetaPill="true"
-        app:showSwitch="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithImage"/>
+        app:showSwitch="true" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineSwitchListItemWithTruncatedText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithPill"
+        app:leadingIcon="@drawable/ic_globe_gray_16dp"
         app:primaryText="Two Line Item Two Line Item Two Line Item Two Line Item "
+        app:primaryTextTruncated="true"
         app:secondaryText="In disabled state"
-        app:leadingIcon="@drawable/ic_globe_gray_16dp"
         app:showBetaPill="true"
-        app:showSwitch="true"
-        app:primaryTextTruncated="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithPill"/>
+        app:showSwitch="true" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineSwitchListItemWithDisabledSwitch"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithTruncatedText"
+        app:leadingIcon="@drawable/ic_globe_gray_16dp"
         app:primaryText="Two Line Item Two Line Item Two Line Item Two Line Item "
         app:secondaryText="In disabled state"
-        app:leadingIcon="@drawable/ic_globe_gray_16dp"
         app:showBetaPill="true"
-        app:showSwitch="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithTruncatedText"/>
+        app:showSwitch="true" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineSwitchListItemWithDisabledSwitchEnabled"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithDisabledSwitch"
+        app:leadingIcon="@drawable/ic_globe_gray_16dp"
         app:primaryText="Two Line Item Two"
         app:secondaryText="Checked in disabled state"
-        app:leadingIcon="@drawable/ic_globe_gray_16dp"
         app:showBetaPill="true"
-        app:showSwitch="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithDisabledSwitch"/>
+        app:showSwitch="true" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
         android:id="@+id/twoLineSwitchListItemWithSwitchDisabledChecked"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithDisabledSwitchEnabled"
+        app:leadingIcon="@drawable/ic_globe_gray_16dp"
         app:primaryText="Two Line Item Two"
         app:secondaryText="Checked with switch in disabled state"
-        app:leadingIcon="@drawable/ic_globe_gray_16dp"
         app:showBetaPill="true"
         app:showSwitch="true"
-        app:switchEnabled="false"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithDisabledSwitchEnabled"/>
+        app:switchEnabled="false" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
-            android:id="@+id/twoLineSwitchListItemWithPrimaryTextColorOverlay"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:primaryText="Two Line Item"
-            app:secondaryText="With custom Primary Text color"
-            app:leadingIcon="@drawable/ic_globe_gray_16dp"
-            app:primaryTextColorOverlay="@color/destructive_text_color_selector"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithSwitchDisabledChecked"/>
+        android:id="@+id/twoLineSwitchListItemWithPrimaryTextColorOverlay"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithSwitchDisabledChecked"
+        app:leadingIcon="@drawable/ic_globe_gray_16dp"
+        app:primaryText="Two Line Item"
+        app:primaryTextColorOverlay="@color/destructive_text_color_selector"
+        app:secondaryText="With custom Primary Text color" />
 
     <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
-            android:id="@+id/twoLineSwitchListItemWithSecondaryTextColorOverlay"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:primaryText="Two Line Item"
-            app:secondaryText="With custom Secondary Text color"
-            app:leadingIcon="@drawable/ic_globe_gray_16dp"
-            app:secondaryTextColorOverlay="@color/destructive_text_color_selector"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithPrimaryTextColorOverlay"/>
+        android:id="@+id/twoLineSwitchListItemWithSecondaryTextColorOverlay"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/twoLineSwitchListItemWithPrimaryTextColorOverlay"
+        app:leadingIcon="@drawable/ic_globe_gray_16dp"
+        app:primaryText="Two Line Item"
+        app:secondaryText="With custom Secondary Text color"
+        app:secondaryTextColorOverlay="@color/destructive_text_color_selector" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_bookmark_two_line_item.xml b/common/common-ui/src/main/res/layout/view_bookmark_two_line_item.xml
similarity index 98%
rename from app/src/main/res/layout/view_bookmark_two_line_item.xml
rename to common/common-ui/src/main/res/layout/view_bookmark_two_line_item.xml
index 3eea203e5808..bacd9488c62d 100644
--- a/app/src/main/res/layout/view_bookmark_two_line_item.xml
+++ b/common/common-ui/src/main/res/layout/view_bookmark_two_line_item.xml
@@ -56,7 +56,7 @@
         app:layout_constraintStart_toEndOf="@+id/leadingIconBackground"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintWidth_default="wrap"
-        app:typography="h4"
+        app:typography="body1"
         tools:text="Primary Text" />
 
     <ImageView
@@ -91,7 +91,7 @@
         app:barrierDirection="start"
         app:constraint_referenced_ids="trailingSwitch,trailingIconContainer" />
 
-    <com.duckduckgo.common.ui.view.SwitchView
+    <com.duckduckgo.common.ui.view.DaxSwitch
         android:id="@+id/trailingSwitch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/common/common-ui/src/main/res/layout/view_check_list_item.xml b/common/common-ui/src/main/res/layout/view_check_list_item.xml
index 583c3c4e6d3a..c60a8d2ef20f 100644
--- a/common/common-ui/src/main/res/layout/view_check_list_item.xml
+++ b/common/common-ui/src/main/res/layout/view_check_list_item.xml
@@ -31,8 +31,6 @@
         android:id="@+id/leadingIcon"
         android:layout_width="@dimen/keyline_4"
         android:layout_height="@dimen/keyline_4"
-        android:layout_marginStart="@dimen/keyline_3"
-        android:layout_marginEnd="@dimen/keyline_3"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/primaryText"
@@ -54,7 +52,7 @@
         app:layout_constraintStart_toEndOf="@id/leadingIcon"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintWidth_default="wrap"
-        app:typography="h4"
+        app:typography="body1"
         tools:text="Primary Text" />
 
     <ImageView
diff --git a/common/common-ui/src/main/res/layout/view_one_line_list_item.xml b/common/common-ui/src/main/res/layout/view_one_line_list_item.xml
index 10c87b2b9bd4..a74f199ba9d5 100644
--- a/common/common-ui/src/main/res/layout/view_one_line_list_item.xml
+++ b/common/common-ui/src/main/res/layout/view_one_line_list_item.xml
@@ -20,8 +20,6 @@
     android:id="@+id/item_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/oneLineItemVerticalPadding"
-    android:paddingBottom="@dimen/oneLineItemVerticalPadding"
     android:background="?attr/selectableItemBackground"
     android:minHeight="@dimen/oneLineItemHeight">
 
@@ -54,7 +52,7 @@
         app:layout_constraintEnd_toStartOf="@+id/trailingBarrier"
         app:layout_constraintStart_toEndOf="@id/leadingIconBackground"
         app:layout_constraintTop_toTopOf="parent"
-        app:typography="h4"
+        app:typography="body1"
         tools:ignore="InvalidColorAttribute"
         tools:text="Title" />
 
@@ -65,12 +63,12 @@
         app:barrierDirection="start"
         app:constraint_referenced_ids="trailingSwitch,trailingIconContainer,endTrailingPadding" />
 
-    <com.duckduckgo.common.ui.view.SwitchView
+    <com.duckduckgo.common.ui.view.DaxSwitch
         android:id="@+id/trailingSwitch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/keyline_1"
-        android:layout_marginEnd="@dimen/keyline_2"
+        android:layout_marginEnd="@dimen/keyline_4"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/trailingBarrier"
@@ -99,7 +97,7 @@
         android:id="@+id/endTrailingPadding"
         android:layout_width="@dimen/keyline_0"
         android:layout_height="0dp"
-        android:layout_marginEnd="@dimen/keyline_3"
+        android:layout_marginEnd="@dimen/keyline_4"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/common/common-ui/src/main/res/layout/view_two_line_item.xml b/common/common-ui/src/main/res/layout/view_two_line_item.xml
index d536573c64a2..e07f958fc4e0 100644
--- a/common/common-ui/src/main/res/layout/view_two_line_item.xml
+++ b/common/common-ui/src/main/res/layout/view_two_line_item.xml
@@ -56,7 +56,7 @@
         app:layout_constraintStart_toEndOf="@+id/leadingIconBackground"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintWidth_default="wrap"
-        app:typography="h4"
+        app:typography="body1"
         tools:text="Primary Text" />
 
     <ImageView
@@ -91,12 +91,12 @@
         app:barrierDirection="start"
         app:constraint_referenced_ids="trailingSwitch,trailingIconContainer" />
 
-    <com.duckduckgo.common.ui.view.SwitchView
+    <com.duckduckgo.common.ui.view.DaxSwitch
         android:id="@+id/trailingSwitch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/keyline_1"
-        android:layout_marginEnd="@dimen/keyline_2"
+        android:layout_marginEnd="@dimen/keyline_4"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/common/common-ui/src/main/res/values/design-system-attrs.xml b/common/common-ui/src/main/res/values/design-system-attrs.xml
index b45439b8f713..d6129aea5a40 100644
--- a/common/common-ui/src/main/res/values/design-system-attrs.xml
+++ b/common/common-ui/src/main/res/values/design-system-attrs.xml
@@ -17,5 +17,5 @@
 <resources>
 
     <attr name="cardViewStyle" format="reference"/>
-
+    <attr name="daxSwitchStyle" format="reference"/>
 </resources>
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 71982d23ccbd..907b275e2a7f 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
@@ -82,8 +82,12 @@
 
     <attr name="daxColorSwitchTrackOn" format="color"/>
     <attr name="daxColorSwitchTrackOff" format="color"/>
+    <attr name="daxColorSwitchTrackDisabledOn" format="color"/>
+    <attr name="daxColorSwitchTrackDisabledOff" format="color"/>
     <attr name="daxColorSwitchThumbOn" format="color"/>
     <attr name="daxColorSwitchThumbOff" format="color"/>
+    <attr name="daxColorSwitchThumbDisabledOn" format="color"/>
+    <attr name="daxColorSwitchThumbDisabledOff" format="color"/>
 
     <attr name="daxColorSliderTrackInactive" format="color"/>
     <attr name="daxColorSliderActive" format="color"/>
@@ -133,6 +137,7 @@
     <color name="gray40">#CCCCCC</color>
     <color name="gray40_40">#66CCCCCC</color>
     <color name="gray40_50">#80CCCCCC</color>
+    <color name="gray36">#5C000000</color>
     <color name="gray30">#DDDDDD</color>
     <color name="gray25">#E5E5E5</color>
     <color name="gray20">#EEEEEE</color>
diff --git a/common/common-ui/src/main/res/values/design-system-dimensions.xml b/common/common-ui/src/main/res/values/design-system-dimensions.xml
index 9f466ff024f2..3755fab724f6 100644
--- a/common/common-ui/src/main/res/values/design-system-dimensions.xml
+++ b/common/common-ui/src/main/res/values/design-system-dimensions.xml
@@ -60,8 +60,8 @@
     <dimen name="oneLineItemVerticalPadding">8dp</dimen>
     <dimen name="twoLineItemHeight">56dp</dimen>
     <dimen name="twoLineItemWithLargeImageHeight">64dp</dimen>
-    <dimen name="twoLineItemVerticalPadding">12dp</dimen>
-    <dimen name="twoLineItemVerticalBigPadding">14dp</dimen>
+    <dimen name="twoLineItemVerticalPadding">8dp</dimen>
+    <dimen name="twoLineItemVerticalBigPadding">10dp</dimen>
     <dimen name="sectionHeaderListItemImageSize">24dp</dimen>
     <dimen name="sectionHeaderListItemHeight">44dp</dimen>
     <dimen name="sectionHeaderListItemImagePadding">10dp</dimen>
@@ -88,8 +88,8 @@
     <!-- Dividers -->
     <dimen name="horizontalDividerHeight">1dp</dimen>
     <dimen name="horizontalDividerSidePadding">@dimen/keyline_4</dimen>
-    <dimen name="horizontalDividerTopPadding">@dimen/keyline_4</dimen>
-    <dimen name="horizontalDividerBottomPadding">@dimen/keyline_4</dimen>
+    <dimen name="horizontalDividerTopPadding">@dimen/keyline_2</dimen>
+    <dimen name="horizontalDividerBottomPadding">@dimen/keyline_2</dimen>
     <dimen name="verticalDividerWidth">1dp</dimen>
     <dimen name="verticalDividerSidePadding">@dimen/keyline_4</dimen>
 
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 d4b1429420c3..0c27e33ea903 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
@@ -54,7 +54,7 @@
         <item name="tabStyle">@style/Widget.DuckDuckGo.TabLayout</item>
         <item name="radioButtonStyle">@style/Widget.DuckDuckGo.RadioButton</item>
         <item name="sliderStyle">@style/Widget.DuckDuckGo.Slider</item>
-        <item name="switchStyle">@style/Widget.DuckDuckGo.Switch</item>
+        <item name="switchStyle">@style/Widget.DuckDuckGo.v3.Switch</item>
         <item name="snackbarStyle">@style/Widget.DuckDuckGo.Snackbar</item>
         <item name="snackbarButtonStyle">@style/Widget.DuckDuckGo.SnackbarButton</item>
         <item name="snackbarTextViewStyle">@style/Widget.DuckDuckGo.SnackbarText</item>
@@ -80,6 +80,7 @@
         <item name="twoLineListItemStyle">@style/Widget.DuckDuckGo.TwoLineListItem</item>
 
         <item name="cardViewStyle">@style/Widget.DuckDuckGo.CardView</item>
+        <item name="daxSwitchStyle">@style/Widget.DuckDuckGo.v3.Switch</item>
 
         <item name="daxExpandableMenuItemStyle">@style/Widget.DuckDuckGo.DaxExpandableItem</item>
 
@@ -180,9 +181,13 @@
 
         <!-- Switch -->
         <item name="daxColorSwitchTrackOn">?attr/daxColorAccentBlue</item>
-        <item name="daxColorSwitchTrackOff">@color/gray40</item>
-        <item name="daxColorSwitchThumbOn">?attr/daxColorAccentBlue</item>
-        <item name="daxColorSwitchThumbOff">@color/gray40</item>
+        <item name="daxColorSwitchTrackOff">@color/gray60_50</item>
+        <item name="daxColorSwitchTrackDisabledOn">@color/gray30</item>
+        <item name="daxColorSwitchTrackDisabledOff">@color/gray30</item>
+        <item name="daxColorSwitchThumbOn">?attr/daxColorWhite</item>
+        <item name="daxColorSwitchThumbOff">?attr/daxColorWhite</item>
+        <item name="daxColorSwitchThumbDisabledOn">@color/white48</item>
+        <item name="daxColorSwitchThumbDisabledOff">@color/white48</item>
 
         <!-- Slider -->
         <item name="daxColorSliderTrackInactive">@color/gray40_50</item>
@@ -253,9 +258,13 @@
 
         <!-- Switch -->
         <item name="daxColorSwitchTrackOn">?attr/daxColorAccentBlue</item>
-        <item name="daxColorSwitchTrackOff">@color/gray60</item>
-        <item name="daxColorSwitchThumbOn">?attr/daxColorAccentBlue</item>
-        <item name="daxColorSwitchThumbOff">@color/white</item>
+        <item name="daxColorSwitchTrackOff">@color/gray60_50</item>
+        <item name="daxColorSwitchTrackDisabledOn">@color/gray36</item>
+        <item name="daxColorSwitchTrackDisabledOff">@color/gray36</item>
+        <item name="daxColorSwitchThumbOn">?attr/daxColorWhite</item>
+        <item name="daxColorSwitchThumbOff">?attr/daxColorWhite</item>
+        <item name="daxColorSwitchThumbDisabledOn">?attr/daxColorWhite</item>
+        <item name="daxColorSwitchThumbDisabledOff">?attr/daxColorWhite</item>
 
         <!-- Slider -->
         <item name="daxColorSliderTrackInactive">@color/gray60_50</item>
diff --git a/common/common-ui/src/main/res/values/widgets.xml b/common/common-ui/src/main/res/values/widgets.xml
index cbb19c4aaaf5..e9ef0969d0d7 100644
--- a/common/common-ui/src/main/res/values/widgets.xml
+++ b/common/common-ui/src/main/res/values/widgets.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<resources>
+<resources tools:ignore="InvalidColorAttribute" xmlns:tools="http://schemas.android.com/tools">
 
     <style name="Widget"/>
     <style name="ThemeOverlay"/>
@@ -374,13 +374,10 @@
     </style>
 
     <!-- Switches -->
-    <style name="Widget.DuckDuckGo.Switch" parent="Widget.MaterialComponents.CompoundButton.Switch">
-        <item name="materialThemeOverlay">@style/ThemeOverlay.DuckDuckGo.Switch</item>
-    </style>
-
-    <style name="ThemeOverlay.DuckDuckGo.Switch" >
+    <style name="Widget.DuckDuckGo.v3.Switch" parent="Widget.Material3.CompoundButton.MaterialSwitch">
         <item name="trackTint">@color/switch_track_tint</item>
         <item name="thumbTint">@color/switch_thumb_tint</item>
+        <item name="android:thumb">@drawable/switch_thumb</item>
     </style>
 
     <!-- Slider -->
diff --git a/lint-rules/src/main/java/com/duckduckgo/lint/ui/DesignSystemLintExtensions.kt b/lint-rules/src/main/java/com/duckduckgo/lint/ui/DesignSystemLintExtensions.kt
index 31bc075e40d9..7dfaec05ebe1 100644
--- a/lint-rules/src/main/java/com/duckduckgo/lint/ui/DesignSystemLintExtensions.kt
+++ b/lint-rules/src/main/java/com/duckduckgo/lint/ui/DesignSystemLintExtensions.kt
@@ -68,7 +68,7 @@ class DesignSystemLintExtensions {
         private const val BUTTON_GHOST_SMALL = "com.duckduckgo.mobile.android.ui.view.button.ButtonGhostSmall"
         private const val ONE_LINE_LIST_ITEM = "com.duckduckgo.mobile.android.ui.view.listitem.OneLineListItem"
         private const val TWO_LINE_LIST_ITEM = "com.duckduckgo.mobile.android.ui.view.listitem.TwoLineListItem"
-        private const val SWITCH_VIEW = "com.duckduckgo.mobile.android.ui.view.SwitchView"
+        private const val SWITCH_VIEW = "com.duckduckgo.mobile.android.ui.view.DaxSwitch"
         private const val DAX_TEXT = "com.duckduckgo.mobile.android.ui.view.text.DaxTextView"
 
         val ANDROID_DESIGN_COMPONENTS =
diff --git a/lint-rules/src/test/java/com/duckduckgo/lint/ui/NoStyleAppliedToDesignSystemComponentDetectorTest.kt b/lint-rules/src/test/java/com/duckduckgo/lint/ui/NoStyleAppliedToDesignSystemComponentDetectorTest.kt
index 1f658c13ffcf..dca1c20bbe9f 100644
--- a/lint-rules/src/test/java/com/duckduckgo/lint/ui/NoStyleAppliedToDesignSystemComponentDetectorTest.kt
+++ b/lint-rules/src/test/java/com/duckduckgo/lint/ui/NoStyleAppliedToDesignSystemComponentDetectorTest.kt
@@ -132,7 +132,7 @@ style="@style/Widget.DuckDuckGo.Button.Primary"
                       android:layout_gravity="bottom"
                       app:navigationIcon="@drawable/ic_menu_black_24dp"/>
 
-                  <com.duckduckgo.mobile.android.ui.view.SwitchView
+                  <com.duckduckgo.mobile.android.ui.view.DaxSwitch
                       android:id="@+id/fab"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
@@ -148,7 +148,7 @@ style="@style/Widget.DuckDuckGo.Button.Primary"
             .expect(
                 """
                 res/layout/buttons.xml:17: Error: Design System Components should not be styled. Consider creating a new Component or use one of the Components already created [StyleInDesignSystemComponent]
-                  <com.duckduckgo.mobile.android.ui.view.SwitchView
+                  <com.duckduckgo.mobile.android.ui.view.DaxSwitch
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                 1 errors, 0 warnings
             """.trimMargin()
diff --git a/network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/management/VpnToggle.kt b/network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/management/VpnToggle.kt
index f12d06deea88..cb4f19934640 100644
--- a/network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/management/VpnToggle.kt
+++ b/network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/management/VpnToggle.kt
@@ -22,7 +22,7 @@ import android.view.View
 import android.widget.CompoundButton.OnCheckedChangeListener
 import android.widget.ImageView
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.duckduckgo.common.ui.view.SwitchView
+import com.duckduckgo.common.ui.view.DaxSwitch
 import com.duckduckgo.common.ui.view.quietlySetIsChecked
 import com.duckduckgo.common.ui.view.recursiveEnable
 import com.duckduckgo.common.ui.view.setEnabledOpacity
@@ -43,7 +43,7 @@ class VpnToggle @JvmOverloads constructor(
         get() = binding.primaryText
     val secondaryText: DaxTextView
         get() = binding.secondaryText
-    val trailingSwitch: SwitchView
+    val trailingSwitch: DaxSwitch
         get() = binding.trailingSwitch
     val indicator: ImageView
         get() = binding.indicator
diff --git a/network-protection/network-protection-impl/src/main/res/layout/view_location.xml b/network-protection/network-protection-impl/src/main/res/layout/view_location.xml
index 09396a4c56d3..de21e03b21e3 100644
--- a/network-protection/network-protection-impl/src/main/res/layout/view_location.xml
+++ b/network-protection/network-protection-impl/src/main/res/layout/view_location.xml
@@ -52,7 +52,7 @@
         android:layout_marginEnd="@dimen/keyline_1"
         app:primaryText="@string/netpManagementLocationPlaceholder"
         app:textType="primary"
-        app:typography="h4" />
+        app:typography="body1" />
 
     <com.duckduckgo.common.ui.view.text.DaxTextView
         android:id="@+id/location_view_status"
diff --git a/network-protection/network-protection-impl/src/main/res/layout/view_radio_list_item.xml b/network-protection/network-protection-impl/src/main/res/layout/view_radio_list_item.xml
index 899e2e00d7e3..24b9f26e56b3 100644
--- a/network-protection/network-protection-impl/src/main/res/layout/view_radio_list_item.xml
+++ b/network-protection/network-protection-impl/src/main/res/layout/view_radio_list_item.xml
@@ -67,7 +67,7 @@
         app:layout_constraintEnd_toStartOf="@+id/trailingBarrier"
         app:layout_constraintStart_toEndOf="@id/leadingIconBackground"
         app:layout_constraintTop_toTopOf="parent"
-        app:typography="h4"
+        app:typography="body1"
         tools:ignore="InvalidColorAttribute"
         tools:text="Title" />
 
diff --git a/network-protection/network-protection-impl/src/main/res/layout/view_vpn_toggle.xml b/network-protection/network-protection-impl/src/main/res/layout/view_vpn_toggle.xml
index 6a704cee3822..9eee2c746ebb 100644
--- a/network-protection/network-protection-impl/src/main/res/layout/view_vpn_toggle.xml
+++ b/network-protection/network-protection-impl/src/main/res/layout/view_vpn_toggle.xml
@@ -37,7 +37,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintWidth_default="wrap"
-        app:typography="h4" />
+        app:typography="body1" />
 
     <ImageView
         android:id="@+id/indicator"
@@ -63,7 +63,7 @@
         app:typography="body2"
         tools:text="Secondary Text" />
 
-    <com.duckduckgo.common.ui.view.SwitchView
+    <com.duckduckgo.common.ui.view.DaxSwitch
         android:id="@+id/trailingSwitch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/subscriptions/subscriptions-impl/src/main/res/layout/view_settings.xml b/subscriptions/subscriptions-impl/src/main/res/layout/view_settings.xml
index a1dddda3cbe2..3759e11c4036 100644
--- a/subscriptions/subscriptions-impl/src/main/res/layout/view_settings.xml
+++ b/subscriptions/subscriptions-impl/src/main/res/layout/view_settings.xml
@@ -42,7 +42,7 @@
             android:id="@+id/subscribeSecondary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="72dp"
+            android:layout_marginStart="48dp"
             app:textType="secondary"
             app:typography="body2" />
 
@@ -50,7 +50,7 @@
             android:id="@+id/subscriptionGet"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="72dp"
+            android:layout_marginStart="48dp"
             android:layout_marginTop="@dimen/keyline_3"
             android:layout_marginBottom="@dimen/keyline_3"
             app:textType="primary"