diff --git a/res/drawable/default_artwork_blur_2.xml b/res/drawable/default_artwork_blur_2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..30b4bbad2be1b9a610a1d467809c87713d43f418
--- /dev/null
+++ b/res/drawable/default_artwork_blur_2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid
+        android:color="@color/background_color"
+        />
+
+</shape>
diff --git a/res/drawable/menu_button_light.xml b/res/drawable/menu_button_light.xml
index ef6f6ba3e3c4eace8f33a0b467b2ea3fbfc7bcec..5d8af81b83413691e47da48a8400bcd8fb3c451f 100644
--- a/res/drawable/menu_button_light.xml
+++ b/res/drawable/menu_button_light.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24h-24z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/list_item_text_color_light"
         android:pathData="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2
 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" />
 </vector>
diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml
index 1d80530e92dcea3dda12c4bb7f6053b6711e12bd..0ef057596d3ade91a022ac303d9140138f3a3353 100644
--- a/res/layout/activity_base.xml
+++ b/res/layout/activity_base.xml
@@ -112,8 +112,8 @@
                         android:layout_gravity="center_horizontal"
                         android:scaleType="centerInside"
                         android:tint="@color/white"
-                        android:layout_marginStart="5dp"
-                        android:layout_marginEnd="5dp"
+                        android:layout_marginStart="20dp"
+                        android:layout_marginEnd="20dp"
                         android:src="@drawable/drag_indicator" />
 
                 </LinearLayout>
diff --git a/res/layout/album_detail_song.xml b/res/layout/album_detail_song.xml
index 2e3c45cd5c63308f2ec03bd74d107da46f4bc1fc..de709c1e7713085958525e2f361f4d02ede48953 100644
--- a/res/layout/album_detail_song.xml
+++ b/res/layout/album_detail_song.xml
@@ -23,7 +23,7 @@
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
             android:gravity="center"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
     </LinearLayout>
 
     <RelativeLayout
diff --git a/res/layout/artist_detail_album.xml b/res/layout/artist_detail_album.xml
index 23b8f63b021092b7597c21b6cb7da60fc2a82dd2..344fe04820516a2faa3d1ccc6512d2b135ded8b7 100644
--- a/res/layout/artist_detail_album.xml
+++ b/res/layout/artist_detail_album.xml
@@ -46,7 +46,7 @@
             android:layout_alignParentEnd="true"
             android:layout_marginBottom="1dp"
             android:gravity="center_vertical"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/res/layout/artist_detail_header.xml b/res/layout/artist_detail_header.xml
index d1a20264bf715d10ac83580c62cce30e1c20e28f..6e39e15df0d4d26d412162917eaa0ef7b9123942 100644
--- a/res/layout/artist_detail_header.xml
+++ b/res/layout/artist_detail_header.xml
@@ -7,6 +7,7 @@
         android:id="@+id/hero"
         android:layout_width="match_parent"
         android:layout_height="222dp"
+        android:layout_marginTop="?android:attr/actionBarSize"
         android:gravity="center" />
 
     <TextView
diff --git a/res/layout/artist_detail_song.xml b/res/layout/artist_detail_song.xml
index 66611a433a85d1eccdd438d35d01e6acb3e5e08b..3cfff98b3cab4052499b541cd54d6e1066704372 100644
--- a/res/layout/artist_detail_song.xml
+++ b/res/layout/artist_detail_song.xml
@@ -33,7 +33,7 @@
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
     </LinearLayout>
 
     <TextView
diff --git a/res/layout/blur_scrim_image.xml b/res/layout/blur_scrim_image.xml
index 2126ae99d41c90078ebb0b250d7041cba39a7a01..7bde73f5030c14257c08304aad9c3b8008701d5a 100644
--- a/res/layout/blur_scrim_image.xml
+++ b/res/layout/blur_scrim_image.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        android:src="@drawable/default_artwork_blur"/>
+        android:src="@drawable/default_artwork_blur_2"/>
     <LinearLayout
         android:id="@+id/blurScrim"
         android:layout_width="match_parent"
diff --git a/res/layout/edit_queue_list_item.xml b/res/layout/edit_queue_list_item.xml
index 46a14fa3df671cc72fa726d67b899e780dbdc021..36e0b7e2b140e13c2b6394404ae089d32b5ef072 100644
--- a/res/layout/edit_queue_list_item.xml
+++ b/res/layout/edit_queue_list_item.xml
@@ -26,6 +26,7 @@
         android:layout_height="@dimen/drag_and_drop_height"
         android:layout_centerVertical="true"
         android:scaleType="fitXY"
+        android:tint="@color/player_action_bar_subtitle_text_color"
         android:src="@drawable/gripper_light" />
 
     <FrameLayout
@@ -43,5 +44,6 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
+        android:tint="@color/player_action_bar_subtitle_text_color"
         android:src="@drawable/dnd_list_divider_light" />
 </RelativeLayout>
diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
index e72220e662518c49576686e7aa1cf03e9dece2ad..3b87761a57a11b07e676dae3f8f85d1ecda1be6e 100644
--- a/res/layout/grid_items_normal.xml
+++ b/res/layout/grid_items_normal.xml
@@ -68,7 +68,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/grid_item_padding_right"
-                android:src="@drawable/menu_button" />
+                android:src="@lineageos.platform:drawable/ic_menu" />
 
         </LinearLayout>
 
diff --git a/res/layout/header_bar.xml b/res/layout/header_bar.xml
index d209147a043d0e6481d4640e9785c8f9d52fdc2f..3e953ee7b5349e022cf6a7ecf76a56df6bd3cab5 100644
--- a/res/layout/header_bar.xml
+++ b/res/layout/header_bar.xml
@@ -55,6 +55,6 @@
         android:layout_weight="0"
         android:scaleType="centerInside"
         android:background="@drawable/selectable_background"
-        android:src="@drawable/menu_button_light"/>
+        android:src="@lineageos.platform:drawable/ic_menu"/>
 
 </org.lineageos.eleven.ui.HeaderBar>
diff --git a/res/layout/list_item_common.xml b/res/layout/list_item_common.xml
index da1b3e005ed09ceb1d0555e54dd07ad220d71f90..18c5a8d6e36691e38d1260ce5d548971c68dde9c 100644
--- a/res/layout/list_item_common.xml
+++ b/res/layout/list_item_common.xml
@@ -56,6 +56,6 @@
             android:id="@+id/popup_menu_button"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/res/layout/list_item_queue.xml b/res/layout/list_item_queue.xml
index 9e2f2e588b5a1b9f158550f14a95e6f5cf91d07f..5608e5951147ecad007d3b60ddd0257d3a400fb5 100644
--- a/res/layout/list_item_queue.xml
+++ b/res/layout/list_item_queue.xml
@@ -71,5 +71,5 @@
         android:layout_height="@dimen/overflow_height"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:src="@drawable/menu_button_light" />
+        android:src="@lineageos.platform:drawable/ic_menu" />
 </RelativeLayout>
diff --git a/res/layout/list_item_simple.xml b/res/layout/list_item_simple.xml
index f04bef7974dc402b4a86afc928f8fe3275b38112..aeefcb9905464325aa581059cba79cc8150e7f31 100644
--- a/res/layout/list_item_simple.xml
+++ b/res/layout/list_item_simple.xml
@@ -65,7 +65,7 @@
             android:layout_height="@dimen/overflow_height"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
     </RelativeLayout>
 
     <ImageView
diff --git a/res/layout/list_item_top_tracks.xml b/res/layout/list_item_top_tracks.xml
index 7880dd230a290c89c0f9e6a12ebbc625e5e0d57e..1d72be5e34495f9a696ccf28fee5187e66ecc8eb 100644
--- a/res/layout/list_item_top_tracks.xml
+++ b/res/layout/list_item_top_tracks.xml
@@ -95,7 +95,7 @@
                 android:id="@+id/popup_menu_button"
                 android:layout_width="@dimen/overflow_width"
                 android:layout_height="@dimen/overflow_height"
-                android:src="@drawable/menu_button" />
+                android:src="@lineageos.platform:drawable/ic_menu" />
         </LinearLayout>
     </RelativeLayout>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 43b6fddffbb5d1d520f231fc15f6320928192c75..be9c8183763dbbd43e8114d246f6e121e38520f3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -65,7 +65,7 @@
     <color name="transparent_white">#99fafafa</color>
     <color name="transparent_blue">#993F51B5</color>
 
-    <color name="background_color">@color/white</color>
+    <color name="background_color">@color/header_action_bar_color</color>
 
     <!-- Color for the action bar -->
     <color name="header_action_bar_color">@color/primary</color>
@@ -98,7 +98,7 @@
     <color name="list_item_header_text_color">@color/black</color>
     <color name="list_item_search_footer_text_color">@color/accent</color>
     <color name="list_item_text_color">@color/default_text_color</color>
-    <color name="list_item_text_color_light">@color/default_text_color_light</color>
+    <color name="list_item_text_color_light">@color/player_action_bar_title_text_color</color>
     <color name="list_item_divider_color">#4c212121</color>
     <color name="list_item_divider_color_light">#34fafafa</color>
     <color name="grid_list_item_text_color">#b3212121</color>
@@ -121,7 +121,7 @@
 
     <!-- search no results text color -->
     <color name="no_results">@color/black</color>
-    <color name="no_results_light">@color/white</color>
+    <color name="no_results_light">@color/main_action_bar_text_color</color>
 
     <color name="now_playing_divider">@color/transparent</color>
 
@@ -163,7 +163,7 @@
 
     <!-- Separated and exposed values for themes -->
     <color name="widget_background_color">@color/black</color>
-    <color name="list_base_container_background_color">@color/white</color>
+    <color name="list_base_container_background_color">@color/background_color</color>
     <color name="activity_album_detail_background_color">@color/background_color</color>
     <color name="activity_artist_detail_background_color">@color/background_color</color>
     <color name="activity_base_background_color">@color/background_color</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index df10fdadd176c97970e032e3f76333bf85c497f3..a5609eb30068d7071d215dbcc217e670bc07fc02 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -31,6 +31,8 @@
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">false</item>
         <item name="android:windowAllowReturnTransitionOverlap">false</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:homeAsUpIndicator">@lineageos.platform:drawable/ic_back</item>
     </style>
 
     <style name="ActionBarWidgetTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
@@ -77,7 +79,7 @@
 
     <!-- Sets the action bar menu icon -->
     <style name="ActionOverFlowButton" parent="@style/Widget.AppCompat.ActionButton">
-        <item name="android:src">@drawable/menu_button_light</item>
+        <item name="android:src">@lineageos.platform:drawable/ic_menu</item>
         <item name="android:minWidth">0dip</item>
         <item name="android:paddingLeft">8dip</item>
         <item name="android:paddingRight">8dip</item>
diff --git a/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java b/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
index a47b312e061ed6e0ec827ac1b342d8c5987c32a7..e5a0deefdda09ab4482d12c7b87bcdfbb069c30e 100644
--- a/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
@@ -15,6 +15,7 @@
 */
 package org.lineageos.eleven.ui.fragments;
 
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -97,6 +98,9 @@ public class ArtistDetailFragment extends FadingBarFragment implements IChildFra
         LoaderManager lm = getLoaderManager();
         lm.initLoader(ALBUM_LOADER_ID, arguments, mAlbumAdapter);
         lm.initLoader(SONG_LOADER_ID, arguments, mSongAdapter);
+        if (getContainingActivity().getActionBar() != null)
+            getContainingActivity().getActionBar().setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.primary_dark)));
+
     }
 
     @Override // DetailFragment
diff --git a/src/org/lineageos/eleven/widgets/AlbumScrimImage.java b/src/org/lineageos/eleven/widgets/AlbumScrimImage.java
index 8dfbda208eeac0c3e64f42e48d74acf1e3a1a02e..2a3d4a3d3a0b97aab4afe8dfca8d048c60d5b655 100644
--- a/src/org/lineageos/eleven/widgets/AlbumScrimImage.java
+++ b/src/org/lineageos/eleven/widgets/AlbumScrimImage.java
@@ -71,7 +71,7 @@ public class AlbumScrimImage extends FrameLayout {
         }
 
         Bitmap blurredBitmap = ((BitmapDrawable) ContextCompat.getDrawable(
-                getContext(), R.drawable.default_artwork_blur)).getBitmap();
+                getContext(), R.drawable.default_artwork_blur_2)).getBitmap();
 
         TransitionDrawable imageTransition = ImageWorker.createImageTransitionDrawable(
                 getResources(), mImageView.getDrawable(), blurredBitmap,