diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp
index 4032db9e..d4a64338 100644
--- a/src/widgets/settingspages/GeneralPage.cpp
+++ b/src/widgets/settingspages/GeneralPage.cpp
@@ -304,6 +304,12 @@ void GeneralPage::initLayout(SettingsLayout &layout)
     layout.addCheckbox("Start with Windows", s.autorun);
 #endif
     layout.addCheckbox("Restart on crash", s.restartOnCrash);
+    if (!BaseWindow::supportsCustomWindowFrame())
+    {
+        layout.addCheckbox("Show preferences button (ctrl+p to show)",
+                           s.hidePreferencesButton, true);
+        layout.addCheckbox("Show user button", s.hideUserButton, true);
+    }
 
     layout.addTitle("Chat");
 
@@ -344,12 +350,6 @@ void GeneralPage::initLayout(SettingsLayout &layout)
                                s.pauseChatModifier);
     layout.addCheckbox("Show input when it's empty", s.showEmptyInput);
     layout.addCheckbox("Show message length while typing", s.showMessageLength);
-    if (!BaseWindow::supportsCustomWindowFrame())
-    {
-        layout.addCheckbox("Show preferences button (ctrl+p to show)",
-                           s.hidePreferencesButton, true);
-        layout.addCheckbox("Show user button", s.hideUserButton, true);
-    }
 
     layout.addTitle("Messages");
     layout.addCheckbox("Seperate with lines", s.separateMessages);
diff --git a/src/widgets/settingspages/HighlightingPage.cpp b/src/widgets/settingspages/HighlightingPage.cpp
index 46cdba3b..7113ee33 100644
--- a/src/widgets/settingspages/HighlightingPage.cpp
+++ b/src/widgets/settingspages/HighlightingPage.cpp
@@ -47,9 +47,8 @@ HighlightingPage::HighlightingPage()
             auto highlights = tabs.appendTab(new QVBoxLayout, "Messages");
             {
                 highlights.emplace<QLabel>(
-                    "Messages can be highlighted if they match a certain "
-                    "pattern.\n"
-                    "NOTE: User highlights will override phrase highlights.");
+                    "Play notification sounds and highlight messages based on "
+                    "certain patterns.");
 
                 EditableModelView *view =
                     highlights
@@ -89,8 +88,10 @@ HighlightingPage::HighlightingPage()
             auto pingUsers = tabs.appendTab(new QVBoxLayout, "Users");
             {
                 pingUsers.emplace<QLabel>(
-                    "Messages from a certain user can be highlighted.\n"
-                    "NOTE: User highlights will override phrase highlights.");
+                    "Play notification sounds and highlight messages from "
+                    "certain users.\n"
+                    "User highlights are prioritized over message "
+                    "highlights.");
                 EditableModelView *view =
                     pingUsers
                         .emplace<EditableModelView>(
@@ -132,11 +133,11 @@ HighlightingPage::HighlightingPage()
             }
 
             auto disabledUsers =
-                tabs.appendTab(new QVBoxLayout, "Excluded Users");
+                tabs.appendTab(new QVBoxLayout, "Blacklisted Users");
             {
                 disabledUsers.emplace<QLabel>(
-                    "This is a list of users (e.g. bots) whose messages should "
-                    "<u>not</u> be highlighted.");
+                    "Disable notification sounds and highlights from certain "
+                    "users (e.g. bots).");
                 EditableModelView *view =
                     disabledUsers
                         .emplace<EditableModelView>(
@@ -144,7 +145,7 @@ HighlightingPage::HighlightingPage()
                         .getElement();
 
                 view->addRegexHelpLink();
-                view->setTitles({"Pattern", "Enable\nregex"});
+                view->setTitles({"Username", "Enable\nregex"});
                 view->getTableView()->horizontalHeader()->setSectionResizeMode(
                     QHeaderView::Fixed);
                 view->getTableView()->horizontalHeader()->setSectionResizeMode(