diff --git a/ui/browsing/albumspage.go b/ui/browsing/albumspage.go
index a2d1c35..a066947 100644
--- a/ui/browsing/albumspage.go
+++ b/ui/browsing/albumspage.go
@@ -92,7 +92,7 @@ func (a *AlbumsPage) createContainer(searchgrid bool) {
 		g = a.searchGrid
 	}
 	a.container = container.NewBorder(
-		container.NewHBox(widgets.NewHSpace(9), a.titleDisp, sortVbox, layout.NewSpacer(), searchVbox, widgets.NewHSpace(15)),
+		container.NewHBox(widgets.NewHSpace(6), a.titleDisp, sortVbox, layout.NewSpacer(), searchVbox, widgets.NewHSpace(12)),
 		nil,
 		nil,
 		nil,
diff --git a/ui/browsing/artistsgenrespage.go b/ui/browsing/artistsgenrespage.go
index 58a0703..436554d 100644
--- a/ui/browsing/artistsgenrespage.go
+++ b/ui/browsing/artistsgenrespage.go
@@ -134,7 +134,9 @@ func (a *ArtistsGenresPage) buildGenresListModel(genres []*subsonic.Genre) []wid
 
 func (a *ArtistsGenresPage) buildContainer() {
 	a.container = container.New(&layouts.MaxPadLayout{PadLeft: 15, PadRight: 15, PadTop: 5, PadBottom: 15},
-		container.NewBorder(a.titleDisp, nil, nil, nil, a.list))
+		container.NewBorder(
+			container.New(&layouts.MaxPadLayout{PadLeft: -5}, a.titleDisp),
+			nil, nil, nil, a.list))
 }
 
 func (a *ArtistsGenresPage) CreateRenderer() fyne.WidgetRenderer {
diff --git a/ui/browsing/browsingpane.go b/ui/browsing/browsingpane.go
index 8214c94..4cfdaab 100644
--- a/ui/browsing/browsingpane.go
+++ b/ui/browsing/browsingpane.go
@@ -76,15 +76,16 @@ func NewBrowsingPane(app *backend.App) *BrowsingPane {
 	b.settingsBtn = widget.NewButtonWithIcon("", theme.SettingsIcon(), func() {
 		p := widget.NewPopUpMenu(b.settingsMenu,
 			fyne.CurrentApp().Driver().CanvasForObject(b.settingsBtn))
-		p.ShowAtPosition(fyne.NewPos(b.Size().Width-p.MinSize().Width-theme.Padding()/2,
+		p.ShowAtPosition(fyne.NewPos(b.Size().Width-p.MinSize().Width+4,
 			b.navBtnsContainer.MinSize().Height+theme.Padding()))
 	})
 	b.settingsMenu = fyne.NewMenu("")
 	b.navBtnsContainer = container.NewHBox()
-	b.container = container.NewBorder(
+	b.container = container.NewBorder(container.New(
+		&layouts.MaxPadLayout{PadLeft: -5, PadRight: -5},
 		container.New(layouts.NewLeftMiddleRightLayout(0),
 			container.NewHBox(b.back, b.forward, b.reload), b.navBtnsContainer,
-			container.NewHBox(layout.NewSpacer(), b.settingsBtn)),
+			container.NewHBox(layout.NewSpacer(), b.settingsBtn))),
 		nil, nil, nil, b.pageContainer)
 	return b
 }
diff --git a/ui/browsing/genrepage.go b/ui/browsing/genrepage.go
index 01ddf15..142a4fb 100644
--- a/ui/browsing/genrepage.go
+++ b/ui/browsing/genrepage.go
@@ -66,7 +66,7 @@ func (g *GenrePage) createContainer(searchGrid bool) {
 		gr = g.searchGrid
 	}
 	g.container = container.NewBorder(
-		container.NewHBox(widgets.NewHSpace(9), g.titleDisp, layout.NewSpacer(), searchVbox, widgets.NewHSpace(15)),
+		container.NewHBox(widgets.NewHSpace(6), g.titleDisp, layout.NewSpacer(), searchVbox, widgets.NewHSpace(15)),
 		nil,
 		nil,
 		nil,
diff --git a/ui/widgets/nowplayingcard.go b/ui/widgets/nowplayingcard.go
index 242b6ae..8c6fb43 100644
--- a/ui/widgets/nowplayingcard.go
+++ b/ui/widgets/nowplayingcard.go
@@ -36,8 +36,11 @@ func NewNowPlayingCard() *NowPlayingCard {
 	n.cover.SetMinSize(fyne.NewSize(85, 85))
 	n.cover.FillMode = canvas.ImageFillContain
 
-	n.c = container.NewBorder(nil, nil, n.cover, nil,
-		container.New(&layouts.VboxCustomPadding{ExtraPad: -12}, n.trackName, n.artistName, n.albumName))
+	n.c = container.New(&layouts.MaxPadLayout{PadLeft: -5},
+		container.NewBorder(nil, nil, n.cover, nil,
+			container.New(&layouts.MaxPadLayout{PadBottom: -3},
+				container.New(&layouts.VboxCustomPadding{ExtraPad: -13}, n.trackName, n.artistName, n.albumName))),
+	)
 	return n
 }