diff --git a/ui/browsing/favoritespage.go b/ui/browsing/favoritespage.go
index 389682c..437e18e 100644
--- a/ui/browsing/favoritespage.go
+++ b/ui/browsing/favoritespage.go
@@ -3,9 +3,9 @@ package browsing
 import (
 	"log"
 	"supersonic/backend"
-	"supersonic/res"
 	"supersonic/ui/controller"
 	"supersonic/ui/layouts"
+	myTheme "supersonic/ui/theme"
 	"supersonic/ui/util"
 	"supersonic/ui/widgets"
 	"time"
@@ -73,9 +73,9 @@ func (a *FavoritesPage) createHeader(activeBtnIdx int, searchText string) {
 		SizeName: theme.SizeNameHeadingText,
 	}
 	a.toggleBtns = widgets.NewToggleButtonGroup(activeBtnIdx,
-		widget.NewButtonWithIcon("", res.ResDiscInvertPng, a.onShowFavoriteAlbums),
-		widget.NewButtonWithIcon("", res.ResPeopleInvertPng, a.onShowFavoriteArtists),
-		widget.NewButtonWithIcon("", res.ResMusicnotesInvertPng, a.onShowFavoriteSongs))
+		widget.NewButtonWithIcon("", myTheme.AlbumIcon, a.onShowFavoriteAlbums),
+		widget.NewButtonWithIcon("", myTheme.ArtistIcon, a.onShowFavoriteArtists),
+		widget.NewButtonWithIcon("", myTheme.TracksIcon, a.onShowFavoriteSongs))
 	a.searcher = widgets.NewSearcher()
 	a.searcher.OnSearched = a.OnSearched
 	a.searcher.Entry.Text = searchText
diff --git a/ui/browsing/trackspage.go b/ui/browsing/trackspage.go
index 99f8b75..b3e06c9 100644
--- a/ui/browsing/trackspage.go
+++ b/ui/browsing/trackspage.go
@@ -2,10 +2,10 @@ package browsing
 
 import (
 	"supersonic/backend"
-	"supersonic/res"
 	"supersonic/sharedutil"
 	"supersonic/ui/controller"
 	"supersonic/ui/layouts"
+	"supersonic/ui/theme"
 	"supersonic/ui/widgets"
 
 	"fyne.io/fyne/v2"
@@ -56,7 +56,7 @@ func NewTracksPage(contr *controller.Controller, conf *backend.TracksPageConfig,
 
 	t.title = widget.NewRichTextWithText("All Tracks")
 	t.title.Segments[0].(*widget.TextSegment).Style.SizeName = widget.RichTextStyleHeading.SizeName
-	t.playRandom = widget.NewButtonWithIcon("Play random", res.ResShuffleInvertSvg, t.playRandomSongs)
+	t.playRandom = widget.NewButtonWithIcon("Play random", theme.ShuffleIcon, t.playRandomSongs)
 	t.searcher = widgets.NewSearcher()
 	t.searcher.OnSearched = t.OnSearched
 	t.createContainer()