diff --git a/app/src/main/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml
index 96262a3a..b2d188f6 100644
--- a/app/src/main/res/layout/activity_album_detail.xml
+++ b/app/src/main/res/layout/activity_album_detail.xml
@@ -22,7 +22,7 @@
         <ViewStub
             android:id="@+id/cab_stub"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
+            android:layout_height="?android:attr/actionBarSize" />
 
     </FrameLayout>
 
@@ -217,4 +217,4 @@
             tools:ignore="UnusedAttribute" />
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index c7f1926c..ac2b3f78 100644
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -138,7 +138,7 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="?actionBarSize"
+        android:layout_height="?android:attr/actionBarSize"
         android:background="@drawable/shadow_down" />
 
     <android.support.v7.widget.Toolbar
diff --git a/app/src/main/res/layout/activity_artist_detail.xml b/app/src/main/res/layout/activity_artist_detail.xml
index b9983983..0911d377 100644
--- a/app/src/main/res/layout/activity_artist_detail.xml
+++ b/app/src/main/res/layout/activity_artist_detail.xml
@@ -22,7 +22,7 @@
         <ViewStub
             android:id="@+id/cab_stub"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
+            android:layout_height="?android:attr/actionBarSize" />
 
     </FrameLayout>
 
@@ -185,4 +185,4 @@
             tools:ignore="UnusedAttribute" />
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_bug_report.xml b/app/src/main/res/layout/activity_bug_report.xml
index e5dced33..3af3baf7 100644
--- a/app/src/main/res/layout/activity_bug_report.xml
+++ b/app/src/main/res/layout/activity_bug_report.xml
@@ -15,7 +15,7 @@
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?actionBarSize" />
+            android:layout_height="?android:attr/actionBarSize" />
 
     </android.support.design.widget.AppBarLayout>
 
@@ -66,4 +66,4 @@
 
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_genre_detail.xml b/app/src/main/res/layout/activity_genre_detail.xml
index c59b2d6c..5d9fa7e5 100644
--- a/app/src/main/res/layout/activity_genre_detail.xml
+++ b/app/src/main/res/layout/activity_genre_detail.xml
@@ -28,7 +28,7 @@
             <ViewStub
                 android:id="@+id/cab_stub"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize" />
+                android:layout_height="?android:attr/actionBarSize" />
 
         </FrameLayout>
 
@@ -52,4 +52,4 @@
         android:textSize="@dimen/empty_text_size"
         android:visibility="gone" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index c8768820..478065f7 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -29,7 +29,7 @@
             <ViewStub
                 android:id="@+id/cab_stub"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize" />
+                android:layout_height="?android:attr/actionBarSize" />
 
         </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 255b237a..cc0669a1 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -28,7 +28,7 @@
             <ViewStub
                 android:id="@+id/cab_stub"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize" />
+                android:layout_height="?android:attr/actionBarSize" />
 
         </FrameLayout>
 
diff --git a/app/src/main/res/layout/shadow_statusbar_toolbar.xml b/app/src/main/res/layout/shadow_statusbar_toolbar.xml
index 9a3cea88..e9ca4d00 100644
--- a/app/src/main/res/layout/shadow_statusbar_toolbar.xml
+++ b/app/src/main/res/layout/shadow_statusbar_toolbar.xml
@@ -16,7 +16,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="?actionBarSize" />
+            android:layout_height="?android:attr/actionBarSize" />
 
     </LinearLayout>
 
@@ -27,4 +27,4 @@
         android:layout_alignTop="@id/dummy_statusbar_actionbar"
         android:background="@drawable/toolbar_gradient" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 93cdc8a0..efd506aa 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -12,4 +12,4 @@
     <attr name="iconColor" format="color" />
     <attr name="dividerColor" format="color" />
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7252a7b9..8cb384a3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -30,7 +30,7 @@
     <style name="Toolbar">
         <item name="titleMarginStart">16dp</item>
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">?actionBarSize</item>
+        <item name="android:layout_height">?android:attr/actionBarSize</item>
         <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
         <item name="popupTheme">?toolbarPopupTheme</item>
         <item name="android:elevation" tools:ignore="NewApi">@dimen/toolbar_elevation</item>