diff --git a/chatterino.pro b/chatterino.pro
index f5b32d67c..1cc1c85bb 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -192,8 +192,6 @@ SOURCES += \
     src/widgets/Scrollbar.cpp \
     src/widgets/settingspages/AboutPage.cpp \
     src/widgets/settingspages/AccountsPage.cpp \
-    src/widgets/settingspages/AppearancePage.cpp \
-    src/widgets/settingspages/BehaviourPage.cpp \
     src/widgets/settingspages/BrowserExtensionPage.cpp \
     src/widgets/settingspages/CommandPage.cpp \
     src/widgets/settingspages/EmotesPage.cpp \
@@ -224,7 +222,9 @@ SOURCES += \
     src/singletons/Settings.cpp \
     src/singletons/Updates.cpp \
     src/singletons/Theme.cpp \
-    src/controllers/moderationactions/ModerationActionModel.cpp
+    src/controllers/moderationactions/ModerationActionModel.cpp \
+    src/widgets/settingspages/LookPage.cpp \
+    src/widgets/settingspages/FeelPage.cpp
 
 HEADERS  += \
     src/Application.hpp \
@@ -358,8 +358,6 @@ HEADERS  += \
     src/widgets/Scrollbar.hpp \
     src/widgets/settingspages/AboutPage.hpp \
     src/widgets/settingspages/AccountsPage.hpp \
-    src/widgets/settingspages/AppearancePage.hpp \
-    src/widgets/settingspages/BehaviourPage.hpp \
     src/widgets/settingspages/BrowserExtensionPage.hpp \
     src/widgets/settingspages/CommandPage.hpp \
     src/widgets/settingspages/EmotesPage.hpp \
@@ -395,7 +393,9 @@ HEADERS  += \
     src/common/SimpleSignalVector.hpp \
     src/common/SignalVector.hpp \
     src/common/Singleton.hpp \
-    src/controllers/moderationactions/ModerationActionModel.hpp
+    src/controllers/moderationactions/ModerationActionModel.hpp \
+    src/widgets/settingspages/LookPage.hpp \
+    src/widgets/settingspages/FeelPage.hpp
 
 RESOURCES += \ 
     resources/resources.qrc \
diff --git a/src/widgets/dialogs/SettingsDialog.cpp b/src/widgets/dialogs/SettingsDialog.cpp
index 6b9bb9928..48a987a7d 100644
--- a/src/widgets/dialogs/SettingsDialog.cpp
+++ b/src/widgets/dialogs/SettingsDialog.cpp
@@ -5,16 +5,16 @@
 #include "widgets/helper/SettingsDialogTab.hpp"
 #include "widgets/settingspages/AboutPage.hpp"
 #include "widgets/settingspages/AccountsPage.hpp"
-#include "widgets/settingspages/AppearancePage.hpp"
-#include "widgets/settingspages/BehaviourPage.hpp"
 #include "widgets/settingspages/BrowserExtensionPage.hpp"
 #include "widgets/settingspages/CommandPage.hpp"
 #include "widgets/settingspages/EmotesPage.hpp"
 #include "widgets/settingspages/ExternalToolsPage.hpp"
+#include "widgets/settingspages/FeelPage.hpp"
 #include "widgets/settingspages/HighlightingPage.hpp"
 #include "widgets/settingspages/IgnoreusersPage.hpp"
 #include "widgets/settingspages/KeyboardSettingsPage.hpp"
 #include "widgets/settingspages/LogsPage.hpp"
+#include "widgets/settingspages/LookPage.hpp"
 #include "widgets/settingspages/ModerationPage.hpp"
 #include "widgets/settingspages/SpecialChannelsPage.hpp"
 
diff --git a/src/widgets/helper/SearchPopup.cpp b/src/widgets/helper/SearchPopup.cpp
index 865cc0c8e..9ddd333ec 100644
--- a/src/widgets/helper/SearchPopup.cpp
+++ b/src/widgets/helper/SearchPopup.cpp
@@ -2,6 +2,7 @@
 
 #include <QHBoxLayout>
 #include <QLineEdit>
+#include <QPushButton>
 #include <QVBoxLayout>
 
 #include "common/Channel.hpp"
diff --git a/src/widgets/settingspages/BehaviourPage.cpp b/src/widgets/settingspages/FeelPage.cpp
similarity index 96%
rename from src/widgets/settingspages/BehaviourPage.cpp
rename to src/widgets/settingspages/FeelPage.cpp
index 621722ba0..8e961629d 100644
--- a/src/widgets/settingspages/BehaviourPage.cpp
+++ b/src/widgets/settingspages/FeelPage.cpp
@@ -1,4 +1,4 @@
-#include "BehaviourPage.hpp"
+#include "FeelPage.hpp"
 
 #include "Application.hpp"
 #include "util/LayoutCreator.hpp"
diff --git a/src/widgets/settingspages/BehaviourPage.hpp b/src/widgets/settingspages/FeelPage.hpp
similarity index 100%
rename from src/widgets/settingspages/BehaviourPage.hpp
rename to src/widgets/settingspages/FeelPage.hpp
diff --git a/src/widgets/settingspages/AppearancePage.cpp b/src/widgets/settingspages/LookPage.cpp
similarity index 96%
rename from src/widgets/settingspages/AppearancePage.cpp
rename to src/widgets/settingspages/LookPage.cpp
index 836e2a108..1611654f5 100644
--- a/src/widgets/settingspages/AppearancePage.cpp
+++ b/src/widgets/settingspages/LookPage.cpp
@@ -1,4 +1,4 @@
-#include "AppearancePage.hpp"
+#include "LookPage.hpp"
 
 #include "Application.hpp"
 #include "singletons/WindowManager.hpp"
@@ -164,7 +164,7 @@ void AppearancePage::addEmotesGroup(QVBoxLayout &layout)
     */
     box.append(this->createCheckBox("Animated emotes", getSettings()->enableGifAnimations));
 
-    auto scaleBox = box.emplace<QHBoxLayout>();
+    auto scaleBox = box.emplace<QHBoxLayout>().withoutMargin();
     {
         scaleBox.emplace<QLabel>("Size:");
 
diff --git a/src/widgets/settingspages/AppearancePage.hpp b/src/widgets/settingspages/LookPage.hpp
similarity index 100%
rename from src/widgets/settingspages/AppearancePage.hpp
rename to src/widgets/settingspages/LookPage.hpp