diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt
index 4bda1999..29ee5bda 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -154,7 +154,7 @@ abstract class AbsSlidingMusicPanelActivity protected constructor() : AbsMusicSe
     }
 
     override fun onPanelSlide(panel: View?, slideOffset: Float) {
-        bottomNavigationView.translationY = slideOffset * 400
+
         setMiniPlayerAlphaProgress(slideOffset)
     }
 
@@ -197,6 +197,9 @@ abstract class AbsSlidingMusicPanelActivity protected constructor() : AbsMusicSe
         miniPlayerFragment!!.view!!.alpha = alpha
         // necessary to make the views below clickable
         miniPlayerFragment!!.view!!.visibility = if (alpha == 0f) View.GONE else View.VISIBLE
+
+        bottomNavigationView.translationY = progress * 500
+        bottomNavigationView.alpha = alpha
     }
 
     private fun chooseFragmentForTheme() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.kt
index 10d5bcde..8ae233af 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.kt
@@ -8,7 +8,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.widget.SeekBar
-import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
@@ -105,16 +104,12 @@ class MaterialControlsFragment : AbsPlayerControlsFragment() {
         updateShuffleState()
 
 
-        val colorFinal = if (PreferenceUtil.getInstance().adaptiveColor) {
-            color
-        } else {
-            ThemeStore.accentColor(context!!)
+        if (PreferenceUtil.getInstance().adaptiveColor) {
+            lastPlaybackControlsColor = color
+            text.setTextColor(color)
+            TintHelper.setTintAuto(progressSlider, color, false)
         }
 
-        lastPlaybackControlsColor = colorFinal
-        text.setTextColor(colorFinal)
-        TintHelper.setTintAuto(progressSlider, colorFinal, false)
-
         updatePlayPauseColor()
         updatePrevNextColor()
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt
index bd20e266..98e34e7b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt
@@ -46,9 +46,7 @@ class MainSettingsFragment : Fragment(), View.OnClickListener {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        settingsIcons.forEach {
-            view.findViewById<ImageView>(it).setColorFilter(ThemeStore.accentColor(context!!))
-        }
+
         generalSettings.setOnClickListener(this)
         audioSettings.setOnClickListener(this)
         nowPlayingSettings.setOnClickListener(this)
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/ColorIconsImageView.kt b/app/src/main/java/code/name/monkey/retromusic/views/ColorIconsImageView.kt
new file mode 100644
index 00000000..32e7bb14
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/ColorIconsImageView.kt
@@ -0,0 +1,39 @@
+package code.name.monkey.retromusic.views
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatImageView
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.retromusic.R
+
+class ColorIconsImageView : AppCompatImageView {
+
+    constructor(context: Context) : super(context) {
+        init(context, null)
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init(context, attrs)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        init(context, attrs)
+    }
+
+    private fun init(context: Context, attrs: AttributeSet?) {
+        // Load the styled attributes and set their properties
+        val attributes = context.obtainStyledAttributes(attrs, R.styleable.ColorIconsImageView, 0, 0)
+        setIconBackgroundColor(attributes.getColor(R.styleable.ColorIconsImageView_iconBackgroundColor, Color.RED))
+        attributes.recycle()
+    }
+
+    private fun setIconBackgroundColor(color: Int) {
+        setBackgroundResource(R.drawable.color_circle_gradient)
+        backgroundTintList = ColorStateList.valueOf(ColorUtil.adjustAlpha(color, 0.3f))
+        imageTintList = ColorStateList.valueOf(color)
+        requestLayout()
+        invalidate()
+    }
+}
diff --git a/app/src/main/res/drawable/color_progress_seek.xml b/app/src/main/res/drawable/color_progress_seek.xml
index b3c8c52c..314913b8 100755
--- a/app/src/main/res/drawable/color_progress_seek.xml
+++ b/app/src/main/res/drawable/color_progress_seek.xml
@@ -10,7 +10,7 @@
         <scale android:scaleWidth="100%">
             <shape>
                 <corners android:radius="8dp" />
-                <solid android:color="@color/md_red_400" />
+                <solid android:color="@color/md_black_1000" />
             </shape>
         </scale>
     </item>
diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml
index f65a8a85..4fe8314d 100644
--- a/app/src/main/res/layout/fragment_main_settings.xml
+++ b/app/src/main/res/layout/fragment_main_settings.xml
@@ -16,25 +16,24 @@
             android:id="@+id/userInfoContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingStart="12dp"
-            android:paddingTop="12dp"
-            android:paddingEnd="8dp"
-            android:paddingBottom="12dp">
+            android:gravity="center_vertical"
+            android:minHeight="72dp"
+            android:orientation="horizontal">
 
             <code.name.monkey.retromusic.views.CircularImageView
                 android:id="@+id/userImage"
-                android:layout_width="38dp"
-                android:layout_height="38dp"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:layout_marginStart="16dp"
                 android:layout_weight="0"
                 app:civ_border="false" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
                 android:layout_weight="1"
                 android:orientation="vertical"
-                android:paddingStart="18dp"
                 android:paddingEnd="12dp"
                 android:paddingBottom="8dp">
 
@@ -66,21 +65,24 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
+            android:gravity="center_vertical"
             android:minHeight="72dp"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.IconImageView
+            <code.name.monkey.retromusic.views.ColorIconsImageView
                 android:id="@+id/general_settings_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="16dp"
+                android:layout_marginStart="16dp"
+                android:padding="10dp"
+                app:iconBackgroundColor="@color/md_blue_A400"
                 app:srcCompat="@drawable/ic_theme_palette_white_24dp" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="12dp">
+                android:layout_marginStart="16dp"
+                android:orientation="vertical">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                     android:layout_width="wrap_content"
@@ -109,21 +111,24 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
+            android:gravity="center_vertical"
             android:minHeight="72dp"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.IconImageView
+            <code.name.monkey.retromusic.views.ColorIconsImageView
                 android:id="@+id/now_playing_settings_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="16dp"
+                android:layout_marginStart="16dp"
+                android:padding="10dp"
+                app:iconBackgroundColor="@color/md_red_A400"
                 app:srcCompat="@drawable/ic_play_circle_filled_white_24dp" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="12dp">
+                android:layout_marginStart="16dp"
+                android:orientation="vertical">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                     android:layout_width="wrap_content"
@@ -150,21 +155,24 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
+            android:gravity="center_vertical"
             android:minHeight="72dp"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.IconImageView
+            <code.name.monkey.retromusic.views.ColorIconsImageView
                 android:id="@+id/audio_settings_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="16dp"
+                android:layout_marginStart="16dp"
+                android:padding="10dp"
+                app:iconBackgroundColor="@color/md_deep_purple_A400"
                 app:srcCompat="@drawable/ic_volume_up_white_24dp" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="12dp">
+                android:layout_marginStart="16dp"
+                android:orientation="vertical">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                     android:layout_width="wrap_content"
@@ -191,21 +199,24 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
+            android:gravity="center_vertical"
             android:minHeight="72dp"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.IconImageView
+            <code.name.monkey.retromusic.views.ColorIconsImageView
                 android:id="@+id/personalize_settings_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="16dp"
+                android:layout_marginStart="16dp"
+                android:padding="10dp"
+                app:iconBackgroundColor="@color/md_teal_A400"
                 app:srcCompat="@drawable/ic_hdr_strong_white_24dp" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="12dp">
+                android:layout_marginStart="16dp"
+                android:orientation="vertical">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                     android:layout_width="wrap_content"
@@ -231,21 +242,24 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
+            android:gravity="center_vertical"
             android:minHeight="72dp"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.IconImageView
+            <code.name.monkey.retromusic.views.ColorIconsImageView
                 android:id="@+id/image_settings_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="16dp"
+                android:layout_marginStart="16dp"
+                android:padding="10dp"
+                app:iconBackgroundColor="@color/md_orange_A400"
                 app:srcCompat="@drawable/ic_image_white_24dp" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="12dp">
+                android:layout_marginStart="16dp"
+                android:orientation="vertical">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                     android:layout_width="wrap_content"
@@ -271,21 +285,24 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
+            android:gravity="center_vertical"
             android:minHeight="72dp"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.IconImageView
+            <code.name.monkey.retromusic.views.ColorIconsImageView
                 android:id="@+id/notification_settings_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="16dp"
+                android:layout_marginStart="16dp"
+                android:padding="10dp"
+                app:iconBackgroundColor="@color/md_yellow_A400"
                 app:srcCompat="@drawable/ic_notifications_active_white_24dp" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="12dp">
+                android:layout_marginStart="16dp"
+                android:orientation="vertical">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                     android:layout_width="wrap_content"
@@ -310,24 +327,27 @@
             android:id="@+id/otherSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:minHeight="72dp"
             android:background="?rectSelector"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.IconImageView
+            <code.name.monkey.retromusic.views.ColorIconsImageView
                 android:id="@+id/other_settings_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="16dp"
+                android:layout_marginStart="16dp"
+                android:padding="10dp"
+                app:iconBackgroundColor="@color/md_indigo_A400"
                 app:srcCompat="@drawable/ic_settings_white_24dp" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:layout_marginStart="16dp"
                 android:gravity="center_vertical"
-                android:orientation="vertical"
-                android:padding="12dp">
+                android:orientation="vertical">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 05320122..7590d379 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -54,5 +54,8 @@
     <declare-styleable name="InsettableFrameLayout_Layout">
         <attr name="layout_ignoreInsets" format="boolean" />
     </declare-styleable>
-
+    <declare-styleable name="ColorIconsImageView">
+        <attr name="iconBackgroundColor" format="color" />
+        <attr name="icon" format="reference" />
+    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4b6cad0a..1df4872a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,4 +4,6 @@
     <color name="eighty_percent_black_overlay">#80000000</color>
     <color name="app_shortcut_default_foreground">#607d8b</color>
     <color name="app_shortcut_default_background">#f5f5f5</color>
+    <color name="md_indigo_A400">#3D5AFE</color>
+
 </resources>
diff --git a/appthemehelper/src/main/res/values/colors_material_design.xml b/appthemehelper/src/main/res/values/colors_material_design.xml
index 4d99051e..eec03aec 100755
--- a/appthemehelper/src/main/res/values/colors_material_design.xml
+++ b/appthemehelper/src/main/res/values/colors_material_design.xml
@@ -53,4 +53,7 @@
     <color name="md_black_1000">#000000</color>
     <color name="md_white_1000">#FFFFFF</color>
 
+
+    <color name="md_teal_A400">#1DE9B6</color>
+    <color name="md_orange_A400">#FF3D00</color>
 </resources>