diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index 675fd5249..7a1f87148 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -856,6 +856,9 @@
     <PackageReference Include="SimpleInjector">
       <Version>4.0.12</Version>
     </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
+      <Version>25.4.0.2</Version>
+    </PackageReference>
     <PackageReference Include="Xamarin.Firebase.Messaging">
       <Version>42.1021.1</Version>
     </PackageReference>
diff --git a/src/Android/Resources/layout/tabs.axml b/src/Android/Resources/layout/tabs.axml
index b8d4c541c..97cb27ad3 100644
--- a/src/Android/Resources/layout/tabs.axml
+++ b/src/Android/Resources/layout/tabs.axml
@@ -7,9 +7,5 @@
     android:background="?attr/colorPrimary"
     android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
     app:tabIndicatorColor="@android:color/white"
-    app:tabMaxWidth="0dp"
     app:tabGravity="fill"
-    app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
-    app:tabTextColor="@color/tabtext"
-    app:tabSelectedTextColor="@android:color/white"
     app:tabMode="fixed" />
\ No newline at end of file
diff --git a/src/Android/Resources/layout/toolbar.axml b/src/Android/Resources/layout/toolbar.axml
index 8c05e2343..8225229fa 100644
--- a/src/Android/Resources/layout/toolbar.axml
+++ b/src/Android/Resources/layout/toolbar.axml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    android:minHeight="?attr/actionBarSize"
+    android:layout_height="wrap_content"
     android:background="?attr/colorPrimary"
     android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-    app:layout_scrollFlags="scroll|enterAlways" />
\ No newline at end of file
+    android:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
\ No newline at end of file