diff --git a/app/src/main/res/drawable/button_favorite_selector.xml b/app/src/main/res/drawable/button_favorite_selector.xml
index d34ba9b1..67421589 100644
--- a/app/src/main/res/drawable/button_favorite_selector.xml
+++ b/app/src/main/res/drawable/button_favorite_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/titleTextColor" android:drawable="@drawable/ic_favorite" android:state_checked="true" />
-    <item android:color="@color/titleTextColor" android:drawable="@drawable/ic_favorites_outlined" android:state_checked="false" />
+    <item android:drawable="@drawable/ic_favorite" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_favorites_outlined" android:state_checked="false" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_play_pause_selector.xml b/app/src/main/res/drawable/button_play_pause_selector.xml
index 162ed47d..cb5c785a 100644
--- a/app/src/main/res/drawable/button_play_pause_selector.xml
+++ b/app/src/main/res/drawable/button_play_pause_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/titleTextColor" android:drawable="@drawable/ic_play" android:state_checked="false" />
-    <item android:color="@color/titleTextColor" android:drawable="@drawable/ic_pause" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_play" android:state_checked="false" />
+    <item android:drawable="@drawable/ic_pause" android:state_checked="true" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chip_search_filter_genre.xml b/app/src/main/res/layout/chip_search_filter_genre.xml
index 0c21f34b..c21769e5 100644
--- a/app/src/main/res/layout/chip_search_filter_genre.xml
+++ b/app/src/main/res/layout/chip_search_filter_genre.xml
@@ -10,7 +10,4 @@
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
     android:textAppearance="?android:attr/textAppearance"
-    android:textColor="@color/titleTextColor"
-    app:chipBackgroundColor="@color/color_chip_status"
-    app:chipStrokeColor="@color/chipBorderColor"
     app:chipStrokeWidth="1.5dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_playlist_editor.xml b/app/src/main/res/layout/dialog_playlist_editor.xml
index 09706ad4..f8e734e7 100644
--- a/app/src/main/res/layout/dialog_playlist_editor.xml
+++ b/app/src/main/res/layout/dialog_playlist_editor.xml
@@ -14,9 +14,7 @@
         android:textColorHint="?android:textColorHint"
         app:endIconMode="clear_text"
         app:endIconTint="?android:textColorSecondary"
-        app:errorEnabled="true"
-        app:hintTextColor="@color/colorAccent"
-        app:boxStrokeColor="@color/colorAccent">
+        app:errorEnabled="true">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/playlist_name_text_view"
diff --git a/app/src/main/res/layout/dialog_rating.xml b/app/src/main/res/layout/dialog_rating.xml
index a19b3ff7..f6ab56a8 100644
--- a/app/src/main/res/layout/dialog_rating.xml
+++ b/app/src/main/res/layout/dialog_rating.xml
@@ -14,8 +14,6 @@
         android:stepSize="1"
         android:numStars="5"
         android:rating="0"
-        android:progressTint="@color/starTintColor"
-        android:progressBackgroundTint="@color/starBackgroundTintColor"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
diff --git a/app/src/main/res/layout/dialog_server_signup.xml b/app/src/main/res/layout/dialog_server_signup.xml
index 50feaa81..12955f4f 100644
--- a/app/src/main/res/layout/dialog_server_signup.xml
+++ b/app/src/main/res/layout/dialog_server_signup.xml
@@ -14,9 +14,7 @@
         android:textColorHint="?android:textColorHint"
         app:endIconMode="clear_text"
         app:endIconTint="?android:textColorSecondary"
-        app:errorEnabled="true"
-        app:hintTextColor="@color/colorAccent"
-        app:boxStrokeColor="@color/colorAccent">
+        app:errorEnabled="true">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/server_name_text_view"
@@ -38,9 +36,7 @@
         android:textColorHint="?android:textColorHint"
         app:endIconMode="clear_text"
         app:endIconTint="?android:textColorSecondary"
-        app:errorEnabled="true"
-        app:hintTextColor="@color/colorAccent"
-        app:boxStrokeColor="@color/colorAccent">
+        app:errorEnabled="true">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/username_text_view"
@@ -62,9 +58,7 @@
         android:textColorHint="?android:textColorHint"
         app:endIconMode="password_toggle"
         app:endIconTint="?android:textColorSecondary"
-        app:errorEnabled="true"
-        app:hintTextColor="@color/colorAccent"
-        app:boxStrokeColor="@color/colorAccent">
+        app:errorEnabled="true">
 
         <!-- Navidrome android:text="!$4EBXhSPUi4$E#oagvAisCA" -->
         <!-- Gonic android:text="hYP3%yD!rx@GBf95B2wbRUk8" -->
@@ -88,9 +82,7 @@
         android:textColorHint="?android:textColorHint"
         app:endIconMode="clear_text"
         app:endIconTint="?android:textColorSecondary"
-        app:errorEnabled="true"
-        app:hintTextColor="@color/colorAccent"
-        app:boxStrokeColor="@color/colorAccent">
+        app:errorEnabled="true">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/server_text_view"
diff --git a/app/src/main/res/values/fonts.xml b/app/src/main/res/values/fonts.xml
index f8ffbbed..9bed7dcc 100644
--- a/app/src/main/res/values/fonts.xml
+++ b/app/src/main/res/values/fonts.xml
@@ -97,6 +97,5 @@
         <item name="android:fontFamily">@font/inter</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textFontWeight">700</item>
-        <item name="android:textColor">@color/darkIconColor</item>
     </style>
 </resources>
\ No newline at end of file