diff --git a/app/src/main/res/layouts/main_layouts/layout/profile_bottom_sheet.xml b/app/src/main/res/layouts/main_layouts/layout/profile_bottom_sheet.xml
index 321f3378..bcd6dc71 100644
--- a/app/src/main/res/layouts/main_layouts/layout/profile_bottom_sheet.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/profile_bottom_sheet.xml
@@ -15,14 +15,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/top_round_corner_background"
-        android:theme="?android:toolbarStyle">
+        android:theme="?android:toolbarStyle"
+        app:elevation="0dp">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/toggleArrow"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="@dimen/spacing_normal"
-            android:elevation="0dp"
             android:src="@drawable/ic_bottom_sheet_rectangle" />
 
         <androidx.appcompat.widget.Toolbar
@@ -40,8 +40,7 @@
                 android:layout_height="?actionBarSize"
                 android:background="@color/transparent"
                 app:tabGravity="center"
-                app:tabMode="scrollable"
-                app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget" />
+                app:tabMode="scrollable" />
 
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/resources/src/main/res/values/styles.xml b/resources/src/main/res/values/styles.xml
index c8bc4722..626c8fcf 100644
--- a/resources/src/main/res/values/styles.xml
+++ b/resources/src/main/res/values/styles.xml
@@ -8,21 +8,27 @@
         <item name="behavior_peekHeight">220dp</item>
     </style>
 
-    <style name="ChipStyleDisabled">
+    <style name="ChipStyleDisabled"  parent="Widget.MaterialComponents.Chip.Entry">
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="chipBackgroundColor">?colorPrimary</item>
         <item name="android:enabled">false</item>
+        <item name="android:checkable">false</item>
+        <item name="closeIcon">@null</item>
     </style>
 
-    <style name="ChipStyle">
+    <style name="ChipStyle" parent="Widget.MaterialComponents.Chip.Entry">
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="chipBackgroundColor">?chip_background</item>
         <item name="android:elevation">@dimen/spacing_micro</item>
+        <item name="android:checkable">false</item>
+        <item name="closeIcon">@null</item>
     </style>
 
-    <style name="ChipStyleNoElevation">
+    <style name="ChipStyleNoElevation" parent="Widget.MaterialComponents.Chip.Entry">
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="chipBackgroundColor">?chip_background</item>
+        <item name="android:checkable">false</item>
+        <item name="closeIcon">@null</item>
     </style>
 
     <style name="ChipStyleChoiceNoDrawable" parent="Widget.MaterialComponents.Chip.Choice">
diff --git a/resources/src/main/res/values/theme_attrs.xml b/resources/src/main/res/values/theme_attrs.xml
index d50aa2a6..c29de168 100644
--- a/resources/src/main/res/values/theme_attrs.xml
+++ b/resources/src/main/res/values/theme_attrs.xml
@@ -9,12 +9,4 @@
     <attr name="dividerColor" format="color|reference" />
     <attr name="comment_box_style" format="reference" />
     <attr name="chip_background" format="color|reference" />
-
-    <!-- TODO: This is a temporary fix for this issue: https://issuetracker.google.com/issues/136103084 -->
-    <attr name="flow_horizontalSeparator" />
-    <attr name="flow_verticalSeparator" />
-    <attr name="motionProgress" />
-    <attr name="waveDecay" />
-    <attr name="motionPathRotate" />
-    <attr name="duration" />
 </resources>
\ No newline at end of file
diff --git a/resources/src/main/res/values/theme_light.xml b/resources/src/main/res/values/theme_light.xml
index 3a1abe13..905c3106 100644
--- a/resources/src/main/res/values/theme_light.xml
+++ b/resources/src/main/res/values/theme_light.xml
@@ -10,6 +10,7 @@
     <color name="light_primary">#FAFAFA</color>
     <color name="light_primary_dark">#FAFAFA</color>
 
+
     <style name="ThemeLight" parent="ThemeLight.Base" />
 
     <style name="ThemeLight.Base" parent="Theme.Light.NoActionBar">
@@ -22,10 +23,6 @@
         <item name="patch_deletion">@color/light_patch_deletion_color</item>
         <item name="patch_ref">@color/light_patch_ref_color</item>
         <item name="dividerColor">@color/lightDivider</item>
-        <item name="android:windowBackground">@color/lightWindowBackground</item>
-        <item name="colorPrimary">@color/light_primary</item>
-        <item name="colorPrimaryDark">@color/light_primary_dark</item>
-        <item name="colorAccent">@color/light_accent</item>
         <item name="colorControlNormal">?colorAccent</item>
         <item name="actionModeBackground">?colorPrimary</item>
         <item name="windowActionModeOverlay">true</item>
@@ -45,6 +42,23 @@
         <item name="android:navigationBarColor">@color/lightWindowBackground</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+
+        <item name="colorPrimary">@color/light_primary</item>
+        <item name="colorPrimaryDark">@color/light_primary_dark</item>
+        <item name="colorPrimaryVariant">@color/light_primary_dark</item>
+        <item name="colorSecondary">@color/light_accent</item>
+        <item name="colorSecondaryVariant">#FF1E59FC</item>
+
+        <item name="android:colorBackground">@color/lightWindowBackground</item>
+        <item name="android:windowBackground">@color/lightWindowBackground</item>
+        <item name="colorSurface">@color/lightWindowBackground</item>
+        <item name="colorError">@color/material_red_700</item>
+
+        <item name="colorOnPrimary">#212121</item>
+        <item name="colorOnSecondary">#212121</item>
+        <item name="colorOnBackground">#212121</item>
+        <item name="colorOnSurface">#212121</item>
+        <item name="colorOnError">@color/white</item>
     </style>
 
     <style name="DialogThemeLight" parent="Theme.MaterialComponents.Light.Dialog.Alert">
diff --git a/resources/src/main/res/values/themes.xml b/resources/src/main/res/values/themes.xml
index 74c05828..85bb9fcd 100644
--- a/resources/src/main/res/values/themes.xml
+++ b/resources/src/main/res/values/themes.xml
@@ -41,13 +41,26 @@
         <item name="android:textColor">@color/white</item>
     </style>
 
-
     <style name="Theme.Light.NoActionBar" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="fontFamily">@font/rubik_font</item>
+        <item name="tabStyle">@style/TabLayoutStyle</item>
     </style>
 
     <style name="Theme.Dark.NoActionBar" parent="Theme.MaterialComponents.NoActionBar">
         <item name="fontFamily">@font/rubik_font</item>
+        <item name="tabStyle">@style/TabLayoutStyle</item>
+    </style>
+
+    <style name="TabLayoutStyle" parent="Widget.Design.TabLayout">
+        <item name="tabBackground">?attr/selectableItemBackground</item>
+        <item name="tabTextAppearance">@style/TabTextAppearance</item>
+        <item name="tabSelectedTextColor">?android:textColorPrimary</item>
+    </style>
+
+    <style name="TabTextAppearance" parent="TextAppearance.Design.Tab">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">?android:textColorSecondary</item>
+        <item name="textAllCaps">false</item>
     </style>
 
 </resources>
\ No newline at end of file