diff --git a/res/drawable/btn_playback_next.xml b/res/drawable/btn_playback_next.xml
index 80afe5bba9885823b41a0508bf26b8cd6843dc12..01c5a3d9666f91929361adc66500b18883ca384e 100644
--- a/res/drawable/btn_playback_next.xml
+++ b/res/drawable/btn_playback_next.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/player_control_color"
         android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
 </vector>
diff --git a/res/drawable/btn_playback_pause.xml b/res/drawable/btn_playback_pause.xml
index b593b24d5539c154b79f7e8bfba7370d51496d18..4eda34cd4f78c8d41dd21330cce71e88a593c213 100644
--- a/res/drawable/btn_playback_pause.xml
+++ b/res/drawable/btn_playback_pause.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/player_control_color"
         android:pathData="M6 19h4V5H6v14zm8-14v14h4V5h-4z" />
 </vector>
diff --git a/res/drawable/btn_playback_play.xml b/res/drawable/btn_playback_play.xml
index 48333e8342ecb5eff83bad257085e5cc952f37a6..1b6ecd0cc6d9ebf5c5908e2450cdde392b3915df 100644
--- a/res/drawable/btn_playback_play.xml
+++ b/res/drawable/btn_playback_play.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/player_control_color"
         android:pathData="M8 5v14l11-7z" />
 </vector>
diff --git a/res/drawable/btn_playback_play_collapsed.xml b/res/drawable/btn_playback_play_collapsed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eba4931224b2ffc5c94eaaad2b8274d301850fd6
--- /dev/null
+++ b/res/drawable/btn_playback_play_collapsed.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/circular_play_pause_collapsed"
+        android:pathData="M8 5v14l11-7z" />
+</vector>
diff --git a/res/drawable/btn_playback_previous.xml b/res/drawable/btn_playback_previous.xml
index 23ec00ca6c4819903fea4ec2754d9fc9d012d625..34095163fc3dd520b14f053e521a0b3eff08559f 100644
--- a/res/drawable/btn_playback_previous.xml
+++ b/res/drawable/btn_playback_previous.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/player_control_color"
         android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,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..8e9086a563fbe0ef622153de2e128a0d78327c0d 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_control_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/round_corner_rect.xml b/res/drawable/round_corner_rect.xml
new file mode 100644
index 0000000000000000000000000000000000000000..23dce5c108906531e8b1f1c13925582067b45ba8
--- /dev/null
+++ b/res/drawable/round_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>
\ No newline at end of file
diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml
index 8e3541a2dd74165fe532c836202df70d42a514f7..1d80530e92dcea3dda12c4bb7f6053b6711e12bd 100644
--- a/res/layout/activity_base.xml
+++ b/res/layout/activity_base.xml
@@ -93,15 +93,30 @@
                 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/round_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 75b46ff7f461d94b57a6e1deb906f0c816c4fe76..dd9c63caffb5b03cbaeac71c1fab89d7eed77b61 100644
--- a/res/layout/activity_player_fragment.xml
+++ b/res/layout/activity_player_fragment.xml
@@ -24,7 +24,9 @@
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
-    tools:background="@color/blue_dark">
+    tools:background="@color/blue_dark"
+    android:background="@color/player_action_bar_color"
+    >
 
     <include
         android:id="@+id/audio_player_header"
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index 0f7fcc531e3eed54e3cefb8334cd7cdc09c2aad6..ac50270df7dab7b4f943dd28f79deb20eca7304b 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -35,6 +35,6 @@
         android:name="org.lineageos.eleven.ui.activities.SettingsActivity$SettingsFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:tag="org.lineageos.eleven.ui.activities.SettingsActivity$SettingsFragment" />
+        android:tag="org.lineageos2.eleven.ui.activities.SettingsActivity$SettingsFragment" />
 
 </LinearLayout>
diff --git a/res/layout/audio_player_header_bar.xml b/res/layout/audio_player_header_bar.xml
index 7934b106f89aa302e00460d0431d02318ddae64c..781de164b60f4af53dbe36db96033259f4c3942f 100644
--- a/res/layout/audio_player_header_bar.xml
+++ b/res/layout/audio_player_header_bar.xml
@@ -20,7 +20,7 @@
     android:id="@+id/audio_player_header"
     android:layout_width="match_parent"
     android:layout_height="?android:attr/actionBarSize"
-    android:background="@android:color/transparent"
+    android:background="@color/player_action_bar_color"
     android:elevation="@dimen/action_bar_elevation"
     android:theme="@style/ToolBarTheme"
     app:popupTheme="@style/ToolBarPopupTheme"
@@ -42,7 +42,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"
             tools:text="Really long and nice album title" />
@@ -55,7 +55,7 @@
             android:maxLines="1"
             android:paddingBottom="2dp"
             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"
             tools:text="Name of Artist" />
     </LinearLayout>
diff --git a/res/layout/bottom_action_bar.xml b/res/layout/bottom_action_bar.xml
index f564dc1feaf171d0fcc9876f9f7202058d5d499f..3005fbb1e31a4346984fa1df19041a4397578d83 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/lineage_blue_color"
     tools:ignore="ContentDescription" >
 
     <org.lineageos.eleven.widgets.SquareImageView
@@ -63,6 +63,6 @@
             android:contentDescription="@string/accessibility_play"
             android:layout_width="@dimen/bab_progress_size"
             android:layout_height="@dimen/bab_progress_size"
-            layout="@layout/play_pause_progress_button" />
+            layout="@layout/play_pause_progress_button_collapsed" />
     </FrameLayout>
 </LinearLayout>
diff --git a/res/layout/play_pause_progress_button.xml b/res/layout/play_pause_progress_button.xml
index 06b0253179947b7c03c69f7fe4734aa200332bc3..4eecb30abb166b71e207d7ffe0386e4434773625 100644
--- a/res/layout/play_pause_progress_button.xml
+++ b/res/layout/play_pause_progress_button.xml
@@ -28,7 +28,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
-        android:background="@color/accent"
+        android:background="@color/player_control_color"
         android:contentDescription="@string/accessibility_play"
         android:focusable="true"
         android:scaleType="centerCrop"
diff --git a/res/layout/play_pause_progress_button_collapsed.xml b/res/layout/play_pause_progress_button_collapsed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e5c9ab73d9fd7c7d2414098c62c55ff672a979a6
--- /dev/null
+++ b/res/layout/play_pause_progress_button_collapsed.xml
@@ -0,0 +1,51 @@
+<?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.PlayPauseButtonContainer
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/playPauseProgressButton"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone"
+    tools:visibility="visible">
+
+    <org.lineageos.eleven.widgets.PlayPauseButton
+        android:id="@+id/action_button_play"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:background="@color/player_control_color"
+        android:contentDescription="@string/accessibility_play"
+        android:focusable="true"
+        android:tint="@color/circular_play_pause_collapsed"
+        android:scaleType="centerCrop"
+        android:src="@drawable/btn_playback_play_collapsed" />
+
+    <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="100"
+        android:progressTint="@color/white"
+        android:progressBackgroundTint="@color/white"
+        android:progress="100"
+        android:progressDrawable="@drawable/circular_drawable" />
+
+</org.lineageos.eleven.widgets.PlayPauseButtonContainer>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 723839d70646782c88c1317a52a288a09b0c5e10..43b6fddffbb5d1d520f231fc15f6320928192c75 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,10 +16,16 @@
 -->
 <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>-->
+    <color name="primary">@lineageos.platform:color/color_default_primary</color>
+    <color name="primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
     <color name="primary_light">#424242</color>
-    <color name="accent">#E91E63</color>
+    <color name="accent">@lineageos.platform:color/color_default_accent</color>
+    <!--Menu icon color-->
+    <color name="colorControlNormal">@lineageos.platform:color/color_default_primary_text</color>
 
     <!-- Main colors -->
     <color name="black">#333333</color>
@@ -45,11 +51,11 @@
     <color name="blue_dark">#303F9F</color>
 
     <!-- Standard Text Color -->
-    <color name="default_text_color">@color/black</color>
-    <color name="default_text_color_light">@color/white</color>
+    <color name="default_text_color">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="default_text_color_light">@color/primary</color>
 
     <!-- Cards -->
-    <color name="cards_bg_color">#fefefe</color>
+    <color name="cards_bg_color">@lineageos.platform:color/color_default_background</color>
     <color name="cardOne">@color/black</color>
     <color name="cardTwo">#424242</color>
 
@@ -63,9 +69,19 @@
 
     <!-- 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="main_action_bar_text_color">@lineageos.platform:color/color_default_primary_text</color>
+<!--    <color name="header_action_bar_text_color">@lineageos.platform:color/color_default_primary_text</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>
+    <color name="lineage_blue_color">@lineageos.platform:color/color_default_blue1</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>
 
     <!-- Background color used on some page headers -->
     <color name="page_header_background">@color/white</color>
@@ -90,7 +106,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/black</color>
@@ -99,8 +115,9 @@
     <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">@color/white</color>
+    <color name="circular_progress_bar_background">@color/player_control_background_color</color>
+    <color name="circular_progress_bar">@color/player_control_color</color>
+    <color name="circular_play_pause_collapsed">@color/white</color>
 
     <!-- search no results text color -->
     <color name="no_results">@color/black</color>
@@ -163,14 +180,16 @@
     <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>
 
     <!-- audio player main controls -->
-    <color name="audio_player_seeker_progress_color">@color/white</color>
-    <color name="audio_player_seeker_progress_background_color">@color/white</color>
-    <color name="audio_player_seeker_thumb_color">@color/white</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_background_color</color>
+    <color name="audio_player_current_time_color">@color/player_control_background_color</color>
+    <color name="audio_player_total_time_color">@color/player_control_background_color</color>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b64d2929b892b02b7496426a900443783711f844..df10fdadd176c97970e032e3f76333bf85c497f3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -190,7 +190,10 @@
         <item name="android:textSize">@dimen/tab_text_size</item>
     </style>
 
-    <style name="ToolBarTheme" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+    <style name="ToolBarTheme" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar" >
+        <item name="colorControlNormal">@color/colorControlNormal</item>
+
+    </style>
 
     <style name="ToolBarPopupTheme" parent="@style/Theme.AppCompat.Light" />
 
diff --git a/src/org/lineageos/eleven/ui/activities/BaseActivity.java b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
index 0189bb54f5ac1119e9cd6cabf14e170fdcd80ea7..36d612ffce9184689726f10ff984862c576d09eb 100644
--- a/src/org/lineageos/eleven/ui/activities/BaseActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
@@ -276,8 +276,11 @@ public abstract class BaseActivity extends AppCompatActivity implements ServiceC
         if (mActionBarBackground == null) {
             final int actionBarColor = ContextCompat.getColor(this,
                     R.color.header_action_bar_color);
+            final int actionBarTextColor = ContextCompat.getColor(this,
+                    R.color.main_action_bar_text_color);
             mActionBarBackground = new ColorDrawable(actionBarColor);
             mToolBar.setBackground(mActionBarBackground);
+            mToolBar.setTitleTextColor(actionBarTextColor);
         }
     }
 
diff --git a/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java b/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
index 4022fa29e7d1696bd597a9c944dbec4bf4dd0379..1fa87ee8befebf2248f93e2272e12dcb02ff9d38 100644
--- a/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
@@ -46,6 +46,8 @@ import org.lineageos.eleven.widgets.AlbumScrimImage;
  */
 public abstract class SlidingPanelActivity extends BaseActivity {
 
+    private LinearLayout slidingIndicator;
+
     public enum Panel {
         Browse,
         MusicPlayer,
@@ -153,6 +155,7 @@ public abstract class SlidingPanelActivity extends BaseActivity {
 
     private void setupSecondPanel() {
         mSecondPanel = findViewById(R.id.sliding_layout2);
+        slidingIndicator = findViewById(R.id.indicator);
         mSecondPanel.setPanelSlideListener(new SimplePanelSlideListener() {
             @Override
             public void onPanelSlide(View panel, float slideOffset) {
@@ -162,17 +165,20 @@ public abstract class SlidingPanelActivity extends BaseActivity {
                     mFirstPanel.setSlidingEnabled(false);
                 }
 
+                slidingIndicator.setVisibility(View.VISIBLE);
                 onSlide(slideOffset);
             }
 
             @Override
             public void onPanelExpanded(View panel) {
                 checkTargetNavigation();
+                slidingIndicator.setVisibility(View.INVISIBLE);
             }
 
             @Override
             public void onPanelCollapsed(View panel) {
                 // re-enable sliding when the second panel is collapsed
+                slidingIndicator.setVisibility(View.VISIBLE);
                 mFirstPanel.setSlidingEnabled(true);
                 checkTargetNavigation();
             }