diff --git a/display/bookmarks.go b/display/bookmarks.go
index fa051a9..9a73b07 100644
--- a/display/bookmarks.go
+++ b/display/bookmarks.go
@@ -32,6 +32,8 @@ func bkmkInit() {
 		form.SetLabelColor(config.GetColor("bkmk_modal_label"))
 		form.SetFieldBackgroundColor(config.GetColor("bkmk_modal_field_bg"))
 		form.SetFieldTextColor(config.GetColor("bkmk_modal_field_text"))
+		form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
+		form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
 		frame := m.GetFrame()
 		frame.SetBorderColor(config.GetColor("bkmk_modal_text"))
 		frame.SetTitleColor(config.GetColor("bkmk_modal_text"))
@@ -44,6 +46,8 @@ func bkmkInit() {
 		form.SetLabelColor(tcell.ColorWhite)
 		form.SetFieldBackgroundColor(tcell.ColorWhite)
 		form.SetFieldTextColor(tcell.ColorBlack)
+		form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
+		form.SetButtonTextColorFocused(tcell.ColorWhite)
 		frame := m.GetFrame()
 		frame.SetBorderColor(tcell.ColorWhite)
 		frame.SetTitleColor(tcell.ColorWhite)
diff --git a/display/display.go b/display/display.go
index 4e1a68a..63e4cd0 100644
--- a/display/display.go
+++ b/display/display.go
@@ -110,6 +110,7 @@ func Init(version, commit, builtBy string) {
 			fmt.Sprintf("[%s:%s]|[-]", config.GetColorString("tab_divider"), config.GetColorString("bg")),
 			fmt.Sprintf("[%s:%s]|[-]", config.GetColorString("tab_divider"), config.GetColorString("bg")),
 		)
+		browser.Switcher.SetBackgroundColor(config.GetColor("bg"))
 	} else {
 		bottomBar.SetBackgroundColor(tcell.ColorWhite)
 		bottomBar.SetLabelColor(tcell.ColorBlack)
@@ -435,7 +436,7 @@ func NewTab() {
 	tabs[curTab].addToHistory("about:newtab")
 	tabs[curTab].history.pos = 0 // Manually set as first page
 
-	browser.AddTab(strconv.Itoa(curTab), strconv.Itoa(curTab+1), tabs[curTab].view)
+	browser.AddTab(strconv.Itoa(curTab), makeTabLabel(strconv.Itoa(curTab+1)), tabs[curTab].view)
 	browser.SetCurrentTab(strconv.Itoa(curTab))
 	App.SetFocus(tabs[curTab].view)
 
diff --git a/display/download.go b/display/download.go
index e36ac9a..5b8ff3c 100644
--- a/display/download.go
+++ b/display/download.go
@@ -43,6 +43,9 @@ func dlInit() {
 		chm.SetButtonTextColor(config.GetColor("btn_text"))
 		chm.SetBackgroundColor(config.GetColor("dl_choice_modal_bg"))
 		chm.SetTextColor(config.GetColor("dl_choice_modal_text"))
+		form := chm.GetForm()
+		form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
+		form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
 		frame := chm.GetFrame()
 		frame.SetBorderColor(config.GetColor("dl_choice_modal_text"))
 		frame.SetTitleColor(config.GetColor("dl_choice_modal_text"))
@@ -51,6 +54,9 @@ func dlInit() {
 		dlm.SetButtonTextColor(config.GetColor("btn_text"))
 		dlm.SetBackgroundColor(config.GetColor("dl_modal_bg"))
 		dlm.SetTextColor(config.GetColor("dl_modal_text"))
+		form = dlm.GetForm()
+		form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
+		form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
 		frame = dlm.GetFrame()
 		frame.SetBorderColor(config.GetColor("dl_modal_text"))
 		frame.SetTitleColor(config.GetColor("dl_modal_text"))
@@ -59,13 +65,19 @@ func dlInit() {
 		chm.SetButtonTextColor(tcell.ColorBlack)
 		chm.SetBackgroundColor(tcell.ColorBlack)
 		chm.SetTextColor(tcell.ColorWhite)
-		dlChoiceModal.SetBorderColor(tcell.ColorWhite)
-		dlChoiceModal.GetFrame().SetTitleColor(tcell.ColorWhite)
+		chm.SetBorderColor(tcell.ColorWhite)
+		chm.GetFrame().SetTitleColor(tcell.ColorWhite)
+		form := chm.GetForm()
+		form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
+		form.SetButtonTextColorFocused(tcell.ColorWhite)
 
 		dlm.SetButtonBackgroundColor(tcell.ColorWhite)
 		dlm.SetButtonTextColor(tcell.ColorBlack)
 		dlm.SetBackgroundColor(tcell.ColorBlack)
 		dlm.SetTextColor(tcell.ColorWhite)
+		form = dlm.GetForm()
+		form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
+		form.SetButtonTextColorFocused(tcell.ColorWhite)
 		frame := dlm.GetFrame()
 		frame.SetBorderColor(tcell.ColorWhite)
 		frame.SetTitleColor(tcell.ColorWhite)
diff --git a/display/handlers.go b/display/handlers.go
index 5df327f..e9234df 100644
--- a/display/handlers.go
+++ b/display/handlers.go
@@ -95,7 +95,7 @@ func handleFavicon(t *tab, host string) {
 	defer func() {
 		// Update display if needed
 		if t.page.Favicon != "" && isValidTab(t) {
-			browser.SetTabLabel(strconv.Itoa(tabNumber(t)), t.page.Favicon)
+			browser.SetTabLabel(strconv.Itoa(tabNumber(t)), makeTabLabel(t.page.Favicon))
 			App.Draw()
 		}
 	}()
diff --git a/display/modals.go b/display/modals.go
index 6cbda34..84e6a99 100644
--- a/display/modals.go
+++ b/display/modals.go
@@ -47,6 +47,9 @@ func modalInit() {
 		m.SetButtonBackgroundColor(config.GetColor("btn_bg"))
 		m.SetButtonTextColor(config.GetColor("btn_text"))
 		m.SetTextColor(config.GetColor("info_modal_text"))
+		form := m.GetForm()
+		form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
+		form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
 		frame := m.GetFrame()
 		frame.SetBorderColor(config.GetColor("info_modal_text"))
 		frame.SetTitleColor(config.GetColor("info_modal_text"))
@@ -56,6 +59,9 @@ func modalInit() {
 		m.SetButtonBackgroundColor(config.GetColor("btn_bg"))
 		m.SetButtonTextColor(config.GetColor("btn_text"))
 		m.SetTextColor(config.GetColor("error_modal_text"))
+		form = m.GetForm()
+		form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
+		form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
 		frame = errorModal.GetFrame()
 		frame.SetBorderColor(config.GetColor("error_modal_text"))
 		frame.SetTitleColor(config.GetColor("error_modal_text"))
@@ -68,19 +74,27 @@ func modalInit() {
 		frame = inputModal.GetFrame()
 		frame.SetBorderColor(config.GetColor("input_modal_text"))
 		frame.SetTitleColor(config.GetColor("input_modal_text"))
-		form := inputModal.GetForm()
+		form = inputModal.GetForm()
 		form.SetFieldBackgroundColor(config.GetColor("input_modal_field_bg"))
 		form.SetFieldTextColor(config.GetColor("input_modal_field_text"))
+		form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
+		form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
 
 		m = yesNoModal
 		m.SetButtonBackgroundColor(config.GetColor("btn_bg"))
 		m.SetButtonTextColor(config.GetColor("btn_text"))
+		form = m.GetForm()
+		form.SetButtonBackgroundColorFocused(config.GetColor("btn_text"))
+		form.SetButtonTextColorFocused(config.GetColor("btn_bg"))
 	} else {
 		m := infoModal
 		m.SetBackgroundColor(tcell.ColorBlack)
 		m.SetButtonBackgroundColor(tcell.ColorWhite)
 		m.SetButtonTextColor(tcell.ColorBlack)
 		m.SetTextColor(tcell.ColorWhite)
+		form := m.GetForm()
+		form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
+		form.SetButtonTextColorFocused(tcell.ColorWhite)
 		frame := infoModal.GetFrame()
 		frame.SetBorderColor(tcell.ColorWhite)
 		frame.SetTitleColor(tcell.ColorWhite)
@@ -90,6 +104,9 @@ func modalInit() {
 		m.SetButtonBackgroundColor(tcell.ColorWhite)
 		m.SetButtonTextColor(tcell.ColorBlack)
 		m.SetTextColor(tcell.ColorWhite)
+		form = m.GetForm()
+		form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
+		form.SetButtonTextColorFocused(tcell.ColorWhite)
 		frame = errorModal.GetFrame()
 		frame.SetBorderColor(tcell.ColorWhite)
 		frame.SetTitleColor(tcell.ColorWhite)
@@ -102,14 +119,19 @@ func modalInit() {
 		frame = inputModal.GetFrame()
 		frame.SetBorderColor(tcell.ColorWhite)
 		frame.SetTitleColor(tcell.ColorWhite)
-		form := inputModal.GetForm()
+		form = inputModal.GetForm()
 		form.SetFieldBackgroundColor(tcell.ColorWhite)
 		form.SetFieldTextColor(tcell.ColorBlack)
+		form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
+		form.SetButtonTextColorFocused(tcell.ColorWhite)
 
 		// YesNo background color is changed in funcs
 		m = yesNoModal
 		m.SetButtonBackgroundColor(tcell.ColorWhite)
 		m.SetButtonTextColor(tcell.ColorBlack)
+		form = m.GetForm()
+		form.SetButtonBackgroundColorFocused(tcell.ColorBlack)
+		form.SetButtonTextColorFocused(tcell.ColorWhite)
 	}
 
 	// Modal functions that can't be added up above, because they return the wrong type
diff --git a/display/private.go b/display/private.go
index 2740113..403e884 100644
--- a/display/private.go
+++ b/display/private.go
@@ -113,7 +113,7 @@ func setPage(t *tab, p *structs.Page) {
 
 	// Set tab number in case a favicon from before overwrote it
 	tabNum := tabNumber(t)
-	browser.SetTabLabel(strconv.Itoa(tabNum), strconv.Itoa(tabNum+1))
+	browser.SetTabLabel(strconv.Itoa(tabNum), makeTabLabel(strconv.Itoa(tabNum+1)))
 	App.Draw()
 
 	go func() {
diff --git a/display/util.go b/display/util.go
index 33e4a59..fb8473b 100644
--- a/display/util.go
+++ b/display/util.go
@@ -13,6 +13,12 @@ import (
 
 // This file contains funcs that are small, self-contained utilities.
 
+// makeTabLabel takes a string and adds spacing to it, making it
+// suitable for display as a tab label.
+func makeTabLabel(s string) string {
+	return " " + s + " "
+}
+
 // tabNumber gets the index of the tab in the tabs slice. It returns -1
 // if the tab is not in that slice.
 func tabNumber(t *tab) int {