diff --git a/ui/widgets/albumfilterbutton.go b/ui/widgets/albumfilterbutton.go
index 2e01557..ab4282f 100644
--- a/ui/widgets/albumfilterbutton.go
+++ b/ui/widgets/albumfilterbutton.go
@@ -38,7 +38,7 @@ func NewAlbumFilterButton(filter *mediaprovider.AlbumFilter, fetchGenresFunc fun
 	a := &AlbumFilterButton{
 		filter: filter,
 		Button: widget.Button{
-			Icon: myTheme.FilterIcon,
+			Icon: theme.NewThemedResource(myTheme.FilterIcon),
 		},
 	}
 	a.OnTapped = a.showFilterDialog
@@ -57,10 +57,11 @@ func NewAlbumFilterButton(filter *mediaprovider.AlbumFilter, fetchGenresFunc fun
 }
 
 func (a *AlbumFilterButton) Refresh() {
+	themedIcon := a.Icon.(*theme.ThemedResource)
 	if a.filterEmpty() {
-		a.Importance = widget.MediumImportance
+		themedIcon.ColorName = theme.ColorNameForeground
 	} else {
-		a.Importance = widget.HighImportance
+		themedIcon.ColorName = theme.ColorNamePrimary
 	}
 	a.Button.Refresh()
 }
diff --git a/ui/widgets/auxcontrols.go b/ui/widgets/auxcontrols.go
index 1f5d63b..e9b11c7 100644
--- a/ui/widgets/auxcontrols.go
+++ b/ui/widgets/auxcontrols.go
@@ -12,6 +12,11 @@ import (
 	"github.com/dweymouth/supersonic/ui/util"
 )
 
+var (
+	repeatThemedResource    = theme.NewThemedResource(myTheme.RepeatIcon)
+	repeatOneThemedResource = theme.NewThemedResource(myTheme.RepeatOneIcon)
+)
+
 // The "aux" controls for playback, positioned to the right
 // of the BottomPanel. Currently only volume control.
 type AuxControls struct {
@@ -70,11 +75,11 @@ func (a *AuxControls) OnChangeLoopMode(f func()) {
 func (a *AuxControls) SetLoopMode(mode backend.LoopMode) {
 	switch mode {
 	case backend.LoopAll:
-		a.loop.Importance = widget.HighImportance
-		a.loop.Icon = myTheme.RepeatIcon
+		a.loop.Icon = repeatThemedResource
+		repeatThemedResource.ColorName = theme.ColorNamePrimary
 	case backend.LoopOne:
-		a.loop.Importance = widget.HighImportance
-		a.loop.Icon = myTheme.RepeatOneIcon
+		a.loop.Icon = repeatOneThemedResource
+		repeatOneThemedResource.ColorName = theme.ColorNamePrimary
 	case backend.LoopNone:
 		a.loop.Importance = widget.MediumImportance
 		a.loop.Icon = myTheme.RepeatIcon