diff --git a/chatterino.pro b/chatterino.pro
index bd621b86..0db81619 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -250,7 +250,8 @@ SOURCES += \
     src/util/FormatTime.cpp \
     src/util/FunctionEventFilter.cpp \
     src/widgets/helper/EffectLabel.cpp \
-    src/widgets/helper/Button.cpp
+    src/widgets/helper/Button.cpp \
+    src/messages/MessageContainer.cpp
 
 HEADERS  += \
     src/Application.hpp \
@@ -449,7 +450,8 @@ HEADERS  += \
     src/util/FunctionEventFilter.hpp \
     src/widgets/helper/EffectLabel.hpp \
     src/util/LayoutHelper.hpp \
-    src/widgets/helper/Button.hpp
+    src/widgets/helper/Button.hpp \
+    src/messages/MessageContainer.hpp
 
 RESOURCES += \ 
     resources/resources.qrc \
diff --git a/resources/settings/emote.svg b/resources/settings/emote.svg
new file mode 100644
index 00000000..10e25c9f
--- /dev/null
+++ b/resources/settings/emote.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M50,100c27.7,0,50-22.3,50-50S77.7,0,50,0S0,22.3,0,50S22.3,100,50,100z M33.3,46.2c4.2,0,8.3-3.3,8.3-8.3
+	s-4.2-8.3-8.3-8.3S25,32.9,25,37.9S29.2,46.2,33.3,46.2z M50,91.7C27,91.7,8.3,73,8.3,50S27,8.3,50,8.3S91.7,27,91.7,50
+	S73,91.7,50,91.7z M23.3,63.1c16.2,10.3,37.1,10.4,53.2,0.1l-4.3-7c-13.7,8.5-31,8.4-44.5-0.1L23.3,63.1z M67.1,46.2
+	c4.2,0,8.3-3.3,8.3-8.3s-4.2-8.3-8.3-8.3s-8.3,3.3-8.3,8.3S62.9,46.2,67.1,46.2z"/>
+</svg>
diff --git a/src/messages/MessageContainer.cpp b/src/messages/MessageContainer.cpp
new file mode 100644
index 00000000..2d47cb90
--- /dev/null
+++ b/src/messages/MessageContainer.cpp
@@ -0,0 +1,9 @@
+#include "MessageContainer.hpp"
+
+namespace chatterino {
+
+MessageContainer::MessageContainer()
+{
+}
+
+}  // namespace chatterino
diff --git a/src/messages/MessageContainer.hpp b/src/messages/MessageContainer.hpp
new file mode 100644
index 00000000..781135e6
--- /dev/null
+++ b/src/messages/MessageContainer.hpp
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <deque>
+
+namespace chatterino {
+
+class MessageContainer
+{
+public:
+    MessageContainer();
+};
+
+}  // namespace chatterino
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index e435bf6e..db9bd077 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -104,8 +104,6 @@ void BaseWindow::init()
                 QSizePolicy policy(QSizePolicy::Ignored,
                                    QSizePolicy::Preferred);
                 policy.setHorizontalStretch(1);
-                //            title->setBaseSize(0, 0);
-                //                title->setScaledContents(true);
                 title->setSizePolicy(policy);
                 buttonLayout->addWidget(title);
                 this->ui_.titleLabel = title;
diff --git a/src/widgets/settingspages/AboutPage.cpp b/src/widgets/settingspages/AboutPage.cpp
index 3826c1aa..710e5e91 100644
--- a/src/widgets/settingspages/AboutPage.cpp
+++ b/src/widgets/settingspages/AboutPage.cpp
@@ -17,7 +17,7 @@
 namespace chatterino {
 
 AboutPage::AboutPage()
-    : SettingsPage("About", ":/images/about.svg")
+    : SettingsPage("About", ":/settings/about.svg")
 {
     LayoutCreator<AboutPage> layoutCreator(this);
 
@@ -179,6 +179,18 @@ AboutPage::AboutPage()
         }
     }
 
+    auto buildInfo = QStringList();
+    buildInfo += "Qt " QT_VERSION_STR;
+#ifdef USEWINSDK
+    buildInfo += "Windows SDK";
+#endif
+#ifdef _MSC_FULL_VER
+    buildInfo += "MSVC " + QString::number(_MSC_FULL_VER, 10);
+#endif
+
+    auto buildText = QString("Built with " + buildInfo.join(", "));
+    layout.emplace<QLabel>(buildText);
+
     layout->addStretch(1);
 }
 
diff --git a/src/widgets/settingspages/AccountsPage.cpp b/src/widgets/settingspages/AccountsPage.cpp
index 1aa3feaa..88c37a12 100644
--- a/src/widgets/settingspages/AccountsPage.cpp
+++ b/src/widgets/settingspages/AccountsPage.cpp
@@ -17,7 +17,7 @@
 namespace chatterino {
 
 AccountsPage::AccountsPage()
-    : SettingsPage("Accounts", ":/images/accounts.svg")
+    : SettingsPage("Accounts", ":/settings/accounts.svg")
 {
     auto *app = getApp();
 
diff --git a/src/widgets/settingspages/CommandPage.cpp b/src/widgets/settingspages/CommandPage.cpp
index 23624962..bb3a60c5 100644
--- a/src/widgets/settingspages/CommandPage.cpp
+++ b/src/widgets/settingspages/CommandPage.cpp
@@ -27,7 +27,7 @@
 namespace chatterino {
 
 CommandPage::CommandPage()
-    : SettingsPage("Commands", ":/images/commands.svg")
+    : SettingsPage("Commands", ":/settings/commands.svg")
 {
     auto app = getApp();
 
diff --git a/src/widgets/settingspages/EmotesPage.cpp b/src/widgets/settingspages/EmotesPage.cpp
index 63a200c3..c7250490 100644
--- a/src/widgets/settingspages/EmotesPage.cpp
+++ b/src/widgets/settingspages/EmotesPage.cpp
@@ -5,7 +5,7 @@
 namespace chatterino {
 
 EmotesPage::EmotesPage()
-    : SettingsPage("Emotes", ":/images/emote.svg")
+    : SettingsPage("Emotes", ":/settings/emote.svg")
 {
     //    SettingManager &settings = SettingManager::getInstance();
     //    LayoutCreator<EmotesPage> layoutCreator(this);
diff --git a/src/widgets/settingspages/FeelPage.cpp b/src/widgets/settingspages/FeelPage.cpp
index 3567fe44..d20c859c 100644
--- a/src/widgets/settingspages/FeelPage.cpp
+++ b/src/widgets/settingspages/FeelPage.cpp
@@ -18,7 +18,7 @@
 namespace chatterino {
 
 FeelPage::FeelPage()
-    : SettingsPage("Feel", ":/images/behave.svg")
+    : SettingsPage("Feel", ":/settings/behave.svg")
 {
     auto app = getApp();
     LayoutCreator<FeelPage> layoutCreator(this);
diff --git a/src/widgets/settingspages/HighlightingPage.cpp b/src/widgets/settingspages/HighlightingPage.cpp
index daca460f..455c0d37 100644
--- a/src/widgets/settingspages/HighlightingPage.cpp
+++ b/src/widgets/settingspages/HighlightingPage.cpp
@@ -30,7 +30,7 @@
 namespace chatterino {
 
 HighlightingPage::HighlightingPage()
-    : SettingsPage("Highlights", ":/images/notifications.svg")
+    : SettingsPage("Highlights", ":/settings/notifications.svg")
 {
     auto app = getApp();
     LayoutCreator<HighlightingPage> layoutCreator(this);
diff --git a/src/widgets/settingspages/LookPage.cpp b/src/widgets/settingspages/LookPage.cpp
index 6f775ee3..6f7032e4 100644
--- a/src/widgets/settingspages/LookPage.cpp
+++ b/src/widgets/settingspages/LookPage.cpp
@@ -37,7 +37,7 @@
 namespace chatterino {
 
 LookPage::LookPage()
-    : SettingsPage("Look", ":/images/theme.svg")
+    : SettingsPage("Look", ":/settings/theme.svg")
 {
     this->initializeUi();
 }