diff --git a/app/res/layout/fragment_connect_delivery_home.xml b/app/res/layout/fragment_connect_delivery_home.xml
index d695505127..39cdbafeee 100644
--- a/app/res/layout/fragment_connect_delivery_home.xml
+++ b/app/res/layout/fragment_connect_delivery_home.xml
@@ -19,7 +19,7 @@
         app:tabInlineLabel="true"
         app:tabMode="fixed"
         app:tabSelectedTextColor="?attr/colorOnPrimary"
-        app:tabTextAppearance="@style/TabTextStyle"
+        app:tabTextAppearance="@style/TextStyle.Connect.BodyM"
         app:tabTextColor="?attr/colorOnPrimary" />
 
     <!--
diff --git a/app/res/layout/nav_drawer_footer.xml b/app/res/layout/nav_drawer_footer.xml
index cb9b916085..a003879d54 100644
--- a/app/res/layout/nav_drawer_footer.xml
+++ b/app/res/layout/nav_drawer_footer.xml
@@ -6,7 +6,8 @@
     android:layout_height="wrap_content"
     android:padding="16dp"
     android:layout_gravity="bottom"
-    android:background="@color/connect_blue_color">
+    android:background="?attr/colorPrimary"
+    android:theme="@style/ConnectTheme">
     <View
         android:layout_marginTop="16dp"
         android:layout_width="match_parent"
@@ -36,7 +37,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/personalid_notification"
-            android:textAppearance="@style/TextAppearance.NavDrawerItem"
+            style="@style/TextStyle.Connect.LabelM"
+            android:textColor="?attr/connectNavDrawerForeground"
             android:layout_marginStart="8dp"/>
     </LinearLayout>
 
@@ -62,7 +64,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/about_cc"
-            android:textAppearance="@style/TextAppearance.NavDrawerItem"
+            style="@style/TextStyle.Connect.LabelM"
+            android:textColor="?attr/connectNavDrawerForeground"
             android:layout_marginStart="8dp" />
     </LinearLayout>
 
@@ -89,16 +92,17 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/nav_drawer_help"
-            android:textAppearance="@style/TextAppearance.NavDrawerItem"
+            style="@style/TextStyle.Connect.LabelM"
+            android:textColor="?attr/connectNavDrawerForeground"
             android:layout_marginStart="8dp"/>
     </LinearLayout>
     <TextView
         android:id="@+id/app_version"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.NavDrawerItem.SubTitle"
+        style="@style/TextStyle.Connect.BodyS"
         android:enabled="false"
-        android:textColor="@color/white"
+        android:textColor="?attr/colorOnPrimary"
         android:layout_marginTop="8dp"/>
 
 </LinearLayout>
diff --git a/app/res/layout/nav_drawer_header.xml b/app/res/layout/nav_drawer_header.xml
index ecc5642064..ff7792c5bf 100644
--- a/app/res/layout/nav_drawer_header.xml
+++ b/app/res/layout/nav_drawer_header.xml
@@ -6,14 +6,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="16dp"
-        android:background="@color/connect_blue_color">
+        android:background="?attr/colorPrimary"
+        android:theme="@style/ConnectTheme">
         <ImageView
             android:contentDescription="@null"
             android:layout_gravity="center"
             android:layout_height="32dp"
             android:layout_width="match_parent"
             android:src="@drawable/commcare_by_dimagi"
-            app:tint="@color/white" />
+            app:tint="?attr/colorOnPrimary" />
         <androidx.cardview.widget.CardView
             android:id="@+id/profile_card"
             android:layout_width="match_parent"
@@ -32,7 +33,7 @@
                     android:layout_height="72dp"
                     app:cardCornerRadius="50dp"
                     app:cardElevation="0dp"
-                    app:strokeColor="@color/white"
+                    app:strokeColor="?attr/colorOnPrimary"
                     app:strokeWidth="2dp">
 
                     <ImageView
@@ -72,7 +73,8 @@
                         android:id="@+id/header_user_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="@style/TextAppearance.NavDrawerItem"/>
+                        style="@style/TextStyle.Connect.BodyM"
+                        android:textColor="?attr/connectNavDrawerForeground"/>
                     <TextView
                         android:id="@+id/header_manage_profile"
                         android:layout_width="wrap_content"
@@ -80,8 +82,8 @@
                         android:layout_marginTop="6dp"
                         android:background="?attr/selectableItemBackground"
                         android:text="@string/personalid_manage_profile"
-                        android:textColor="@color/white"
-                        android:textSize="12sp"/>
+                        android:textColor="?attr/colorOnPrimary"
+                        style="@style/TextStyle.Connect.LabelM"/>
                 </LinearLayout>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
diff --git a/app/res/layout/nav_drawer_list_item.xml b/app/res/layout/nav_drawer_list_item.xml
index a88b4e93b7..5e2c0c1015 100644
--- a/app/res/layout/nav_drawer_list_item.xml
+++ b/app/res/layout/nav_drawer_list_item.xml
@@ -8,7 +8,8 @@
     android:gravity="center_vertical"
     android:clipChildren="false"
     android:clipToPadding="false"
-    android:background="@color/connect_blue_color">
+    android:background="?attr/colorPrimary"
+    android:theme="@style/ConnectTheme">
 
     <FrameLayout
         android:layout_width="wrap_content"
@@ -43,7 +44,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:includeFontPadding="false"
-                android:textColor="@android:color/white"
+                android:textColor="?attr/colorOnPrimary"
                 android:textSize="11sp" />
         </FrameLayout>
     </FrameLayout>
@@ -52,6 +53,7 @@
         android:id="@+id/list_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.NavDrawerItem"
+        style="@style/TextStyle.Connect.LabelM"
+        android:textColor="?attr/connectNavDrawerForeground"
         android:layout_marginStart="12dp"/>
 </LinearLayout>
diff --git a/app/res/values/attrs.xml b/app/res/values/attrs.xml
index 47660fb268..8b72aeb06a 100755
--- a/app/res/values/attrs.xml
+++ b/app/res/values/attrs.xml
@@ -25,6 +25,7 @@
     <attr name="connectOnDisabledContainer" format="reference|color" />
     <attr name="connectCtaButtonBackground" format="reference|color" />
     <attr name="connectCtaButtonForeground" format="reference|color" />
+    <attr name="connectNavDrawerForeground" format="reference|color" />
     <attr name="connectOutline" format="reference|color" />
     <attr name="connectOutlineVariant" format="reference|color" />
     <attr name="connectStatusPositive" format="reference|color" />
diff --git a/app/res/values/themes.xml b/app/res/values/themes.xml
index b525939751..255ec8ec6a 100644
--- a/app/res/values/themes.xml
+++ b/app/res/values/themes.xml
@@ -56,6 +56,8 @@
         <item name="colorSurface">@color/white</item>
         <item name="colorOnSurface">@color/connect_text_color</item>
         <item name="appBarLayoutStyle">@style/Widget.Connect.AppBarLayout</item>
+        <item name="toolbarStyle">@style/Widget.Connect.Toolbar</item>
+        <item name="connectNavDrawerForeground">@color/nav_drawer_text</item>
 
         <item name="connectBackground">@color/connect_background_color</item>
         <item name="connectSurfaceContainerLow">@color/cool_gray_50</item>
@@ -153,6 +155,11 @@
         <item name="elevation">0dp</item>
     </style>
 
+    <style name="Widget.Connect.Toolbar" parent="Widget.AppCompat.Toolbar">
+        <item name="titleTextAppearance">@style/TextStyle.Connect.TitleM</item>
+        <item name="subtitleTextAppearance">@style/TextStyle.Connect.LabelS</item>
+    </style>
+
     <style name="ToolbarThemeOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
         <item name="colorOnPrimary">@color/white</item>
     </style>