diff --git a/app/src/gplay/res/layout/upgrade_fragment.xml b/app/src/gplay/res/layout/upgrade_fragment.xml
index 32e30bcf0..10d5a7142 100644
--- a/app/src/gplay/res/layout/upgrade_fragment.xml
+++ b/app/src/gplay/res/layout/upgrade_fragment.xml
@@ -7,15 +7,13 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Surface"
+        style="@style/SDMToolbar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:minHeight="?actionBarSize"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIcon="@drawable/ic_arrow_back"
-        app:navigationIconTint="?colorOnSurface"
         app:title="@string/upgrade_screen_title"
         app:titleCentered="true" />
 
diff --git a/app/src/main/res/layout/analyzer_app_fragment.xml b/app/src/main/res/layout/analyzer_app_fragment.xml
index 21afb3382..edff7db52 100644
--- a/app/src/main/res/layout/analyzer_app_fragment.xml
+++ b/app/src/main/res/layout/analyzer_app_fragment.xml
@@ -8,10 +8,9 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:minHeight="?actionBarSize"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"