diff --git a/AndroidManifest-gradle.xml b/AndroidManifest-gradle.xml
index 8a8e6fcf856f4c4745f3d75237ce3f4731003ff1..b9d2e756dbdbebb34eeea9f5330001cd41d96819 100644
--- a/AndroidManifest-gradle.xml
+++ b/AndroidManifest-gradle.xml
@@ -118,7 +118,8 @@
         <!-- Used to set options -->
         <activity
             android:name="org.lineageos.eleven.ui.activities.SettingsActivity"
-            android:label="@string/menu_settings"/>
+            android:label="@string/menu_settings"
+            android:theme="@style/Eleven.Theme"/>
         <!-- Audio Preview -->
         <activity
             android:name=".ui.activities.preview.AudioPreviewActivity"
diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml
index 628a74f6fabad814c3390f46f63083fb5ff60d89..878189c421042fba3d22c6e362c5c50e58aadc6c 100644
--- a/res/layout/activity_base.xml
+++ b/res/layout/activity_base.xml
@@ -54,7 +54,7 @@
         android:gravity="bottom"
         sothree:fadeColor="@color/transparent"
         sothree:directOffset="true"
-        sothree:panelHeight="@dimen/sliding_panel_indicator_height"
+        sothree:panelHeight="@dimen/sliding_panel_indicator_height_in_upper"
         sothree:dragView="@+id/secondPanelDragArea"
         sothree:shadowHeight="@dimen/sliding_panel_shadow_height">
 
@@ -102,6 +102,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="5dp"
                     android:background="@drawable/rounded_corner_rect">
 
                     <ImageView
@@ -111,8 +112,8 @@
                         android:layout_gravity="center_horizontal"
                         android:scaleType="centerInside"
                         android:tint="@color/white"
-                        android:layout_marginStart="20dp"
-                        android:layout_marginEnd="20dp"
+                        android:layout_marginStart="@dimen/sliding_panel_indicator_height"
+                        android:layout_marginEnd="@dimen/sliding_panel_indicator_height"
                         android:src="@drawable/drag_indicator" />
 
                 </LinearLayout>
diff --git a/res/layout/edit_queue_list_item.xml b/res/layout/edit_queue_list_item.xml
index e6a8624832a577641a18e826d845ab5325897b49..55e2f617a1a9072389f203a916ee064f2ba912cc 100644
--- a/res/layout/edit_queue_list_item.xml
+++ b/res/layout/edit_queue_list_item.xml
@@ -26,7 +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:tint="@color/lineage_blue_color"
         android:src="@drawable/gripper_light" />
 
     <FrameLayout
diff --git a/res/layout/list_item_common.xml b/res/layout/list_item_common.xml
index 383387b2b3e09e57930b53fda636d4986bc5da1d..577171e5b9aec2bce4b8d6790e6be24091d99581 100644
--- a/res/layout/list_item_common.xml
+++ b/res/layout/list_item_common.xml
@@ -49,6 +49,7 @@
             android:id="@+id/now_playing"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:tint="@color/lineage_blue_color"
             android:src="@drawable/now_playing_icon"
             android:visibility="gone" />
 
diff --git a/res/layout/pref_category_view.xml b/res/layout/pref_category_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2926879801cf1e24e4ff02820b250df3510851bc
--- /dev/null
+++ b/res/layout/pref_category_view.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/pref_category_padding"
+    android:paddingEnd="@dimen/pref_category_padding"
+    android:paddingTop="@dimen/pref_category_padding"
+    android:textColor="@color/lineage_blue_color"
+    android:textStyle="bold" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 5bcc2bd3c331503143b64532eaf3ae11259621b7..f38d574fcafa68101b7dc0ed41de4b801dc9a0dc 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -67,6 +67,8 @@
     <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="circular_ring_bg_color">#D6D6D6</color>
+
 
     <!-- Background color used on some page headers -->
     <color name="page_header_background">@color/white</color>
@@ -104,7 +106,7 @@
     <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_background_player_control">@color/circular_ring_bg_color</color>
     <color name="circular_progress_bar_player_control">@color/lineage_blue_color</color>
 
     <!-- search no results text color -->
@@ -186,7 +188,7 @@
     <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_color">@color/header_action_bar_text_color_active</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>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 74e4d71e500271ab573308373cf477e3b4d94bb4..4977a0cc49fa9aa5d42ab0ed14d505b1793b7584 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -169,6 +169,7 @@
 
     <!-- Sliding Panel -->
     <dimen name="sliding_panel_indicator_height">20.0dip</dimen>
+    <dimen name="sliding_panel_indicator_height_in_upper">25.0dip</dimen>
     <dimen name="sliding_panel_shadow_height">0.0dip</dimen>
 
     <!-- Header Bar -->
@@ -218,5 +219,9 @@
     <!-- Audio Player Controls Card -->
     <dimen name="audio_player_controls_card_corner_radius">2dp</dimen>
     <dimen name="audio_player_controls_card_content_padding">8dp</dimen>
-    <dimen name="audio_player_controls_card_elevation">4dp</dimen>
+    <dimen name="audio_player_controls_card_elevation">0dp</dimen>
+
+    <!--Custom Category xml-->
+    <dimen name="pref_category_padding">15dp</dimen>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1ab222028445e85714d43f716cae0ced9e1e70be..822dd102aa2a38f1ab71fe6bd05b748a06840835 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -36,6 +36,10 @@
         <item name="android:homeAsUpIndicator">@lineageos.platform:drawable/ic_back</item>
     </style>
 
+    <style name="TitleBarTextColor" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textColor">@color/main_action_bar_text_color</item>
+    </style>
+
     <style name="ActionBarWidgetTheme" parent="@android:style/Theme.Material">
         <!-- This is the color of the search text hint in the action bar -->
         <item name="android:textColorHint">@color/search_hint_color</item>
@@ -78,6 +82,7 @@
     <!-- Sets the action bar title text style -->
     <style name="ActionBar" parent="@android:style/Widget.Material.ActionBar">
         <item name="android:background">@color/header_action_bar_color</item>
+        <item name="android:titleTextStyle">@style/TitleBarTextColor</item>
     </style>
 
     <!-- Sets the action bar menu icon -->
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 9b7ed84e7653a5067b5b1b030d45b34f81d1a485..24cc8416c2849224036b6a930d6f8a948f663804 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -36,7 +36,8 @@
     <!--android:key="download_missing_artist_images"-->
     <!--android:title="@string/settings_download_artist_images_title" />-->
     <!--</PreferenceCategory>-->
-    <PreferenceCategory android:title="@string/settings_general_category">
+    <PreferenceCategory android:title="@string/settings_general_category"
+        android:layout="@layout/pref_category_view">
 
         <!-- Music visualizer -->
         <SwitchPreference
@@ -66,7 +67,8 @@
             android:title="@string/settings_lockscreen_album_art" />
     </PreferenceCategory>
     <!-- Storage catetory -->
-    <PreferenceCategory android:title="@string/settings_storage_category">
+    <PreferenceCategory android:title="@string/settings_storage_category"
+        android:layout="@layout/pref_category_view">
 
         <!-- Delete cache -->
         <Preference
@@ -76,7 +78,8 @@
     </PreferenceCategory>
 
 
-    <PreferenceCategory android:title="@string/preferences_about_title">
+    <PreferenceCategory android:title="@string/preferences_about_title"
+        android:layout="@layout/pref_category_view">
 
 
         <Preference
diff --git a/src/org/lineageos/eleven/adapters/SongAdapter.java b/src/org/lineageos/eleven/adapters/SongAdapter.java
index f4d308ec3e729622e0d5b3c4f1376676dee9e6b5..989c6665c42d677057c14b1235c79bf25dbcc62c 100644
--- a/src/org/lineageos/eleven/adapters/SongAdapter.java
+++ b/src/org/lineageos/eleven/adapters/SongAdapter.java
@@ -21,6 +21,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
 import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ImageFetcher;
 import org.lineageos.eleven.model.Artist;
 import org.lineageos.eleven.model.Song;
@@ -151,6 +152,7 @@ public class SongAdapter extends ArrayAdapter<Song>
             if (mCurrentQueuePosition == position) {
                 // make it visible
                 playPauseProgressButton.enableAndShow();
+                playPauseProgressButton.setPlayPauseButton(getContext().getResources().getColor(R.color.lineage_blue_color));
                 playPauseContainer.setVisibility(View.VISIBLE);
             } else {
                 // hide it
diff --git a/src/org/lineageos/eleven/ui/activities/SearchActivity.java b/src/org/lineageos/eleven/ui/activities/SearchActivity.java
index 6b130a434ba6f2e19b4186fea979d26ffba0d6eb..8a3dbb92c8d5ec7221203d2def2c649a3eedcf23 100644
--- a/src/org/lineageos/eleven/ui/activities/SearchActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/SearchActivity.java
@@ -48,6 +48,7 @@ import android.widget.AbsListView.OnScrollListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -357,7 +358,7 @@ public class SearchActivity extends FragmentActivity implements
             getSupportLoaderManager().initLoader(HISTORY_LOADER, null, mSearchHistoryCallback);
         }
 
-        actionBar.setBackgroundDrawable(new ColorDrawable(fetchAccentColor(this)));
+        actionBar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.primary)));
     }
 
     /**
@@ -381,6 +382,7 @@ public class SearchActivity extends FragmentActivity implements
         // to this later
         //mListView.setEmptyView(mLoadingEmptyContainer);
 
+
         // load the search history list view
         mSearchHistoryListView = (ListView)findViewById(R.id.list_search_history);
         mSearchHistoryListView.setOnItemClickListener(new OnItemClickListener() {
@@ -443,6 +445,14 @@ public class SearchActivity extends FragmentActivity implements
         ImageView searchIcon = (ImageView)mSearchView.findViewById(searchButtonId);
         searchIcon.setLayoutParams(new LinearLayout.LayoutParams(0, 0));
 
+
+        int id = mSearchView.getContext()
+                .getResources()
+                .getIdentifier("android:id/search_src_text", null, null);
+        EditText searchEditText = (EditText) mSearchView.findViewById(id);
+        searchEditText.setTextColor(getResources().getColor(R.color.header_action_bar_text_color_active));
+        searchEditText.setHintTextColor(getResources().getColor(R.color.header_action_bar_text_color));
+
         searchItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
             @Override
             public boolean onMenuItemActionExpand(MenuItem item) {
diff --git a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java
index d34cc6a8cc8091e5cfd519d97d4e0477e163067e..02bd97e7f994981424c9c0d512f44b576241edd1 100644
--- a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java
@@ -20,7 +20,6 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.pm.PackageManager;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.Preference;
@@ -73,7 +72,7 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref
         } catch (PackageManager.NameNotFoundException e) {
         }
 
-        getActionBar().setBackgroundDrawable(new ColorDrawable(fetchAccentColor(this)));
+//        getActionBar().setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.primary)));
     }
 
     /**
@@ -157,7 +156,7 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref
             Window window = getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
 
-            window.setStatusBarColor(darkenColor(color_accent));
+//            window.setStatusBarColor(darkenColor(color_accent));
         }
 
         return color_accent;
diff --git a/src/org/lineageos/eleven/widgets/PlayPauseProgressButton.java b/src/org/lineageos/eleven/widgets/PlayPauseProgressButton.java
index 9f4eb26adfb1e451c99e6e66d02d2a24983ee63c..9a215873a6c62c2cb715369fe6104a6f531a9709 100644
--- a/src/org/lineageos/eleven/widgets/PlayPauseProgressButton.java
+++ b/src/org/lineageos/eleven/widgets/PlayPauseProgressButton.java
@@ -17,6 +17,7 @@
 package org.lineageos.eleven.widgets;
 
 import android.content.Context;
+import android.graphics.PorterDuff;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.MotionEvent;
@@ -94,6 +95,10 @@ public class PlayPauseProgressButton extends FrameLayout {
         mProgressBar.setRotation(-90);
     }
 
+    public void setPlayPauseButton(int color){
+        mPlayPauseButton.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+    }
+
     /**
      * Enable and shows the container
      */