diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
index 0675ebc7..13633ad8 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
@@ -109,7 +109,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
             holder.image.setImageDrawable(Util.getTintedDrawable(
                     activity,
                     getIconRes(playlist),
-                    ATHUtil.resolveColor(activity, R.attr.icon_color, ThemeStore.textColorSecondary(activity))
+                    ATHUtil.resolveColor(activity, R.attr.iconColor, ThemeStore.textColorSecondary(activity))
             ));
         }
     }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
index 4ebadffd..678cff0e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
@@ -137,7 +137,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
                     @Override
                     public void onLoadCleared(Drawable placeholder) {
                         super.onLoadCleared(placeholder);
-                        setColors(getDefaultBarColor(), holder);
+                        setColors(getDefaultFooterColor(), holder);
                     }
 
                     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
index d0e11449..dec4fbb1 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
@@ -147,7 +147,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
                     @Override
                     public void onLoadCleared(Drawable placeholder) {
                         super.onLoadCleared(placeholder);
-                        setColors(getDefaultBarColor(), holder);
+                        setColors(getDefaultFooterColor(), holder);
                     }
 
                     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
index 41eb67bc..aaf3c430 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
@@ -138,7 +138,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
                     @Override
                     public void onLoadCleared(Drawable placeholder) {
                         super.onLoadCleared(placeholder);
-                        setColors(getDefaultBarColor(), holder);
+                        setColors(getDefaultFooterColor(), holder);
                     }
 
                     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/PhonographColoredTarget.java b/app/src/main/java/com/kabouzeid/gramophone/glide/PhonographColoredTarget.java
index 13b4e375..857c191d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/glide/PhonographColoredTarget.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/glide/PhonographColoredTarget.java
@@ -18,17 +18,17 @@ public abstract class PhonographColoredTarget extends BitmapPaletteTarget {
     @Override
     public void onLoadFailed(Exception e, Drawable errorDrawable) {
         super.onLoadFailed(e, errorDrawable);
-        onColorReady(getDefaultBarColor());
+        onColorReady(getDefaultFooterColor());
     }
 
     @Override
     public void onResourceReady(BitmapPaletteWrapper resource, GlideAnimation<? super BitmapPaletteWrapper> glideAnimation) {
         super.onResourceReady(resource, glideAnimation);
-        onColorReady(PhonographColorUtil.getColor(resource.getPalette(), getDefaultBarColor()));
+        onColorReady(PhonographColorUtil.getColor(resource.getPalette(), getDefaultFooterColor()));
     }
 
-    protected int getDefaultBarColor() {
-        return ATHUtil.resolveColor(getView().getContext(), R.attr.default_bar_color);
+    protected int getDefaultFooterColor() {
+        return ATHUtil.resolveColor(getView().getContext(), R.attr.defaultFooterColor);
     }
 
     public abstract void onColorReady(int color);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java
index c0eb3bd4..a2c6fc89 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java
@@ -10,13 +10,11 @@ import android.support.v7.widget.AppCompatButton;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.internal.ThemeSingleton;
 import com.kabouzeid.appthemehelper.ThemeStore;
-import com.kabouzeid.appthemehelper.util.ATHUtil;
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.dialogs.ChangelogDialog;
 import com.kabouzeid.gramophone.dialogs.DonationDialog;
@@ -94,35 +92,6 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
     @Bind(R.id.aleksandar_tesic_google_plus)
     AppCompatButton aleksandarTesicGooglePlus;
 
-    @Bind(R.id.icon_info)
-    ImageView iconInfo;
-    @Bind(R.id.icon_changelog)
-    ImageView iconChangelog;
-    @Bind(R.id.icon_intro)
-    ImageView iconIntro;
-    @Bind(R.id.icon_licenses)
-    ImageView iconLicenses;
-    @Bind(R.id.icon_bug_report)
-    ImageView iconBugReport;
-    @Bind(R.id.icon_google_plus_community)
-    ImageView iconGooglePlusCommunity;
-    @Bind(R.id.icon_flag)
-    ImageView iconFlag;
-    @Bind(R.id.icon_rate)
-    ImageView iconRate;
-    @Bind(R.id.icon_donate)
-    ImageView iconDonate;
-    @Bind(R.id.icon_author)
-    ImageView iconAuthor;
-    @Bind(R.id.icon_google_plus)
-    ImageView iconGooglePlus;
-    @Bind(R.id.icon_twitter)
-    ImageView iconTwitter;
-    @Bind(R.id.icon_github)
-    ImageView iconGithub;
-    @Bind(R.id.icon_website)
-    ImageView iconWebsite;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -140,7 +109,6 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
     private void setUpViews() {
         setUpToolbar();
         setUpAppVersion();
-        setUpIconTint();
         setUpOnClickListeners();
     }
 
@@ -176,24 +144,6 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
         aleksandarTesicGooglePlus.setOnClickListener(this);
     }
 
-    private void setUpIconTint() {
-        int iconColor = ATHUtil.resolveColor(this, R.attr.icon_color, ThemeStore.textColorSecondary(this));
-        iconInfo.setColorFilter(iconColor);
-        iconChangelog.setColorFilter(iconColor);
-        iconIntro.setColorFilter(iconColor);
-        iconLicenses.setColorFilter(iconColor);
-        iconBugReport.setColorFilter(iconColor);
-        iconGooglePlusCommunity.setColorFilter(iconColor);
-        iconFlag.setColorFilter(iconColor);
-        iconRate.setColorFilter(iconColor);
-        iconDonate.setColorFilter(iconColor);
-        iconAuthor.setColorFilter(iconColor);
-        iconGooglePlus.setColorFilter(iconColor);
-        iconTwitter.setColorFilter(iconColor);
-        iconGithub.setColorFilter(iconColor);
-        iconWebsite.setColorFilter(iconColor);
-    }
-
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
index ff7b98eb..4894d265 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
@@ -131,7 +131,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
 
     private void setUpObservableListViewParams() {
         albumArtViewHeight = getResources().getDimensionPixelSize(R.dimen.header_image_height);
-        toolbarColor = DialogUtils.resolveColor(this, R.attr.default_bar_color);
+        toolbarColor = DialogUtils.resolveColor(this, R.attr.defaultFooterColor);
         int toolbarHeight = Util.getActionBarSize(this);
         titleViewHeight = getResources().getDimensionPixelSize(R.dimen.title_view_height);
         headerOffset = toolbarHeight;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
index b0bdcf2b..58ec3e2e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
@@ -148,7 +148,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
 
     private void setUpObservableListViewParams() {
         artistImageViewHeight = getResources().getDimensionPixelSize(R.dimen.header_image_height);
-        toolbarColor = DialogUtils.resolveColor(this, R.attr.default_bar_color);
+        toolbarColor = DialogUtils.resolveColor(this, R.attr.defaultFooterColor);
         int toolbarHeight = Util.getActionBarSize(this);
         titleViewHeight = getResources().getDimensionPixelSize(R.dimen.title_view_height);
         headerOffset = toolbarHeight;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
index 21f3b911..9a821cbd 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
@@ -188,7 +188,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
         navigationView.setCheckedItem(R.id.nav_library);
 
         int accentColor = ThemeStore.accentColor(this);
-        NavigationViewUtil.setItemIconColors(navigationView, ATHUtil.resolveColor(this, R.attr.icon_color, ThemeStore.textColorSecondary(this)), accentColor);
+        NavigationViewUtil.setItemIconColors(navigationView, ATHUtil.resolveColor(this, R.attr.iconColor, ThemeStore.textColorSecondary(this)), accentColor);
         NavigationViewUtil.setItemTextColors(navigationView, ThemeStore.textColorPrimary(this), accentColor);
 
         navigationView.setNavigationItemSelectedListener(new NavigationView.OnNavigationItemSelectedListener() {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
index 577a00e7..06ee068c 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
@@ -95,7 +95,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
     @Override
     protected void loadCurrentImage() {
         Bitmap bitmap = getAlbumArt();
-        setImageBitmap(bitmap, PhonographColorUtil.getColor(PhonographColorUtil.generatePalette(bitmap), ATHUtil.resolveColor(this, R.attr.default_bar_color)));
+        setImageBitmap(bitmap, PhonographColorUtil.getColor(PhonographColorUtil.generatePalette(bitmap), ATHUtil.resolveColor(this, R.attr.defaultFooterColor)));
         deleteAlbumArt = false;
     }
 
@@ -131,7 +131,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
                                     @Override
                                     public void onResourceReady(BitmapPaletteWrapper resource, GlideAnimation<? super BitmapPaletteWrapper> glideAnimation) {
                                         albumArtBitmap = getResizedAlbumCover(resource.getBitmap(), 2048);
-                                        setImageBitmap(albumArtBitmap, PhonographColorUtil.getColor(resource.getPalette(), ATHUtil.resolveColor(AlbumTagEditorActivity.this, R.attr.default_bar_color)));
+                                        setImageBitmap(albumArtBitmap, PhonographColorUtil.getColor(resource.getPalette(), ATHUtil.resolveColor(AlbumTagEditorActivity.this, R.attr.defaultFooterColor)));
                                         deleteAlbumArt = false;
                                         dataChanged();
                                         setResult(RESULT_OK);
@@ -162,7 +162,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
 
     @Override
     protected void deleteImage() {
-        setImageBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.default_album_art), ATHUtil.resolveColor(this, R.attr.default_bar_color));
+        setImageBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.default_album_art), ATHUtil.resolveColor(this, R.attr.defaultFooterColor));
         deleteAlbumArt = true;
         dataChanged();
     }
@@ -228,7 +228,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
                     public void onResourceReady(BitmapPaletteWrapper resource, GlideAnimation<? super BitmapPaletteWrapper> glideAnimation) {
                         PhonographColorUtil.getColor(resource.getPalette(), Color.TRANSPARENT);
                         albumArtBitmap = getResizedAlbumCover(resource.getBitmap(), 2048);
-                        setImageBitmap(albumArtBitmap, PhonographColorUtil.getColor(resource.getPalette(), ATHUtil.resolveColor(AlbumTagEditorActivity.this, R.attr.default_bar_color)));
+                        setImageBitmap(albumArtBitmap, PhonographColorUtil.getColor(resource.getPalette(), ATHUtil.resolveColor(AlbumTagEditorActivity.this, R.attr.defaultFooterColor)));
                         deleteAlbumArt = false;
                         dataChanged();
                         setResult(RESULT_OK);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/MiniPlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/MiniPlayerFragment.java
index 2f8db166..16b1b549 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/MiniPlayerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/MiniPlayerFragment.java
@@ -16,15 +16,12 @@ import android.widget.TextView;
 
 import com.kabouzeid.appthemehelper.ThemeStore;
 import com.kabouzeid.appthemehelper.util.ATHUtil;
-import com.kabouzeid.appthemehelper.util.ColorUtil;
-import com.kabouzeid.appthemehelper.util.MaterialValueHelper;
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
 import com.kabouzeid.gramophone.helper.MusicProgressViewUpdateHelper;
 import com.kabouzeid.gramophone.helper.PlayPauseButtonOnClickHandler;
 import com.kabouzeid.gramophone.interfaces.MusicServiceEventListener;
 import com.kabouzeid.gramophone.ui.activities.base.AbsMusicServiceActivity;
-import com.kabouzeid.gramophone.util.Util;
 import com.kabouzeid.gramophone.views.PlayPauseDrawable;
 
 import butterknife.Bind;
@@ -97,24 +94,14 @@ public class MiniPlayerFragment extends Fragment implements MusicServiceEventLis
     }
 
     private void setUpMiniPlayer() {
-        setMiniPlayerColor(ATHUtil.resolveColor(activity, R.attr.cardBackgroundColor));
-        miniPlayerImage.setImageDrawable(Util.getTintedDrawable(activity, R.drawable.ic_keyboard_arrow_up_white_24dp,
-                ATHUtil.resolveColor(activity, R.attr.icon_color, ThemeStore.textColorSecondary(getActivity()))));
         setUpPlayPauseButton();
-
         progressBar.setProgressTintList(ColorStateList.valueOf(ThemeStore.accentColor(activity)));
     }
 
-    public void setMiniPlayerColor(int color) {
-        if (getView() == null) return;
-        getView().setBackgroundColor(color);
-        miniPlayerTitle.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)));
-    }
-
     private void setUpPlayPauseButton() {
         updatePlayPauseDrawableState(false);
         miniPlayerPlayPauseButton.setImageDrawable(miniPlayerPlayPauseDrawable);
-        miniPlayerPlayPauseButton.setColorFilter(ATHUtil.resolveColor(activity, R.attr.icon_color, ThemeStore.textColorSecondary(getActivity())), PorterDuff.Mode.SRC_IN);
+        miniPlayerPlayPauseButton.setColorFilter(ATHUtil.resolveColor(activity, R.attr.iconColor, ThemeStore.textColorSecondary(getActivity())), PorterDuff.Mode.SRC_IN);
         miniPlayerPlayPauseButton.setOnClickListener(new PlayPauseButtonOnClickHandler());
     }
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
index d01f40d7..3f2e8c74 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
@@ -385,7 +385,7 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
             currentSongViewHolder.separator.setVisibility(View.VISIBLE);
             currentSongViewHolder.shortSeparator.setVisibility(View.GONE);
             currentSongViewHolder.image.setScaleType(ImageView.ScaleType.CENTER);
-            currentSongViewHolder.image.setImageDrawable(Util.getTintedDrawable(fragment.getActivity(), R.drawable.ic_volume_up_white_24dp, ATHUtil.resolveColor(fragment.getActivity(), R.attr.icon_color, ThemeStore.textColorSecondary(fragment.getActivity()))));
+            currentSongViewHolder.image.setImageDrawable(Util.getTintedDrawable(fragment.getActivity(), R.drawable.ic_volume_up_white_24dp, ATHUtil.resolveColor(fragment.getActivity(), R.attr.iconColor, ThemeStore.textColorSecondary(fragment.getActivity()))));
             currentSongViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
diff --git a/app/src/main/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml
index b51f0d06..34bea92f 100644
--- a/app/src/main/res/layout/activity_album_detail.xml
+++ b/app/src/main/res/layout/activity_album_detail.xml
@@ -38,7 +38,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/title_view_height"
             android:height="@dimen/title_view_height"
-            android:background="?default_bar_color"
+            android:background="?attr/defaultFooterColor"
             android:elevation="@dimen/toolbar_elevation"
             android:fontFamily="sans-serif-medium"
             android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/activity_artist_detail.xml b/app/src/main/res/layout/activity_artist_detail.xml
index 2c372647..25cbf3d7 100644
--- a/app/src/main/res/layout/activity_artist_detail.xml
+++ b/app/src/main/res/layout/activity_artist_detail.xml
@@ -37,7 +37,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/title_view_height"
             android:height="@dimen/title_view_height"
-            android:background="?default_bar_color"
+            android:background="?attr/defaultFooterColor"
             android:elevation="@dimen/toolbar_elevation"
             android:fontFamily="sans-serif-medium"
             android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/artist_detail_header.xml b/app/src/main/res/layout/artist_detail_header.xml
index 303840ec..ed4e6262 100644
--- a/app/src/main/res/layout/artist_detail_header.xml
+++ b/app/src/main/res/layout/artist_detail_header.xml
@@ -14,6 +14,6 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_marginTop="-8dp"
-        android:background="?divider_color" />
+        android:background="?attr/dividerColor" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_about_app.xml b/app/src/main/res/layout/card_about_app.xml
index 3f92f1e6..0f89b519 100644
--- a/app/src/main/res/layout/card_about_app.xml
+++ b/app/src/main/res/layout/card_about_app.xml
@@ -41,7 +41,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -54,7 +54,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_info_outline_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -86,7 +88,7 @@
             android:id="@+id/changelog"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -99,7 +101,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_history_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -117,7 +121,7 @@
             android:id="@+id/intro"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -130,7 +134,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_book_open_variant_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -148,7 +154,7 @@
             android:id="@+id/licenses"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -161,7 +167,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_description_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/card_author.xml b/app/src/main/res/layout/card_author.xml
index 0e2ad4ef..f092ff72 100644
--- a/app/src/main/res/layout/card_author.xml
+++ b/app/src/main/res/layout/card_author.xml
@@ -29,7 +29,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -42,7 +42,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_person_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -72,7 +74,7 @@
             android:id="@+id/add_to_google_plus_circles"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -85,7 +87,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_google_circles_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -103,7 +107,7 @@
             android:id="@+id/follow_on_twitter"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -116,7 +120,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_twitter_box_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -134,7 +140,7 @@
             android:id="@+id/fork_on_git_hub"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -147,7 +153,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_github_circle_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -165,7 +173,7 @@
             android:id="@+id/visit_website"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -178,7 +186,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_web_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/card_support_development.xml b/app/src/main/res/layout/card_support_development.xml
index db52cbc1..608a0822 100644
--- a/app/src/main/res/layout/card_support_development.xml
+++ b/app/src/main/res/layout/card_support_development.xml
@@ -30,7 +30,7 @@
             android:id="@+id/report_bugs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -43,7 +43,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_bug_report_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -73,7 +75,7 @@
             android:id="@+id/join_google_plus_community"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -86,7 +88,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_google_circles_communities_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -116,7 +120,7 @@
             android:id="@+id/translate"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -129,7 +133,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_flag_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -159,7 +165,7 @@
             android:id="@+id/rate_on_google_play"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -172,7 +178,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_play_shopping_bag_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -202,7 +210,7 @@
             android:id="@+id/donate"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?rect_selector"
+            android:background="?attr/rectSelector"
             android:clickable="true"
             android:gravity="center_vertical"
             android:minHeight="@dimen/md_listitem_height"
@@ -215,7 +223,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_attach_money_white_24dp"
-                tools:ignore="ContentDescription" />
+                android:tint="?attr/iconColor"
+                android:tintMode="src_in"
+                tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml
index 18618598..39b5fc56 100644
--- a/app/src/main/res/layout/fragment_mini_player.xml
+++ b/app/src/main/res/layout/fragment_mini_player.xml
@@ -6,6 +6,7 @@
     android:layout_height="@dimen/mini_player_height"
     android:clickable="true"
     android:focusable="false"
+    android:background="?cardBackgroundColor"
     android:transitionName="@string/transition_mini_player"
     tools:ignore="UnusedAttribute">
 
@@ -23,6 +24,9 @@
             android:layout_gravity="center_vertical"
             android:layout_margin="16dp"
             android:scaleType="centerCrop"
+            android:src="@drawable/ic_keyboard_arrow_up_white_24dp"
+            android:tint="?attr/iconColor"
+            android:tintMode="src_in"
             tools:ignore="ContentDescription" />
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_playback_controls.xml b/app/src/main/res/layout/fragment_playback_controls.xml
index c30a8131..1ba21567 100644
--- a/app/src/main/res/layout/fragment_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_playback_controls.xml
@@ -65,7 +65,7 @@
             android:layout_marginRight="-8dp"
             android:layout_toLeftOf="@+id/dummy_fab"
             android:layout_toStartOf="@+id/dummy_fab"
-            android:background="?round_selector"
+            android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_skip_previous_white_36dp" />
@@ -79,7 +79,7 @@
             android:layout_marginStart="-8dp"
             android:layout_toEndOf="@+id/dummy_fab"
             android:layout_toRightOf="@+id/dummy_fab"
-            android:background="?round_selector"
+            android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_skip_next_white_36dp" />
@@ -93,7 +93,7 @@
             android:layout_centerVertical="true"
             android:layout_marginLeft="16dp"
             android:layout_marginStart="16dp"
-            android:background="?round_selector"
+            android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_repeat_white_36dp" />
@@ -107,7 +107,7 @@
             android:layout_centerVertical="true"
             android:layout_marginEnd="16dp"
             android:layout_marginRight="16dp"
-            android:background="?round_selector"
+            android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_shuffle_white_36dp" />
diff --git a/app/src/main/res/layout/item_donation_option.xml b/app/src/main/res/layout/item_donation_option.xml
index 0016e144..ae5004d1 100644
--- a/app/src/main/res/layout/item_donation_option.xml
+++ b/app/src/main/res/layout/item_donation_option.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?rect_selector"
+    android:background="?attr/rectSelector"
     android:orientation="horizontal"
     android:paddingBottom="@dimen/md_simplelistitem_padding_top"
     android:paddingEnd="@dimen/md_dialog_frame_margin"
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index c628bb7b..ff3f1c80 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="2dp"
-    android:foreground="?rect_selector">
+    android:foreground="?attr/rectSelector">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_grid_card_horizontal.xml b/app/src/main/res/layout/item_grid_card_horizontal.xml
index 0e971ccc..50f0b297 100644
--- a/app/src/main/res/layout/item_grid_card_horizontal.xml
+++ b/app/src/main/res/layout/item_grid_card_horizontal.xml
@@ -5,7 +5,7 @@
     android:layout_height="148dp"
     android:layout_marginEnd="8dp"
     android:layout_marginRight="8dp"
-    android:foreground="?rect_selector"
+    android:foreground="?attr/rectSelector"
     app:cardBackgroundColor="?cardBackgroundColor">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index 8bb1e98b..5f63fc9a 100644
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="72dp"
-    android:foreground="?rect_selector"
+    android:foreground="?attr/rectSelector"
     tools:ignore="UnusedAttribute">
 
     <ImageView
@@ -14,7 +14,7 @@
         android:layout_marginLeft="-8dp"
         android:layout_marginStart="-8dp"
         android:src="@drawable/ic_drag_vertical_white_24dp"
-        android:tint="?icon_color"
+        android:tint="?attr/iconColor"
         android:visibility="gone"
         android:tintMode="src_in"
         tools:ignore="ContentDescription" />
@@ -97,7 +97,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_gravity="bottom"
-        android:background="?divider_color"
+        android:background="?attr/dividerColor"
         android:visibility="gone" />
 
     <View
@@ -107,6 +107,6 @@
         android:layout_gravity="bottom"
         android:layout_marginLeft="72dp"
         android:layout_marginStart="72dp"
-        android:background="?divider_color" />
+        android:background="?attr/dividerColor" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_list_single_row.xml b/app/src/main/res/layout/item_list_single_row.xml
index 47deed32..96fbf1e6 100644
--- a/app/src/main/res/layout/item_list_single_row.xml
+++ b/app/src/main/res/layout/item_list_single_row.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="64dp"
-    android:foreground="?rect_selector"
+    android:foreground="?attr/rectSelector"
     tools:ignore="UnusedAttribute">
 
     <ImageView
@@ -14,7 +14,7 @@
         android:layout_marginLeft="-8dp"
         android:layout_marginStart="-8dp"
         android:src="@drawable/ic_drag_vertical_white_24dp"
-        android:tint="?icon_color"
+        android:tint="?attr/iconColor"
         android:tintMode="src_in"
         android:visibility="gone"
         tools:ignore="ContentDescription" />
@@ -82,7 +82,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_gravity="bottom"
-        android:background="?divider_color"
+        android:background="?attr/dividerColor"
         android:visibility="gone" />
 
     <View
@@ -92,6 +92,6 @@
         android:layout_gravity="bottom"
         android:layout_marginLeft="72dp"
         android:layout_marginStart="72dp"
-        android:background="?divider_color" />
+        android:background="?attr/dividerColor" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/navigation_drawer_header.xml b/app/src/main/res/layout/navigation_drawer_header.xml
index 30471b05..18753f20 100644
--- a/app/src/main/res/layout/navigation_drawer_header.xml
+++ b/app/src/main/res/layout/navigation_drawer_header.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clickable="true"
-    android:foreground="?rect_selector">
+    android:foreground="?attr/rectSelector">
 
     <ImageView
         android:id="@+id/image"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index c240a8de..3246a03e 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,8 +1,8 @@
 <resources>
 
     <style name="Theme.Phonograph" parent="Theme.Phonograph.Base">
-        <item name="round_selector">@drawable/round_ripple_selector</item>
-        <item name="rect_selector">@drawable/rect_ripple_selector_dark</item>
+        <item name="roundSelector">@drawable/round_ripple_selector</item>
+        <item name="rectSelector">@drawable/rect_ripple_selector_dark</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
 
@@ -10,8 +10,8 @@
     </style>
 
     <style name="Theme.Phonograph.Light" parent="Theme.Phonograph.Base.Light">
-        <item name="round_selector">@drawable/round_ripple_selector</item>
-        <item name="rect_selector">@drawable/rect_ripple_selector</item>
+        <item name="roundSelector">@drawable/round_ripple_selector</item>
+        <item name="rectSelector">@drawable/rect_ripple_selector</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
 
@@ -19,8 +19,8 @@
     </style>
 
     <style name="Theme.Phonograph.Black" parent="Theme.Phonograph.Base.Black">
-        <item name="round_selector">@drawable/round_ripple_selector</item>
-        <item name="rect_selector">@drawable/rect_ripple_selector_dark</item>
+        <item name="roundSelector">@drawable/round_ripple_selector</item>
+        <item name="rectSelector">@drawable/rect_ripple_selector_dark</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
 
@@ -45,8 +45,4 @@
         <item name="android:progressBackgroundTint">@android:color/transparent</item>
     </style>
 
-    <style name="OverFlowButton" parent="OverFlowButtonParent">
-        <item name="android:tintMode">src_in</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 4e44979f..09e8c2fe 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <attr name="music_controller_container_color" format="color" />
+    <attr name="roundSelector" format="reference" />
+    <attr name="rectSelector" format="reference" />
 
-    <attr name="round_selector" format="reference" />
-    <attr name="rect_selector" format="reference" />
-
-    <attr name="default_bar_color" format="color" />
+    <attr name="defaultFooterColor" format="color" />
 
     <attr name="toolbarPopupTheme" format="reference" />
 
-    <attr name="icon_color" format="color" />
-    <attr name="divider_color" format="color" />
+    <attr name="iconColor" format="color" />
+    <attr name="dividerColor" format="color" />
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 043352e0..95e0c7d1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,14 +10,24 @@
 
     <style name="Theme.Phonograph.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title" />
 
-    <style name="OverFlowButton" parent="OverFlowButtonParent" />
+    <style name="OverFlowButton">
+        <item name="srcCompat">@drawable/abc_ic_menu_overflow_material</item>
+        <item name="android:tint">?attr/iconColor</item>
+        <item name="android:tintMode" tools:ignore="NewApi">src_in</item>
+        <item name="android:layout_margin">8dp</item>
+        <item name="android:layout_width">48dp</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:scaleType">center</item>
+        <item name="android:background">?attr/roundSelector</item>
+        <item name="android:focusableInTouchMode">false</item>
+        <item name="android:focusable">false</item>
+    </style>
 
     <style name="PlayingIndicator">
         <item name="android:layout_width">36dp</item>
         <item name="android:layout_height">36dp</item>
         <item name="android:padding">8dp</item>
         <item name="android:layout_gravity">center</item>
-
     </style>
 
     <style name="PlayPauseFab" parent="PlayPauseFabParent" />
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 8b9ac349..5b6ce262 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -8,17 +8,15 @@
 
         <item name="md_dark_theme">true</item>
 
-        <item name="music_controller_container_color">@color/cardview_dark_background</item>
-
-        <item name="round_selector">@drawable/round_selector_dark</item>
-        <item name="rect_selector">@drawable/rect_selector_dark</item>
+        <item name="roundSelector">@drawable/round_selector_dark</item>
+        <item name="rectSelector">@drawable/rect_selector_dark</item>
 
         <item name="cardBackgroundColor">@color/grey_800</item>
 
-        <item name="default_bar_color">@color/grey_900</item>
+        <item name="defaultFooterColor">@color/grey_900</item>
 
-        <item name="divider_color">@color/md_divider_white</item>
-        <item name="icon_color">@color/ate_secondary_text_dark</item>
+        <item name="dividerColor">@color/md_divider_white</item>
+        <item name="iconColor">@color/ate_secondary_text_dark</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
 
@@ -38,17 +36,15 @@
 
         <item name="md_dark_theme">false</item>
 
-        <item name="music_controller_container_color">@color/cardview_light_background</item>
-
-        <item name="round_selector">@drawable/round_selector</item>
-        <item name="rect_selector">@drawable/rect_selector</item>
+        <item name="roundSelector">@drawable/round_selector</item>
+        <item name="rectSelector">@drawable/rect_selector</item>
 
         <item name="cardBackgroundColor">@color/white</item>
 
-        <item name="default_bar_color">@color/grey_300</item>
+        <item name="defaultFooterColor">@color/grey_300</item>
 
-        <item name="divider_color">@color/md_divider_black</item>
-        <item name="icon_color">@color/ate_secondary_text_light</item>
+        <item name="dividerColor">@color/md_divider_black</item>
+        <item name="iconColor">@color/ate_secondary_text_light</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
 
@@ -63,8 +59,8 @@
 
     <style name="Theme.Phonograph.Base.Black" parent="@style/Theme.Phonograph.Base">
         <item name="android:windowBackground">@android:color/black</item>
-        <item name="divider_color">#18FFFFFF</item>
-        <item name="default_bar_color">@color/grey_800</item>
+        <item name="dividerColor">#18FFFFFF</item>
+        <item name="defaultFooterColor">@color/grey_800</item>
         <item name="cardBackgroundColor">@color/grey_900</item>
         <item name="md_background_color">@color/grey_900</item>
     </style>
@@ -90,13 +86,13 @@
     </style>
 
     <style name="OverFlowButtonParent">
-        <item name="android:tint">?icon_color</item>
+        <item name="android:tint">?attr/iconColor</item>
         <item name="srcCompat">@drawable/abc_ic_menu_overflow_material</item>
         <item name="android:layout_margin">8dp</item>
         <item name="android:layout_width">48dp</item>
         <item name="android:layout_height">48dp</item>
         <item name="android:scaleType">center</item>
-        <item name="android:background">?round_selector</item>
+        <item name="android:background">?attr/roundSelector</item>
         <item name="android:focusableInTouchMode">false</item>
         <item name="android:focusable">false</item>
     </style>