diff --git a/res/drawable/btn_playback_next.xml b/res/drawable/btn_playback_next.xml
index 6551b5e9acdea0a4e70604648a65c19383e7ea61..06462c82e1d587aaccdef41442e1be1309467b09 100644
--- a/res/drawable/btn_playback_next.xml
+++ b/res/drawable/btn_playback_next.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/player_control_color"
         android:pathData="M4 18l8.5-6L4 6v12zm9-12v12l8.5-6L13 6z" />
 </vector>
diff --git a/res/drawable/btn_playback_pause_player_control.xml b/res/drawable/btn_playback_pause_player_control.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b593b24d5539c154b79f7e8bfba7370d51496d18
--- /dev/null
+++ b/res/drawable/btn_playback_pause_player_control.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M6 19h4V5H6v14zm8-14v14h4V5h-4z" />
+</vector>
diff --git a/res/drawable/btn_playback_play_player_control.xml b/res/drawable/btn_playback_play_player_control.xml
new file mode 100644
index 0000000000000000000000000000000000000000..48333e8342ecb5eff83bad257085e5cc952f37a6
--- /dev/null
+++ b/res/drawable/btn_playback_play_player_control.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M8 5v14l11-7z" />
+</vector>
diff --git a/res/drawable/btn_playback_previous.xml b/res/drawable/btn_playback_previous.xml
index aaf506e970af923d60ff6983724a90be57fad0c8..caf46fe65b80ab9e67daef22ce35a7b993d4151c 100644
--- a/res/drawable/btn_playback_previous.xml
+++ b/res/drawable/btn_playback_previous.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/player_control_color"
         android:pathData="M11 18V6l-8.5 6 8.5 6zm.5-6l8.5 6V6l-8.5 6z" />
 </vector>
diff --git a/res/drawable/btn_playback_repeat_all.xml b/res/drawable/btn_playback_repeat_all.xml
index 1d98d0de9616924eb47a8e1e6232cd66cf0e6968..8be94ed2ce449159ae3f90646f9dd1cc6f8c7dd7 100644
--- a/res/drawable/btn_playback_repeat_all.xml
+++ b/res/drawable/btn_playback_repeat_all.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/player_control_color"
         android:pathData="M7 7h10v3l4-4-4-4v3H5v6h2V7zm10 10H7v-3l-4 4 4 4v-3h12v-6h-2v4z" />
 </vector>
diff --git a/res/drawable/btn_playback_repeat_one.xml b/res/drawable/btn_playback_repeat_one.xml
index dcd085fb9f80db57efb92ab7c4219af964a88a6d..289590e664dd79cadd3579d8defc5cd19a033bfa 100644
--- a/res/drawable/btn_playback_repeat_one.xml
+++ b/res/drawable/btn_playback_repeat_one.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/player_action_bar_title_text_color"
         android:pathData="M7 7h10v3l4-4-4-4v3H5v6h2V7zm10 10H7v-3l-4 4 4 4v-3h12v-6h-2v4zm-4-2V9h-1l-2
 1v1h1.5v4H13z" />
 </vector>
diff --git a/res/drawable/btn_playback_shuffle_all.xml b/res/drawable/btn_playback_shuffle_all.xml
index 3694d25e9a7990101e616bb1b27f342a7dfceb2a..c3d208b7b90dc9e503589053e30720d41842280c 100644
--- a/res/drawable/btn_playback_shuffle_all.xml
+++ b/res/drawable/btn_playback_shuffle_all.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/player_control_color"
         android:pathData="M10.59 9.17L5.41 4 4 5.41l5.17 5.17 1.42-1.41zM14.5 4l2.04 2.04L4 18.59 5.41 20
 17.96 7.46 20 9.5V4h-5.5zm.33 9.41l-1.41 1.41 3.13 3.13L14.5 20H20v-5.5l-2.04
 2.04-3.13-3.13z" />
diff --git a/res/drawable/circular_drawable_background_player_control.xml b/res/drawable/circular_drawable_background_player_control.xml
new file mode 100644
index 0000000000000000000000000000000000000000..36d59acc7691ec270208c9fa23154d9dba89d9ab
--- /dev/null
+++ b/res/drawable/circular_drawable_background_player_control.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:innerRadiusRatio="@dimen/circular_progress_bar_inner_radius_ratio"
+    android:thicknessRatio="@dimen/circular_progress_bar_thickness_ratio"
+    android:shape="ring"
+    android:useLevel="true">
+    <solid android:color="@color/circular_progress_bar_background_player_control" />
+</shape>
diff --git a/res/drawable/circular_drawable_player_control.xml b/res/drawable/circular_drawable_player_control.xml
new file mode 100644
index 0000000000000000000000000000000000000000..58c252c73055b03720329a2a16b7b2e062c25000
--- /dev/null
+++ b/res/drawable/circular_drawable_player_control.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:innerRadiusRatio="@dimen/circular_progress_bar_inner_radius_ratio"
+    android:thicknessRatio="@dimen/circular_progress_bar_thickness_ratio"
+    android:shape="ring"
+    android:useLevel="true">
+    <solid android:color="@color/circular_progress_bar_player_control" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/ic_action_search_menu.xml b/res/drawable/ic_action_search_menu.xml
new file mode 100644
index 0000000000000000000000000000000000000000..971c136095063017c1e8ea6a8c7ae8e4275d4f89
--- /dev/null
+++ b/res/drawable/ic_action_search_menu.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/colorControlNormal"
+        android:pathData="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91
+3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27 .28 v.79l5 4.99L20.49
+19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5
+14z" />
+</vector>
diff --git a/res/drawable/rounded_corner_rect.xml b/res/drawable/rounded_corner_rect.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0dfec2b8e7042e8cc5b109fb3491f6fb2981a1bf
--- /dev/null
+++ b/res/drawable/rounded_corner_rect.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners
+        android:radius="10dp"
+        />
+    <solid
+        android:color="@color/lineage_blue_color"
+        />
+
+</shape>
diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml
index 9356b8d6c170c8b97982613c6c72651d854a26ad..974c1a685ce8150fc8c213d7b4f6218d0d3f4aab 100644
--- a/res/layout/activity_base.xml
+++ b/res/layout/activity_base.xml
@@ -88,19 +88,35 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
+
             <LinearLayout
                 android:id="@+id/secondPanelDragArea"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/player_action_bar_color"
                 android:orientation="vertical">
 
-                <ImageView
-                    android:id="@+id/secondPanelDragIndicator"
+
+                <LinearLayout
+                    android:id="@+id/indicator"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/sliding_panel_indicator_height"
+                    android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/drag_indicator" />
+                    android:background="@drawable/rounded_corner_rect">
+
+                    <ImageView
+                        android:id="@+id/secondPanelDragIndicator"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/sliding_panel_indicator_height"
+                        android:layout_gravity="center_horizontal"
+                        android:scaleType="centerInside"
+                        android:tint="@color/white"
+                        android:layout_marginStart="5dp"
+                        android:layout_marginEnd="5dp"
+                        android:src="@drawable/drag_indicator" />
+
+                </LinearLayout>
+
 
                 <include
                     android:id="@+id/secondHeaderBar"
diff --git a/res/layout/activity_player_fragment.xml b/res/layout/activity_player_fragment.xml
index cb5f47da0360caa6ee4843c0f80b61a34eed4080..df1b18c9df121de6b5ae6b9610c7d200848b2bf2 100644
--- a/res/layout/activity_player_fragment.xml
+++ b/res/layout/activity_player_fragment.xml
@@ -20,6 +20,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/header_action_bar_color"
     android:orientation="vertical">
 
     <include
diff --git a/res/layout/audio_player_header_bar.xml b/res/layout/audio_player_header_bar.xml
index 00ac30ba377a98c7df99360e304ed88619e4ff9e..68df30cf322552db3dd882745b24dfcca12bf887 100644
--- a/res/layout/audio_player_header_bar.xml
+++ b/res/layout/audio_player_header_bar.xml
@@ -21,7 +21,7 @@
     android:orientation="horizontal"
     android:paddingStart="@dimen/header_bar_padding_left"
     android:elevation="@dimen/action_bar_elevation"
-    android:background="@android:color/transparent">
+    android:background="@color/header_action_bar_color">
 
     <LinearLayout
         android:id="@+id/header_bar_button_container"
@@ -37,6 +37,7 @@
             android:layout_height="@dimen/header_bar_button_height"
             android:layout_gravity="center_vertical"
             android:layout_weight="0"
+            android:tint="@color/player_action_bar_title_text_color"
             android:background="@drawable/selectable_background"
             android:src="@drawable/btn_add_to_playlist"
             android:scaleType="centerInside" />
@@ -47,6 +48,7 @@
             android:layout_height="@dimen/header_bar_button_height"
             android:layout_gravity="center_vertical"
             android:layout_weight="0"
+            android:tint="@color/player_action_bar_title_text_color"
             android:background="@drawable/selectable_background"
             android:src="@drawable/ic_action_search"
             android:scaleType="centerInside" />
@@ -57,6 +59,7 @@
             android:layout_height="@dimen/header_bar_button_height"
             android:layout_gravity="center_vertical"
             android:layout_weight="0"
+            android:tint="@color/player_action_bar_title_text_color"
             android:scaleType="centerInside"
             android:background="@drawable/selectable_background"
             android:src="@drawable/menu_button_light"/>
@@ -78,7 +81,7 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:textAllCaps="true"
-                android:textColor="@color/header_action_bar_text_color"
+                android:textColor="@color/player_action_bar_title_text_color"
                 android:textSize="@dimen/text_size_medium"
                 android:textStyle="bold" />
 
@@ -90,7 +93,7 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:textAllCaps="true"
-                android:textColor="@color/header_action_bar_text_color"
+                android:textColor="@color/player_action_bar_subtitle_text_color"
                 android:textSize="@dimen/text_size_micro" />
     </LinearLayout>
 </RelativeLayout>
diff --git a/res/layout/bottom_action_bar.xml b/res/layout/bottom_action_bar.xml
index beb6bc2518186f20ff33ec55bcbfbd4be682e47b..122bdccff5a6e50dd07687e668275661908ca554 100644
--- a/res/layout/bottom_action_bar.xml
+++ b/res/layout/bottom_action_bar.xml
@@ -24,7 +24,7 @@
     android:clickable="true"
     android:orientation="horizontal"
     android:elevation="@dimen/action_bar_elevation"
-    android:background="@android:color/transparent"
+    android:background="@color/transparent"
     tools:ignore="ContentDescription" >
 
     <org.lineageos.eleven.widgets.SquareImageView
diff --git a/res/layout/fragment_music_browser_phone.xml b/res/layout/fragment_music_browser_phone.xml
index 9f69b23b0a53e6e5405d7d2d469f61d78ca6bcb5..9063de1a9ab9553b9c3e6c4b9af475c6d2fdef76 100644
--- a/res/layout/fragment_music_browser_phone.xml
+++ b/res/layout/fragment_music_browser_phone.xml
@@ -29,6 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/tpi_height"
             android:elevation="@dimen/action_bar_elevation"
+            android:textColor = "@color/colorControlNormal"
             style="@style/HeaderTabTextStyle" />
 
         <android.support.v4.view.ViewPager
diff --git a/res/layout/header_bar.xml b/res/layout/header_bar.xml
index e46f91dfbd662cfabdf22db3c22410621661b903..5c9f4aab8ce9f5c75745de011466a52531702c26 100644
--- a/res/layout/header_bar.xml
+++ b/res/layout/header_bar.xml
@@ -23,6 +23,7 @@
     android:paddingStart="@dimen/drag_and_drop_width"
     android:background="@color/header_action_bar_color"
     android:elevation="@dimen/action_bar_elevation"
+    android:backgroundTint="@color/header_action_bar_color"
     android:theme="@style/ToolBarTheme">
 
     <ImageView
@@ -31,6 +32,8 @@
         android:layout_height="@dimen/header_bar_button_height"
         android:layout_gravity="center_vertical"
         android:layout_weight="0"
+        android:visibility="gone"
+        android:tint="@color/header_action_bar_text_color"
         android:scaleType="centerCrop"
         android:background="@drawable/selectable_background"
         android:src="@drawable/btn_header_collapse"/>
@@ -43,7 +46,7 @@
         android:ellipsize="end"
         android:singleLine="true"
         android:textAllCaps="true"
-        android:textColor="@color/header_action_bar_text_color"
+        android:textColor="@color/player_action_bar_title_text_color"
         android:textSize="@dimen/text_size_medium"
         android:textStyle="bold" />
 
@@ -53,6 +56,7 @@
         android:layout_height="@dimen/header_bar_button_height"
         android:layout_gravity="center_vertical"
         android:layout_weight="0"
+        android:tint="@color/player_action_bar_title_text_color"
         android:src="@drawable/ic_action_search"
         android:background="@drawable/selectable_background"
         android:scaleType="centerInside" />
@@ -64,6 +68,7 @@
         android:layout_gravity="center_vertical"
         android:layout_weight="0"
         android:scaleType="centerInside"
+        android:tint="@color/player_action_bar_title_text_color"
         android:background="@drawable/selectable_background"
         android:src="@drawable/menu_button_light"/>
 
diff --git a/res/layout/main_playback_controls.xml b/res/layout/main_playback_controls.xml
index 61f4ec42d174a8df8ff7cfbaf604cbde293b5efa..0778fef96e397306b7b3572a76247a97e7f4c033 100644
--- a/res/layout/main_playback_controls.xml
+++ b/res/layout/main_playback_controls.xml
@@ -24,7 +24,7 @@
     card_view:contentPadding="@dimen/audio_player_controls_card_content_padding"
     card_view:cardElevation="@dimen/audio_player_controls_card_elevation"
     card_view:cardUseCompatPadding="true"
-    card_view:cardBackgroundColor="@color/semitransparent_black" >
+    card_view:cardBackgroundColor="@color/header_action_bar_color" >
     <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="fill_parent" >
@@ -37,7 +37,7 @@
             android:layout_centerInParent="true"
             android:background="@drawable/fab_accent"
             android:gravity="center_horizontal"
-            layout="@layout/play_pause_progress_button" />
+            layout="@layout/play_pause_progress_button_player_control" />
 
         <!-- This is the left side of the progress bar - it has the previous
         and shuffle button and the current time text -->
diff --git a/res/layout/play_pause_progress_button_player_control.xml b/res/layout/play_pause_progress_button_player_control.xml
new file mode 100644
index 0000000000000000000000000000000000000000..40c7fdbe48bfe556cdd1f3e1fcaedb7388361297
--- /dev/null
+++ b/res/layout/play_pause_progress_button_player_control.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<org.lineageos.eleven.widgets.PlayPauseProgressButton
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/playPauseProgressButton"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone">
+
+    <!-- TODO: Figure out why scaleType: centerInside isn't properly scaling up -->
+    <org.lineageos.eleven.widgets.PlayPauseButton
+        android:id="@+id/action_button_play"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_gravity="center"
+        android:contentDescription="@string/accessibility_play"
+        android:tint="@color/player_control_color"
+        android:focusable="true"
+        android:scaleType="centerCrop"
+        android:src="@drawable/btn_playback_play_player_control"
+        android:background="@color/accent" />
+
+    <ProgressBar
+        android:id="@+id/progressBarBackground"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clickable="false"
+        android:indeterminate="false"
+        android:max="1000"
+        android:progress="1000"
+        android:progressDrawable="@drawable/circular_drawable_background_player_control" />
+
+    <ProgressBar
+        android:id="@+id/circularProgressBar"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clickable="false"
+        android:indeterminate="false"
+        android:max="1000"
+        android:progressDrawable="@drawable/circular_drawable_player_control" />
+
+</org.lineageos.eleven.widgets.PlayPauseProgressButton>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index eba310fd988eff6d4da6edcd4ab6cc7bed98c480..7d4ee0fe4c737c188c17f2f403ec5c1359a7fe8b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,7 +16,7 @@
      limitations under the License.
 --><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Musica</string>
-    <string name="page_recent">Recente</string>
+    <string name="page_recent">Recenti</string>
     <string name="page_artists">Artisti</string>
     <string name="page_albums">Album</string>
     <string name="page_songs">Canzoni</string>
@@ -25,18 +25,18 @@
     <string name="page_now_playing">In riproduzione</string>
     <string name="page_play_queue">Coda di riproduzione</string>
     <string name="header_albums">Album</string>
-    <string name="header_top_songs">Canzoni preferite</string>
-    <string name="header_all_songs">Tutte le canzoni</string>
+    <string name="header_top_songs">Canzoni Top</string>
+    <string name="header_all_songs">Tutte le Canzoni</string>
     <string name="menu_settings">Impostazioni</string>
     <string name="menu_search">Cerca</string>
     <string name="menu_shuffle_item">Riproduzione casuale</string>
-    <string name="menu_shuffle_all">Riproduzione casuale canzoni</string>
-    <string name="menu_shuffle_playlist">Riproduzione casuale playlist</string>
-    <string name="menu_shuffle_album">Riproduzione casuale album</string>
-    <string name="menu_shuffle_artist">Riproduzione casuale artista</string>
-    <string name="menu_shuffle_top_tracks">Riproduzione casuale delle canzoni più ascoltate</string>
-    <string name="menu_shuffle_recent">Riproduzione casuale delle canzoni più recenti</string>
-    <string name="menu_shuffle_last_added">Riproduzione casuale nuove canzoni</string>
+    <string name="menu_shuffle_all">Riproduci tutte casualmente</string>
+    <string name="menu_shuffle_playlist">Riproduci casualmente le playlist</string>
+    <string name="menu_shuffle_album">Riproduci casualmente gli album</string>
+    <string name="menu_shuffle_artist">Riproduci casualmente gli artisti</string>
+    <string name="menu_shuffle_top_tracks">Riproduci casualmente le canzoni top</string>
+    <string name="menu_shuffle_recent">Riproduci casualmente le canzoni più recenti</string>
+    <string name="menu_shuffle_last_added">Riproduci casualmente le ultime canzoni aggiunte</string>
     <string name="menu_play_all">Riproduci tutto</string>
     <string name="menu_sort_by">Ordina per</string>
     <string name="menu_clear_list">Elimina lista</string>
@@ -54,14 +54,14 @@
     <string name="sort_order_entry_album">Album</string>
     <string name="sort_order_entry_year">Anno</string>
     <string name="sort_order_entry_duration">Durata</string>
-    <string name="sort_order_entry_date_added">Data aggiunta</string>
+    <string name="sort_order_entry_date_added">Data di aggiunta</string>
     <string name="sort_order_entry_track_list">Elenco brani</string>
     <string name="sort_order_entry_number_of_songs">Numero canzoni</string>
-    <string name="sort_order_entry_number_of_albums">Numero album</string>
+    <string name="sort_order_entry_number_of_albums">Numero di album</string>
     <string name="sort_order_entry_filename">Nome file</string>
-    <string name="playlist_last_added">Aggiunti recentemente</string>
-    <string name="playlist_recently_played">Ascoltati di recente</string>
-    <string name="playlist_top_tracks">Canzoni preferite</string>
+    <string name="playlist_last_added">Aggiunte recentemente</string>
+    <string name="playlist_recently_played">Ascoltate di recente</string>
+    <string name="playlist_top_tracks">Le mie canzoni Top</string>
     <string name="new_playlist">Nuova playlist</string>
     <string name="save">Salva</string>
     <string name="cancel">Annulla</string>
@@ -69,18 +69,18 @@
     <string name="clear">Annulla</string>
     <string name="new_playlist_name_template">Playlist <xliff:g id="number">%d</xliff:g></string>
     <string name="create_playlist_prompt">Nome playlist</string>
-    <string name="delete_dialog_title">Eliminare <xliff:g example="album" id="item">%s</xliff:g>\?</string>
-    <string name="clear_top_tracks_title">Eliminare le canzoni preferite?</string>
-    <string name="clear_recent_title">Eliminare riprodotti recentemente?</string>
-    <string name="clear_last_added">Eliminare aggiunti recentemente?</string>
+    <string name="delete_dialog_title">Elimino <xliff:g example="album" id="item">%s</xliff:g>\?</string>
+    <string name="clear_top_tracks_title">Elimino le canzoni top\?</string>
+    <string name="clear_recent_title">Elimino le canzoni riprodotte recentemente\?</string>
+    <string name="clear_last_added">Elimino le canzoni aggiunte di recente\?</string>
     <string name="cannot_be_undone">Quest\'azione non può essere annullata</string>
-    <string name="delete_warning">Le immagini memorizzate nella cache verranno eliminate permanentemente</string>
+    <string name="delete_warning">Le immagini memorizzate nella cache verranno eliminate definitivamente</string>
     <string name="new_photo">Scegli foto dalla galleria</string>
     <string name="google_search">Ricerca Google</string>
-    <string name="use_default">Usa foto predefinita</string>
-    <string name="old_photo">Usa foto vecchia</string>
+    <string name="use_default">Utilizzo foto predefinita</string>
+    <string name="old_photo">Utilizzo foto precedente</string>
     <string name="context_menu_play_selection">Riproduci</string>
-    <string name="context_menu_play_next">Riproduci dopo</string>
+    <string name="context_menu_play_next">Riproduci la prossima</string>
     <string name="context_menu_play_album">Riproduci album</string>
     <string name="context_menu_more_by_artist">Altri dell\'artista</string>
     <string name="context_menu_rename_playlist">Rinomina</string>
@@ -96,10 +96,10 @@
     <string name="accessibility_next">Successivo</string>
     <string name="accessibility_prev">Precedente</string>
     <string name="accessibility_shuffle">Riproduzione casuale</string>
-    <string name="accessibility_shuffle_all">Riproduzione casuale</string>
+    <string name="accessibility_shuffle_all">Riproduci tutte casualmente</string>
     <string name="accessibility_repeat">Ripeti</string>
     <string name="accessibility_repeat_all">Ripeti tutto</string>
-    <string name="accessibility_repeat_one">Ripeti singolo</string>
+    <string name="accessibility_repeat_one">Ripeti una</string>
     <string name="accessibility_queue">Apri coda</string>
     <string name="accessibility_browse">Sfoglia musica</string>
     <string name="set_as_ringtone">\'<xliff:g example="Alarm Bell" id="name">%s</xliff:g>\' impostato come suoneria</string>
@@ -108,40 +108,40 @@
     <string name="settings_storage_category">Archivio</string>
     <string name="settings_data_category">Dati</string>
     <string name="settings_delete_cache_title">Cancella cache</string>
-    <string name="settings_delete_cache_summary">Rimuovi immagini memorizzate in cache</string>
-    <string name="settings_download_only_on_wifi_title">Scarica solo con Wi-Fi</string>
-    <string name="settings_download_only_on_wifi_summary">Per ridurre i costi dell\'operatore, non scaricare usando la rete mobile</string>
+    <string name="settings_delete_cache_summary">Rimuovi le immagini presenti in cache</string>
+    <string name="settings_download_only_on_wifi_title">Scarica solo tramite Wi-Fi</string>
+    <string name="settings_download_only_on_wifi_summary">Per ridurre i costi operatore, non scaricare utilizzando la rete mobile</string>
     <string name="settings_download_missing_artwork_title">Scarica copertina album mancante</string>
     <string name="settings_download_artist_images_title">Scarica immagine artista mancante</string>
     <string name="settings_general_category">Generale</string>
-    <string name="settings_show_music_visualization_title">Mostra visualizzatore musicale</string>
-    <string name="settings_show_lyrics_title">Visualizza testo canzone</string>
+    <string name="settings_show_music_visualization_title">Mostra una visualizzazione della musica</string>
+    <string name="settings_show_lyrics_title">Visualizza testo della canzone</string>
     <string name="settings_show_lyrics_summary">Per le canzoni che hanno un file srt</string>
-    <string name="settings_shake_to_play">Scuoti per riprodurre</string>
-    <string name="settings_shake_to_play_summary">Scuoti il dispositivo per riprodurre la prossima canzone</string>
-    <string name="settings_lockscreen_album_art">Cover schermata sblocco</string>
-    <string name="settings_lockscreen_album_art_summary">Sostituisci lo sfondo del blocco schermo con la copertina dell\'album</string>
+    <string name="settings_shake_to_play">Agita per riprodurre</string>
+    <string name="settings_shake_to_play_summary">Agita il dispositivo per riprodurre la prossima canzone</string>
+    <string name="settings_lockscreen_album_art">Cover come schermata di sblocco</string>
+    <string name="settings_lockscreen_album_art_summary">Sostituisci lo sfondo della schermata di sblocco con la copertina dell\'album</string>
     <string name="app_widget_small">Musica: 4 \u00d7 1</string>
     <string name="app_widget_large">Musica: 4 \u00d7 2</string>
     <string name="app_widget_large_alt">Musica: 4 \u00d7 2 (alternativo)</string>
     <string name="app_widget_recent">Musica: ascoltati recentemente</string>
-    <string name="no_effects_for_you">L\'equalizzazione non può essere aperto.</string>
-    <string name="empty_music">Per copiare musica dal tuo computer al tuo dispositivo, utilizza un cavo USB.</string>
+    <string name="no_effects_for_you">Non riesco ad aprire l\'equalizzatore.</string>
+    <string name="empty_music">Per copiare la musica dal computer al dispositivo, utilizza un cavo USB.</string>
     <string name="empty_search">La ricerca non ha prodotto risultati</string>
-    <string name="empty_search_check">Controlla l\'ortografia oppure prova una parola diversa.</string>
-    <string name="empty_favorite">Le canzoni segnate come preferite saranno mostrate qui.</string>
+    <string name="empty_search_check">Controlla l\'ortografia oppure prova con una parola differente.</string>
+    <string name="empty_favorite">Qui troverai le canzoni che segnali come preferite.</string>
     <string name="empty_recent_main">Nessuna canzone recente</string>
-    <string name="empty_recent">Le canzoni che hai ascoltato recentemente saranno mostrate qui.</string>
+    <string name="empty_recent">Qui troverai le canzoni ascoltate di recente.</string>
     <string name="empty_playlist_main">Nessuna canzone nella playlist</string>
-    <string name="empty_playlist_secondary">Per aggiungere canzoni a questa playlist tocca il menu opzioni su una canzone, album o artista e seleziona \"Aggiungi alla playlist\".</string>
+    <string name="empty_playlist_secondary">Per aggiungere canzoni alla playlist tocca il menu opzioni di una canzone, album o artista e seleziona \"Aggiungi alla playlist\".</string>
     <string name="empty_top_tracks_main">Nessuna canzone preferita</string>
-    <string name="empty_top_tracks_secondary">Le canzoni che ascolterai di più verranno mostrate qui.</string>
+    <string name="empty_top_tracks_secondary">Qui troverai le canzoni che ascolti più spesso.</string>
     <string name="empty_last_added_main">Nessuna canzone aggiunta recentemente</string>
-    <string name="empty_last_added">Le canzoni che aggiunte lo scorso mese saranno mostrate qui.</string>
+    <string name="empty_last_added">Qui troverai le canzoni aggiunte nell\'ultimo mese.</string>
     <string name="empty_generic_main">Nessuna canzone trovata</string>
-    <string name="empty_generic_secondary">Per copiare musica dal tuo computer al dispositivo, utilizza un cavo USB.</string>
+    <string name="empty_generic_secondary">Per copiare la musica dal computer al dispositivo, utilizza un cavo USB.</string>
     <string name="empty_queue_main">Nessuna canzone nella coda di riproduzione</string>
-    <string name="empty_queue_secondary">Per aggiungere canzoni alla tua coda di riproduzione, tocca il menu di opzioni su una canzone, un album o un artista e seleziona \"Aggiungi alla coda\".</string>
+    <string name="empty_queue_secondary">Per aggiungere canzoni alla coda di riproduzione, tocca il menu opzioni di una canzone, album o artista e seleziona \"Aggiungi alla coda\".</string>
     <string name="error_playing_track">Impossibile riprodurre la traccia %1$s</string>
     <string name="header_unknown_year">Anno sconosciuto</string>
     <string name="header_less_than_30s">Meno di 30 secondi</string>
@@ -160,18 +160,18 @@
     <string name="header_10_plus_songs">10+ canzoni</string>
     <string name="header_5_plus_albums">5+ album</string>
     <string name="header_other">"Altro"</string>
-    <string name="footer_search_artists">Visualizza tutti gli artisti</string>
-    <string name="footer_search_albums">Visualizza tutti gli album</string>
-    <string name="footer_search_songs">Visualizza tutte le canzoni</string>
-    <string name="footer_search_playlists">Visualizza tutte le playlist</string>
+    <string name="footer_search_artists">Mostra tutti gli artisti</string>
+    <string name="footer_search_albums">Mostra tutti gli album</string>
+    <string name="footer_search_songs">Mostra tutte le canzoni</string>
+    <string name="footer_search_playlists">Mostra tutte le playlist</string>
     <string name="searchHint">Cerca musica</string>
-    <string name="search_title_artists">Tutti gli artisti \"%s\"</string>
-    <string name="search_title_albums">Tutti gli album \"%s\"</string>
-    <string name="search_title_songs">Tutte le canzoni \"%s\"</string>
-    <string name="search_title_playlists">Tutte le playlist \"%s\"</string>
+    <string name="search_title_artists">Tutti e \"%s\" gli artisti</string>
+    <string name="search_title_albums">Tutti e \"%s\" gli album</string>
+    <string name="search_title_songs">Tutte e \"%s\" le canzoni</string>
+    <string name="search_title_playlists">Tutte e \"%s\" le playlist</string>
     <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
     <string name="channel_music">Riproduzione musicale</string>
-    <string name="preferences_privacy_policy">Norme sulla privacy</string>
+    <string name="preferences_privacy_policy">Privacy policy</string>
     <string name="preferences_build_version">Versione Build</string>
     <string name="preferences_app_info">Music è un Music Player Open Source per Android</string>
     <string name="preferences_app_info_title">Informazioni su Music</string>
@@ -181,4 +181,4 @@
     <string name="preferences_licence">Licenza</string>
     <string name="preferences_source_code">Codice sorgente</string>
     <string name="preferences_authors">Autori</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a0322636619a89799705e9868c452ce65f00688e..8e9aa9ed7ae36a4ed60991366cbbc6866b8c7fcd 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,8 +16,8 @@
 -->
 <resources>
     <!-- Material -->
-    <color name="primary">#333333</color>
-    <color name="primary_dark">#212121</color>
+<!--    <color name="primary">#333333</color>-->
+<!--    <color name="primary_dark">#212121</color>-->
     <color name="primary_light">#424242</color>
     <color name="accent">#E91E63</color>
 
@@ -63,10 +63,11 @@
 
     <!-- Color for the action bar -->
     <color name="header_action_bar_color">@color/primary</color>
-    <color name="header_action_bar_text_color">#f5f5f5</color>
-    <color name="header_action_bar_text_color_active">#ffffff</color>
+    <color name="header_action_bar_text_color">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="header_action_bar_text_color_active">@lineageos.platform:color/color_default_primary_text</color>
     <color name="bottom_action_bar_text_color">@color/default_text_color_light</color>
 
+
     <!-- Background color used on some page headers -->
     <color name="page_header_background">@color/white</color>
 
@@ -90,7 +91,7 @@
     <!-- Top title page colors -->
     <color name="tab_ripple_color">@color/white</color>
     <color name="tab_accent_color">@color/white</color>
-    <color name="tab_selected_underline_color">@color/white</color>
+    <color name="tab_selected_underline_color">@color/lineage_blue_color</color>
 
     <!-- Search Colors -->
     <color name="search_hint_color">@color/white</color>
@@ -99,9 +100,13 @@
     <color name="audio_player_text_color">@color/default_text_color_light</color>
 
     <!-- Color for the Progress bar -->
-    <color name="circular_progress_bar_background">#40ffffff</color>
+    <color name="circular_progress_bar_background">@color/transparent_white</color>
     <color name="circular_progress_bar">@color/white</color>
 
+    <!-- Color for the Progress bar -->
+    <color name="circular_progress_bar_background_player_control">@color/player_control_background_color</color>
+    <color name="circular_progress_bar_player_control">@color/lineage_blue_color</color>
+
     <!-- search no results text color -->
     <color name="no_results">@color/black</color>
     <color name="no_results_light">@color/white</color>
@@ -163,9 +168,34 @@
     <color name="grid_items_normal_line_one">@color/cardOne</color>
     <color name="grid_items_normal_line_two">@color/cardTwo</color>
     <color name="position_number_color">@color/white</color>
-    <color name="audio_player_lyrics_text_color">@color/white</color>
-    <color name="audio_player_current_time_color">@color/white</color>
-    <color name="audio_player_total_time_color">@color/white</color>
     <color name="number_of_songs_text_color">@color/white</color>
-    <color name="duration_text_color">@color/white</color>
+    <color name="duration_text_color">@color/player_control_color</color>
+
+<!--****eOS colors****-->
+    <color name="lineage_blue_color">@lineageos.platform:color/color_default_blue1</color>
+    <color name="primary">@lineageos.platform:color/color_default_primary</color>
+    <color name="primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
+
+    <color name="main_action_bar_text_color">@lineageos.platform:color/color_default_primary_text</color>
+    <!--Menu icon color-->
+    <color name="colorControlNormal">@lineageos.platform:color/color_default_primary_text</color>
+
+
+    <!--    Player-->
+    <color name="player_action_bar_color">@color/primary</color>
+    <color name="player_action_bar_title_text_color">@color/main_action_bar_text_color</color>
+    <color name="player_action_bar_subtitle_text_color">@color/header_action_bar_text_color</color>
+
+    <color name="player_control_color">@color/header_action_bar_text_color</color>
+    <color name="player_control_background_color">@color/header_action_bar_text_color</color>
+
+    <color name="audio_player_seeker_progress_color">@color/player_control_color</color>
+    <color name="audio_player_seeker_progress_background_color">@color/player_control_background_color</color>
+    <color name="audio_player_seeker_thumb_color">@color/player_control_color</color>
+
+    <color name="audio_player_lyrics_text_color">@color/player_control_color</color>
+    <color name="audio_player_current_time_color">@color/player_control_color</color>
+    <color name="audio_player_total_time_color">@color/player_control_color</color>
+
+    <!--****eOS colors****-->
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b942e5ebbbed1e39194297f083f752af4e9f98bd..83495aef56df3e65334c72651df005280be2a9c1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -192,7 +192,11 @@
         <item name="android:textSize">@dimen/tab_text_size</item>
     </style>
 
-    <style name="ToolBarTheme" parent="android:style/ThemeOverlay.Material.Dark.ActionBar" />
+    <style name="ToolBarTheme" parent="android:style/ThemeOverlay.Material.Dark.ActionBar" >
+        <item name="android:colorControlNormal">@color/colorControlNormal</item>
+
+    </style>
+
 
     <style name="ToolBarPopupTheme" parent="android:style/Theme.Material.Light" />
 </resources>
diff --git a/src/org/lineageos/eleven/adapters/PlaylistAdapter.java b/src/org/lineageos/eleven/adapters/PlaylistAdapter.java
index 13c152c6a47cc7e71d24f1efea0276c62efcc5b5..975cffe31099c16a1d4212662c52dd066c0b35b0 100644
--- a/src/org/lineageos/eleven/adapters/PlaylistAdapter.java
+++ b/src/org/lineageos/eleven/adapters/PlaylistAdapter.java
@@ -14,7 +14,6 @@
 package org.lineageos.eleven.adapters;
 
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.graphics.drawable.DrawableCompat;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/org/lineageos/eleven/provider/SongPlayCount.java b/src/org/lineageos/eleven/provider/SongPlayCount.java
index 5dfaaa62b68f8ef89b914b3596775ea4cd4620bd..ffd3be413e4618090bd634a4b0d87bc714e1d975 100644
--- a/src/org/lineageos/eleven/provider/SongPlayCount.java
+++ b/src/org/lineageos/eleven/provider/SongPlayCount.java
@@ -24,7 +24,6 @@ import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Interpolator;
 
 import java.util.HashSet;
-import java.util.Iterator;
 
 /**
  * This database tracks the number of play counts for an individual song.  This is used to drive
diff --git a/src/org/lineageos/eleven/ui/activities/BaseActivity.java b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
index 7e5cf8bf46149fae03ff76765d04dcde1b3d23d7..520a722a6c42691b878f3cfddd886e519b519b54 100644
--- a/src/org/lineageos/eleven/ui/activities/BaseActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
@@ -22,6 +22,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
@@ -189,6 +190,13 @@ public abstract class BaseActivity extends FragmentActivity implements ServiceCo
         // Settings
         getMenuInflater().inflate(R.menu.activity_base, menu);
 
+        for(int i = 0; i < menu.size(); i++){
+            Drawable drawable = menu.getItem(i).getIcon();
+            if(drawable != null) {
+                drawable.mutate();
+                drawable.setColorFilter(getResources().getColor(R.color.colorControlNormal), PorterDuff.Mode.SRC_ATOP);
+            }
+        }
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -292,8 +300,12 @@ public abstract class BaseActivity extends FragmentActivity implements ServiceCo
 
         if (mActionBarBackground == null) {
             final int actionBarColor = getResources().getColor(R.color.header_action_bar_color);
+            final int actionBarTextColor = getResources().getColor(R.color.main_action_bar_text_color);
+
             mActionBarBackground = new ColorDrawable(actionBarColor);
           //  mToolBar.setBackgroundDrawable(mActionBarBackground);
+            mToolBar.setBackground(mActionBarBackground);
+            mToolBar.setTitleTextColor(actionBarTextColor);
         }
     }
 
diff --git a/src/org/lineageos/eleven/ui/activities/HomeActivity.java b/src/org/lineageos/eleven/ui/activities/HomeActivity.java
index 5689111075a79585293ec2a79c736e06abad16a0..d17821c2a513348d25b7c6bf427c8f2ccf9b98b8 100644
--- a/src/org/lineageos/eleven/ui/activities/HomeActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/HomeActivity.java
@@ -41,7 +41,6 @@ import android.util.TypedValue;
 import android.view.MenuItem;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.Toolbar;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
diff --git a/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java b/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
index ba74310a3a04dd8d0c541691b1f1adae2185056b..53098a4398500c2f12869698270e4d7d92e54d21 100644
--- a/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
@@ -14,7 +14,6 @@
 package org.lineageos.eleven.ui.activities;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.ColorInt;
@@ -47,6 +46,7 @@ import org.lineageos.eleven.widgets.BlurScrimImage;
 public abstract class SlidingPanelActivity extends BaseActivity {
 
     private int accentColor;
+    private LinearLayout slideIndicator;
 
     public enum Panel {
         Browse,
@@ -157,6 +157,7 @@ public abstract class SlidingPanelActivity extends BaseActivity {
 
     private void setupSecondPanel() {
         mSecondPanel = (SlidingUpPanelLayout)findViewById(R.id.sliding_layout2);
+        slideIndicator = (LinearLayout)findViewById(R.id.indicator);
         mSecondPanel.setBackgroundColor(accentColor);
         mSecondPanel.setPanelSlideListener(new SimplePanelSlideListener() {
             @Override
@@ -166,13 +167,14 @@ public abstract class SlidingPanelActivity extends BaseActivity {
                 if (mTargetNavigatePanel == Panel.None) {
                     mFirstPanel.setSlidingEnabled(false);
                 }
-
+                slideIndicator.setVisibility(View.VISIBLE);
                 onSlide(slideOffset);
             }
 
             @Override
             public void onPanelExpanded(View panel) {
                 checkTargetNavigation();
+                slideIndicator.setVisibility(View.INVISIBLE);
             }
 
             @Override
@@ -180,6 +182,7 @@ public abstract class SlidingPanelActivity extends BaseActivity {
                 // re-enable sliding when the second panel is collapsed
                 mFirstPanel.setSlidingEnabled(true);
                 checkTargetNavigation();
+                slideIndicator.setVisibility(View.VISIBLE);
             }
         });
 
diff --git a/src/org/lineageos/eleven/ui/fragments/PlaylistFragment.java b/src/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
index 3ce96f9ab79549009332ac94cf73697c30f8517d..3c42d42b3b2930c4fb8b581576f66b758f2fc51b 100644
--- a/src/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
@@ -43,7 +43,6 @@ import org.lineageos.eleven.ui.fragments.phone.MusicBrowserFragment;
 import org.lineageos.eleven.utils.NavUtils;
 import org.lineageos.eleven.utils.PlaylistPopupMenuHelper;
 import org.lineageos.eleven.utils.PopupMenuHelper;
-import org.lineageos.eleven.widgets.IPopupMenuCallback;
 import org.lineageos.eleven.widgets.LoadingEmptyContainer;
 
 import java.util.Collections;
diff --git a/src/org/lineageos/eleven/widgets/ViewPagerTabs.java b/src/org/lineageos/eleven/widgets/ViewPagerTabs.java
index 4edd50028b2763c2243551ca57df904ec2a1db27..e460a5f76ef12e884158ba628155e121616d9585 100644
--- a/src/org/lineageos/eleven/widgets/ViewPagerTabs.java
+++ b/src/org/lineageos/eleven/widgets/ViewPagerTabs.java
@@ -33,7 +33,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.lineageos.eleven.R;
-import org.lineageos.eleven.ui.activities.HomeActivity;
 
 /**
  * Lightweight implementation of ViewPager tabs. This looks similar to traditional actionBar tabs,
@@ -128,7 +127,7 @@ public class ViewPagerTabs extends HorizontalScrollView implements ViewPager.OnP
         mTextAllCaps = a.getBoolean(3, false);
 
         mTabStrip = new ViewPagerTabStrip(context);
-        mTabStrip.setBackgroundColor(HomeActivity.accentColor);
+        mTabStrip.setBackgroundColor(getResources().getColor(R.color.header_action_bar_color));
         addView(mTabStrip, new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT));
         a.recycle();