diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
index f8f543c0b..06e98ade1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
@@ -47,9 +47,7 @@ class FitFragment : AbsPlayerFragment() {
         playbackControlsFragment.setDark(color)
         lastColor = color
         callbacks?.onPaletteColorChanged()
-
         ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity())
-
     }
 
     override fun toggleFavorite(song: Song) {
@@ -77,8 +75,7 @@ class FitFragment : AbsPlayerFragment() {
 
     private fun setUpSubFragments() {
         playbackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as FitPlaybackControlsFragment
-
-        val playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
+        val playerAlbumCoverFragment: PlayerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
         playerAlbumCoverFragment.setCallbacks(this)
         playerAlbumCoverFragment.removeEffect()
     }
@@ -88,13 +85,12 @@ class FitFragment : AbsPlayerFragment() {
             inflateMenu(R.menu.menu_player)
             setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@FitFragment)
-            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), requireActivity())
+            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity())
         }
     }
 
     override fun onServiceConnected() {
         updateIsFavorite()
-
     }
 
     override fun onPlayingMetaChanged() {
@@ -102,7 +98,6 @@ class FitFragment : AbsPlayerFragment() {
     }
 
     companion object {
-
         fun newInstance(): FitFragment {
             return FitFragment()
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
index a9422bb4a..50fd971f0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
@@ -43,7 +43,7 @@ class FlatPlayerFragment : AbsPlayerFragment() {
         playerToolbar.inflateMenu(R.menu.menu_player)
         playerToolbar.setNavigationOnClickListener { _ -> requireActivity().onBackPressed() }
         playerToolbar.setOnMenuItemClickListener(this)
-        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.iconColor), requireActivity())
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity())
     }
 
     private fun colorize(i: Int) {
diff --git a/app/src/main/res/layout-xlarge/activity_user_info.xml b/app/src/main/res/layout-xlarge/activity_user_info.xml
index e47ac8b15..f35aa297f 100644
--- a/app/src/main/res/layout-xlarge/activity_user_info.xml
+++ b/app/src/main/res/layout-xlarge/activity_user_info.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -92,7 +93,7 @@
                             android:gravity="center"
                             android:padding="12dp"
                             android:src="@drawable/ic_add_photo_white_24dp"
-                            app:tint="?iconColor" />
+                            app:tint="?android:attr/colorControlNormal" />
                     </FrameLayout>
 
                 </FrameLayout>
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a082ac746..2a42faa40 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -105,8 +106,8 @@
                     android:layout_margin="16dp"
                     android:gravity="center"
                     android:padding="12dp"
-                    app:tint="?attr/colorControlNormal"
-                    android:src="@drawable/ic_add_photo_white_24dp" />
+                    android:src="@drawable/ic_add_photo_white_24dp"
+                    app:tint="?attr/colorControlNormal" />
             </FrameLayout>
 
             <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 60eed3676..0fcbd99c8 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -3,15 +3,10 @@
 
     <attr name="roundSelector" format="reference" />
     <attr name="rectSelector" format="reference" />
-
     <attr name="defaultFooterColor" format="color" />
-
     <attr name="toolbarPopupTheme" format="reference" />
-
-    <attr name="iconColor" format="color" />
     <attr name="dividerColor" format="color" />
 
-
     <declare-styleable name="BlurLayout">
         <attr name="blk_downscaleFactor" format="float" />
         <attr name="blk_blurRadius" format="integer" />