diff --git a/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/text/DaxTextView.kt b/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/text/DaxTextView.kt
index 3d30afc4d1ed..6fc88a23ef77 100644
--- a/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/text/DaxTextView.kt
+++ b/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/text/DaxTextView.kt
@@ -88,9 +88,13 @@ constructor(
         H4,
         H5,
         Body1,
+        Body1Bold,
         Body2,
+        Body2Bold,
         Button,
         Caption,
+        CaptionAllCaps,
+
         ;
 
         companion object {
@@ -104,9 +108,12 @@ constructor(
                     4 -> H4
                     5 -> H5
                     6 -> Body1
-                    7 -> Body2
-                    8 -> Button
-                    9 -> Caption
+                    7 -> Body1Bold
+                    8 -> Body2
+                    9 -> Body2Bold
+                    10 -> Button
+                    11 -> Caption
+                    12 -> CaptionAllCaps
                     else -> Body1
                 }
             }
@@ -120,9 +127,12 @@ constructor(
                     H4 -> R.style.Typography_DuckDuckGo_H4
                     H5 -> R.style.Typography_DuckDuckGo_H5
                     Body1 -> R.style.Typography_DuckDuckGo_Body1
+                    Body1Bold -> R.style.Typography_DuckDuckGo_Body1_Bold
                     Body2 -> R.style.Typography_DuckDuckGo_Body2
+                    Body2Bold -> R.style.Typography_DuckDuckGo_Body2_Bold
                     Button -> R.style.Typography_DuckDuckGo_Button
                     Caption -> R.style.Typography_DuckDuckGo_Caption
+                    CaptionAllCaps -> R.style.Typography_DuckDuckGo_Caption_AllCaps
                 }
             }
         }
diff --git a/common-ui/src/main/res/layout/fragment_components_typography.xml b/common-ui/src/main/res/layout/fragment_components_typography.xml
index 60d93ac4b0e3..ff5479766d33 100644
--- a/common-ui/src/main/res/layout/fragment_components_typography.xml
+++ b/common-ui/src/main/res/layout/fragment_components_typography.xml
@@ -45,6 +45,16 @@
             android:text="Text Appearance Title"
             tools:ignore="HardcodedText"/>
 
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginBottom="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            app:typography="title"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit."
+            tools:ignore="HardcodedText"/>
+
         <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -55,6 +65,16 @@
             android:text="Text Appearance H1"
             tools:ignore="HardcodedText"/>
 
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginBottom="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            app:typography="h1"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:ignore="HardcodedText"/>
+
         <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -65,6 +85,16 @@
             android:text="Text Appearance H2"
             tools:ignore="HardcodedText"/>
 
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginBottom="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            app:typography="h2"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:ignore="HardcodedText"/>
+
         <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -75,6 +105,16 @@
             android:text="Text Appearance H3"
             tools:ignore="HardcodedText"/>
 
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            android:layout_marginBottom="@dimen/keyline_2"
+            app:typography="h3"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:ignore="HardcodedText"/>
+
         <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -85,6 +125,16 @@
             android:text="Text Appearance H4"
             tools:ignore="HardcodedText"/>
 
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            android:layout_marginBottom="@dimen/keyline_2"
+            app:typography="h4"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:ignore="HardcodedText"/>
+
         <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -95,6 +145,16 @@
             android:text="Text Appearance H5"
             tools:ignore="HardcodedText"/>
 
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginBottom="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            app:typography="h5"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:ignore="HardcodedText"/>
+
         <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -105,6 +165,36 @@
             android:text="Text Appearance Body1"
             tools:ignore="HardcodedText"/>
 
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            android:layout_marginBottom="@dimen/keyline_2"
+            app:typography="body1"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:ignore="HardcodedText"/>
+
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            android:layout_marginBottom="@dimen/keyline_2"
+            app:typography="body1_bold"
+            android:text="Text Appearance Body1 Bold"
+            tools:ignore="HardcodedText"/>
+
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            android:layout_marginBottom="@dimen/keyline_2"
+            app:typography="body1_bold"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:ignore="HardcodedText"/>
+
         <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -121,10 +211,50 @@
             android:layout_marginTop="@dimen/keyline_2"
             android:layout_marginBottom="@dimen/keyline_2"
             android:paddingStart="@dimen/keyline_3"
+            app:typography="body2"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:ignore="HardcodedText"/>
+
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            android:layout_marginBottom="@dimen/keyline_2"
+            app:typography="body2_bold"
+            android:text="Text Appearance Body2 Bold"
+            tools:ignore="HardcodedText"/>
+
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginBottom="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            app:typography="body2_bold"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:ignore="HardcodedText"/>
+
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            android:layout_marginBottom="@dimen/keyline_2"
             app:typography="button"
             android:text="Text Appearance Button"
             tools:ignore="HardcodedText"/>
 
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginBottom="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            app:typography="button"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:ignore="HardcodedText"/>
+
         <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -135,6 +265,36 @@
             android:text="Text Appearance Caption"
             tools:ignore="HardcodedText"/>
 
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginBottom="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            app:typography="caption"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:ignore="HardcodedText"/>
+
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            android:layout_marginBottom="@dimen/keyline_2"
+            app:typography="caption_allCaps"
+            android:text="Text Appearance Caption All Caps"
+            tools:ignore="HardcodedText"/>
+
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_2"
+            android:layout_marginBottom="@dimen/keyline_2"
+            android:paddingStart="@dimen/keyline_3"
+            app:typography="caption_allCaps"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:ignore="HardcodedText"/>
+
         <com.duckduckgo.mobile.android.ui.view.listitem.SectionHeaderListItem
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
diff --git a/common-ui/src/main/res/layout/view_dax_dialog.xml b/common-ui/src/main/res/layout/view_dax_dialog.xml
index 14946ca369c8..a73bad53b379 100644
--- a/common-ui/src/main/res/layout/view_dax_dialog.xml
+++ b/common-ui/src/main/res/layout/view_dax_dialog.xml
@@ -59,7 +59,7 @@
             android:id="@+id/logo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/keyline_2"
+            android:layout_marginStart="@dimen/keyline_5"
             android:layout_marginBottom="@dimen/keyline_4"
             app:layout_constraintBottom_toTopOf="@id/cardView"
             app:layout_constraintStart_toStartOf="@id/cardView"
diff --git a/common-ui/src/main/res/values/attrs-typography.xml b/common-ui/src/main/res/values/attrs-typography.xml
index c2a6af94ecb9..e329b608c882 100644
--- a/common-ui/src/main/res/values/attrs-typography.xml
+++ b/common-ui/src/main/res/values/attrs-typography.xml
@@ -26,9 +26,12 @@
             <enum name="h4" value="4"/>
             <enum name="h5" value="5"/>
             <enum name="body1" value="6"/>
-            <enum name="body2" value="7"/>
-            <enum name="button" value="8"/>
-            <enum name="caption" value="9"/>
+            <enum name="body1_bold" value="7"/>
+            <enum name="body2" value="8"/>
+            <enum name="body2_bold" value="9"/>
+            <enum name="button" value="10"/>
+            <enum name="caption" value="11"/>
+            <enum name="caption_allCaps" value="12"/>
         </attr>
         <attr name="textType" format="enum" >
             <enum name="primary" value="0"/>
diff --git a/common-ui/src/main/res/values/design-system-dimensions.xml b/common-ui/src/main/res/values/design-system-dimensions.xml
index bcc0142252d1..dbbdd9765cd8 100644
--- a/common-ui/src/main/res/values/design-system-dimensions.xml
+++ b/common-ui/src/main/res/values/design-system-dimensions.xml
@@ -99,5 +99,4 @@
     <!-- Card -->
     <dimen name="daxBubbleDialogDistanceFromEdge">22dp</dimen>
     <dimen name="daxBubbleDialogEdge">9dp</dimen>
-
 </resources>
\ No newline at end of file
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 13194f11254e..22ad2edc60f6 100644
--- a/common-ui/src/main/res/values/design-system-theming.xml
+++ b/common-ui/src/main/res/values/design-system-theming.xml
@@ -133,7 +133,6 @@
         <!--controls the ripple coloring-->
         <item name="colorControlHighlight">?attr/daxColorRipple</item>
 
-
         <!--Design System Colors theme independent-->
         <item name="daxColorDim">@color/black60</item>
         <item name="daxColorWhite">@color/white</item>
diff --git a/common-ui/src/main/res/values/design-system-typograhy.xml b/common-ui/src/main/res/values/design-system-typograhy.xml
index 0b7670a2019a..de497595caaa 100644
--- a/common-ui/src/main/res/values/design-system-typograhy.xml
+++ b/common-ui/src/main/res/values/design-system-typograhy.xml
@@ -14,7 +14,8 @@
   ~ limitations under the License.
   -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools"
+           tools:ignore="NewApi">
 
     <style name="TextAppearance"/>
     <style name="TextAppearance.DuckDuckGo">
@@ -34,7 +35,7 @@
     <style name="TextAppearance.DuckDuckGo.Headline2">
         <item name="android:textSize">20sp</item>
         <item name="android:lineSpacingExtra">6sp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif</item>
     </style>
 
     <style name="TextAppearance.DuckDuckGo.Headline3">
@@ -89,76 +90,85 @@
     <style name="Typography.DuckDuckGo">
         <item name="android:textStyle">normal</item>
         <item name="android:fontFamily">sans-serif</item>
-        <item name="android:letterSpacing">0.0</item>
     </style>
 
     <style name="Typography.DuckDuckGo.Title">
         <item name="android:textSize">32sp</item>
         <item name="android:lineSpacingExtra">4sp</item>
+        <item name="android:lineHeight">36sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="Typography.DuckDuckGo.H1">
         <item name="android:textSize">24sp</item>
         <item name="android:lineSpacingExtra">6sp</item>
+        <item name="android:lineHeight">30sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="Typography.DuckDuckGo.H2">
         <item name="android:textSize">20sp</item>
         <item name="android:lineSpacingExtra">4sp</item>
+        <item name="android:lineHeight">24sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
     <style name="Typography.DuckDuckGo.H3">
         <item name="android:textSize">16sp</item>
         <item name="android:lineSpacingExtra">5sp</item>
+        <item name="android:lineHeight">21sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
     <style name="Typography.DuckDuckGo.H4">
         <item name="android:textSize">14sp</item>
         <item name="android:lineSpacingExtra">6sp</item>
+        <item name="android:lineHeight">20sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
     <style name="Typography.DuckDuckGo.H5">
         <item name="android:textSize">13sp</item>
         <item name="android:lineSpacingExtra">3sp</item>
+        <item name="android:lineHeight">16sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
     <style name="Typography.DuckDuckGo.Body1">
         <item name="android:textSize">16sp</item>
-        <item name="android:lineSpacingExtra">2sp</item>
-        <item name="android:fontFamily">sans-serif-regular</item>
+        <item name="android:lineSpacingExtra">4sp</item>
+        <item name="android:lineHeight" >20sp</item>
     </style>
 
     <style name="Typography.DuckDuckGo.Body1.Bold">
         <item name="android:textStyle">bold</item>
-        <item name="android:fontFamily">sans-serif</item>
     </style>
 
     <style name="Typography.DuckDuckGo.Body2">
         <item name="android:textSize">14sp</item>
-        <item name="android:lineSpacingExtra">6sp</item>
-        <item name="android:fontFamily">sans-serif-regular</item>
+        <item name="android:lineSpacingExtra">4sp</item>
+        <item name="android:lineHeight">18sp</item>
     </style>
 
     <style name="Typography.DuckDuckGo.Body2.Bold">
         <item name="android:textStyle">bold</item>
-        <item name="android:fontFamily">sans-serif</item>
     </style>
 
     <style name="Typography.DuckDuckGo.Button">
         <item name="android:textSize">15sp</item>
         <item name="android:lineSpacingExtra">5sp</item>
+        <item name="android:lineHeight">20sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="Typography.DuckDuckGo.Caption">
         <item name="android:textSize">12sp</item>
         <item name="android:lineSpacingExtra">4sp</item>
+        <item name="android:lineHeight">16sp</item>
+    </style>
+
+    <style name="Typography.DuckDuckGo.Caption.AllCaps">
+        <item name="android:textAllCaps">true</item>
     </style>
 
 </resources>
\ No newline at end of file