diff --git a/src/messages/layouts/messagelayout.cpp b/src/messages/layouts/messagelayout.cpp
index d99de85d..3e690e06 100644
--- a/src/messages/layouts/messagelayout.cpp
+++ b/src/messages/layouts/messagelayout.cpp
@@ -179,8 +179,7 @@ void MessageLayout::paint(QPainter &painter, int width, int y, int messageIndex,
 
         QBrush brush(color, Qt::VerPattern);
 
-        painter.fillRect(0, y + this->container_.getHeight() - 1, this->container_.getWidth(), 1,
-                         brush);
+        painter.fillRect(0, y + this->container_.getHeight() - 1, pixmap->width(), 1, brush);
     }
 
     this->bufferValid_ = true;
diff --git a/src/singletons/thememanager.cpp b/src/singletons/thememanager.cpp
index 983d4711..5c626603 100644
--- a/src/singletons/thememanager.cpp
+++ b/src/singletons/thememanager.cpp
@@ -183,8 +183,9 @@ void ThemeManager::actuallyUpdate(double hue, double multiplier)
     // this->messages.seperatorInner =
 
     // Scrollbar
-    this->scrollbars.background = splits.background;
-    this->scrollbars.background.setAlphaF(qreal(0.2));
+    this->scrollbars.background = QColor(0, 0, 0, 0);
+    //    this->scrollbars.background = splits.background;
+    //    this->scrollbars.background.setAlphaF(qreal(0.2));
     this->scrollbars.thumb = getColor(0, sat, 0.80);
     this->scrollbars.thumbSelected = getColor(0, sat, 0.7);
 
diff --git a/src/widgets/settingspages/appearancepage.cpp b/src/widgets/settingspages/appearancepage.cpp
index af4f13fe..9c839f98 100644
--- a/src/widgets/settingspages/appearancepage.cpp
+++ b/src/widgets/settingspages/appearancepage.cpp
@@ -108,6 +108,7 @@ AppearancePage::AppearancePage()
 
     auto emotes = layout.emplace<QGroupBox>("Emotes").setLayoutType<QVBoxLayout>();
     {
+        /*
         emotes.append(
             this->createCheckBox("Enable Twitch emotes", app->settings->enableTwitchEmotes));
         emotes.append(this->createCheckBox("Enable BetterTTV emotes for Twitch",
@@ -115,6 +116,7 @@ AppearancePage::AppearancePage()
         emotes.append(this->createCheckBox("Enable FrankerFaceZ emotes for Twitch",
                                            app->settings->enableFfzEmotes));
         emotes.append(this->createCheckBox("Enable emojis", app->settings->enableEmojis));
+        */
         emotes.append(
             this->createCheckBox("Enable animations", app->settings->enableGifAnimations));