diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabGridItemDecorator.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabGridItemDecorator.kt
index e74835bf3fa0..de795d8cd5f6 100644
--- a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabGridItemDecorator.kt
+++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabGridItemDecorator.kt
@@ -38,7 +38,7 @@ class TabGridItemDecorator(
         strokeWidth = BORDER_WIDTH
 
         val typedValue = TypedValue()
-        context.theme.resolveAttribute(CommonR.attr.normalTextColor, typedValue, true)
+        context.theme.resolveAttribute(CommonR.attr.daxColorBackgroundInverted, typedValue, true)
         color = ContextCompat.getColor(context, typedValue.resourceId)
     }
 
diff --git a/app/src/main/res/drawable/ic_close_tab.xml b/app/src/main/res/drawable/ic_close_tab.xml
deleted file mode 100644
index bf399cb16b21..000000000000
--- a/app/src/main/res/drawable/ic_close_tab.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-  ~ Copyright (c) 2019 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,10.727l3.677,-3.677a0.9,0.9 0,1 1,1.273 1.273L13.273,12l3.677,3.677a0.9,0.9 0,1 1,-1.273 1.273L12,13.273 8.323,16.95a0.9,0.9 0,1 1,-1.273 -1.273L10.727,12 7.05,8.323A0.9,0.9 0,1 1,8.323 7.05L12,10.727z"
-      android:fillColor="#AAA"
-      android:fillType="nonZero"/>
-</vector>
diff --git a/app/src/main/res/layout/activity_tab_switcher.xml b/app/src/main/res/layout/activity_tab_switcher.xml
index 60443b4725fa..70e483662624 100644
--- a/app/src/main/res/layout/activity_tab_switcher.xml
+++ b/app/src/main/res/layout/activity_tab_switcher.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorPrimaryDark"
+    android:background="?attr/daxColorBackground"
     tools:context="com.duckduckgo.app.tabs.ui.TabSwitcherActivity">
 
     <include layout="@layout/include_default_toolbar" />
diff --git a/app/src/main/res/layout/item_tab.xml b/app/src/main/res/layout/item_tab.xml
index e61cfcb180f3..780425e02e63 100644
--- a/app/src/main/res/layout/item_tab.xml
+++ b/app/src/main/res/layout/item_tab.xml
@@ -21,10 +21,7 @@
     android:layout_marginStart="7dp"
     android:layout_marginTop="6dp"
     android:layout_marginEnd="7dp"
-    android:layout_marginBottom="10dp"
-    app:cardElevation="4dp"
-    app:cardBackgroundColor="?toolbarBgColor"
-    app:cardCornerRadius="6dp">
+    android:layout_marginBottom="10dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cardContentsContainer"
@@ -67,24 +64,20 @@
             android:background="?selectableItemBackground"
             android:contentDescription="@string/closeContentDescription"
             android:scaleType="center"
-            android:src="@drawable/ic_close_tab"
-            android:tint="?normalTextColor"
+            android:src="@drawable/ic_close_24"
             app:layout_constraintBottom_toBottomOf="@id/favicon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/favicon" />
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/title"
+            app:typography="h5"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:fontFamily="sans-serif-medium"
             android:ellipsize="end"
             android:lines="1"
-            android:textColor="?attr/tabTitleTextColor"
             android:textIsSelectable="false"
-            android:textSize="13sp"
-            android:textStyle="normal"
             app:layout_constraintBottom_toBottomOf="@id/favicon"
             app:layout_constraintEnd_toStartOf="@id/close"
             app:layout_constraintStart_toEndOf="@id/favicon"
diff --git a/common-ui/src/main/res/drawable/ic_baseline_close_24.xml b/common-ui/src/main/res/drawable/ic_baseline_close_24.xml
deleted file mode 100644
index 132281e9e89b..000000000000
--- a/common-ui/src/main/res/drawable/ic_baseline_close_24.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (c) 2021 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector android:height="24dp" android:tint="#222222"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
diff --git a/common-ui/src/main/res/values/attrs.xml b/common-ui/src/main/res/values/attrs.xml
index ab634c7edc31..b19e95c8442c 100644
--- a/common-ui/src/main/res/values/attrs.xml
+++ b/common-ui/src/main/res/values/attrs.xml
@@ -29,9 +29,6 @@
     <attr name="omnibarLogoLetterTextColor" format="color" />
     <attr name="autoCompleteTextColor" format="color" />
     <attr name="autoCompleteSubtitleTextColor" format="color" />
-    <attr name="tabTitleTextColor" format="color" />
-    <attr name="tabTitleTextColorLegacy" format="color" />
-    <attr name="tabSubtitleTextColor" format="color" />
     <attr name="tabSelectedBorderColor" format="color" />
     <attr name="tabsFireTextColor" format="color" />
     <attr name="tabCardBackgroundColor" format="color" />
diff --git a/common-ui/src/main/res/values/design-system-theming.xml b/common-ui/src/main/res/values/design-system-theming.xml
index a296b7e8f0c1..31ff9b7be8f6 100644
--- a/common-ui/src/main/res/values/design-system-theming.xml
+++ b/common-ui/src/main/res/values/design-system-theming.xml
@@ -173,9 +173,6 @@
         <item name="omnibarLogoLetterTextColor">@color/midGray</item>
         <item name="autoCompleteTextColor">@color/white</item>
         <item name="autoCompleteSubtitleTextColor">@color/grayish</item>
-        <item name="tabTitleTextColor">@color/white</item>
-        <item name="tabTitleTextColorLegacy">@color/midnight</item>
-        <item name="tabSubtitleTextColor">@color/coolGray</item>
         <item name="tabSelectedBorderColor">@color/skyBlue</item>
         <item name="tabsFireTextColor">@color/white</item>
         <item name="tabCardBackgroundColor">@color/almostBlack</item>
@@ -316,9 +313,6 @@
         <item name="omnibarLogoLetterTextColor">@color/whiteFour</item>
         <item name="autoCompleteTextColor">@color/almostBlackDark</item>
         <item name="autoCompleteSubtitleTextColor">@color/warmerGray</item>
-        <item name="tabTitleTextColor">@color/almostBlackDark</item>
-        <item name="tabTitleTextColorLegacy">@color/almostBlackDark</item>
-        <item name="tabSubtitleTextColor">@color/warmerGray</item>
         <item name="tabSelectedBorderColor">@color/cornflowerBlue</item>
         <item name="tabsFireTextColor">@color/warmerGray</item>
         <item name="tabCardBackgroundColor">@color/white</item>