diff --git a/app/src/main/java/org/xbmc/kore/ui/widgets/HighlightButton.java b/app/src/main/java/org/xbmc/kore/ui/widgets/HighlightButton.java
index cff7678..545e70e 100644
--- a/app/src/main/java/org/xbmc/kore/ui/widgets/HighlightButton.java
+++ b/app/src/main/java/org/xbmc/kore/ui/widgets/HighlightButton.java
@@ -19,12 +19,14 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.support.v7.widget.AppCompatImageButton;
 import android.util.AttributeSet;
+import android.view.ViewTreeObserver;
 
 import org.xbmc.kore.R;
+import org.xbmc.kore.utils.Utils;
 
 public class HighlightButton extends AppCompatImageButton {
 
-    private int colorFilter;
+    private int highlightColorFilter;
 
     private boolean highlight;
 
@@ -36,16 +38,18 @@ public class HighlightButton extends AppCompatImageButton {
     public HighlightButton(Context context, AttributeSet attrs) {
         super(context, attrs);
         setStyle(context);
+        fixThemeColorForPreLollipop(context);
     }
 
     public HighlightButton(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         setStyle(context);
+        fixThemeColorForPreLollipop(context);
     }
 
     public void setHighlight(boolean highlight) {
         if (highlight) {
-            setColorFilter(colorFilter);
+            setColorFilter(highlightColorFilter);
         } else {
             clearColorFilter();
         }
@@ -58,11 +62,40 @@ public class HighlightButton extends AppCompatImageButton {
 
     private void setStyle(Context context) {
         if (!this.isInEditMode()) {
-            TypedArray styledAttributes = context.getTheme().obtainStyledAttributes(
-                    new int[]{R.attr.colorAccent});
-            colorFilter = styledAttributes.getColor(styledAttributes.getIndex(0),
-                    context.getResources().getColor(R.color.accent_default));
+            TypedArray styledAttributes =
+                    context.getTheme().obtainStyledAttributes(new int[]{R.attr.colorAccent});
+            highlightColorFilter = styledAttributes.getColor(styledAttributes.getIndex(0),
+                                                             context.getResources().getColor(R.color.accent_default));
             styledAttributes.recycle();
         }
     }
+
+    /**
+     * Hack!
+     * Tinting is not applied on pre-lollipop devices.
+     * As there is (AFAICT) no proper way to set this manually we simply
+     * apply the color filter each time the view has been laid out.
+     * @param context
+     */
+    private void fixThemeColorForPreLollipop(Context context) {
+        if (Utils.isLollipopOrLater() || this.isInEditMode())
+            return;
+
+        TypedArray styledAttributes =
+                context.getTheme().obtainStyledAttributes(new int[]{R.attr.defaultButtonColorFilter});
+        final int colorFilter = styledAttributes.getColor(styledAttributes.getIndex(0),
+                                                         context.getResources().getColor(R.color.white));
+        styledAttributes.recycle();
+
+        getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                if (highlight) {
+                    setColorFilter(highlightColorFilter);
+                } else {
+                    setColorFilter(colorFilter);
+                }
+            }
+        });
+    }
 }
diff --git a/app/src/main/java/org/xbmc/kore/ui/widgets/RepeatModeButton.java b/app/src/main/java/org/xbmc/kore/ui/widgets/RepeatModeButton.java
index c7ded7c..24f7815 100644
--- a/app/src/main/java/org/xbmc/kore/ui/widgets/RepeatModeButton.java
+++ b/app/src/main/java/org/xbmc/kore/ui/widgets/RepeatModeButton.java
@@ -23,7 +23,7 @@ import android.util.AttributeSet;
 
 import org.xbmc.kore.R;
 
-public class RepeatModeButton extends AppCompatImageButton {
+public class RepeatModeButton extends HighlightButton {
     public enum MODE {
         OFF,
         ONE,
@@ -32,7 +32,6 @@ public class RepeatModeButton extends AppCompatImageButton {
 
     private MODE mode;
     private static TypedArray styledAttributes;
-    private static int accentDefaultColor;
 
     public RepeatModeButton(Context context) {
         super(context);
@@ -55,15 +54,15 @@ public class RepeatModeButton extends AppCompatImageButton {
         switch (mode) {
             case OFF:
                 setImageResource(styledAttributes.getResourceId(styledAttributes.getIndex(1), R.drawable.ic_repeat_white_24dp));
-                clearColorFilter();
+                setHighlight(false);
                 break;
             case ONE:
                 setImageResource(styledAttributes.getResourceId(styledAttributes.getIndex(2), R.drawable.ic_repeat_one_white_24dp));
-                setColorFilter(styledAttributes.getColor(styledAttributes.getIndex(0), accentDefaultColor));
+                setHighlight(true);
                 break;
             case ALL:
                 setImageResource(styledAttributes.getResourceId(styledAttributes.getIndex(1), R.drawable.ic_repeat_white_24dp));
-                setColorFilter(styledAttributes.getColor(styledAttributes.getIndex(0), accentDefaultColor));
+                setHighlight(true);
                 break;
         }
     }
@@ -77,6 +76,5 @@ public class RepeatModeButton extends AppCompatImageButton {
                 R.attr.colorAccent,
                 R.attr.iconRepeat,
                 R.attr.iconRepeatOne});
-        accentDefaultColor = getContext().getResources().getColor(R.color.accent_default);
     }
 }