diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp
index 4652cd65..747fcc35 100644
--- a/src/messages/layouts/MessageLayoutContainer.cpp
+++ b/src/messages/layouts/MessageLayoutContainer.cpp
@@ -103,6 +103,7 @@ void MessageLayoutContainer::_addElement(MessageLayoutElement *element,
 
     // compact emote offset
     bool isCompactEmote =
+        getSettings()->compactEmotes &&
         !this->flags_.has(MessageFlag::DisableCompactEmotes) &&
         element->getCreator().getFlags().has(MessageElementFlag::EmoteImages);
 
@@ -148,6 +149,7 @@ void MessageLayoutContainer::breakLine()
         MessageLayoutElement *element = this->elements_.at(i).get();
 
         bool isCompactEmote =
+            getSettings()->compactEmotes &&
             !this->flags_.has(MessageFlag::DisableCompactEmotes) &&
             element->getCreator().getFlags().has(
                 MessageElementFlag::EmoteImages);
diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index 35d92be3..6593ba88 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -42,6 +42,8 @@ public:
                                      false};
     BoolSetting separateMessages = {"/appearance/messages/separateMessages",
                                     false};
+    BoolSetting compactEmotes = {"/appearance/messages/compactEmotes", true};
+
     //    BoolSetting collapseLongMessages =
     //    {"/appearance/messages/collapseLongMessages", false};
     IntSetting collpseMessagesMinLines = {
diff --git a/src/widgets/settingspages/LookPage.cpp b/src/widgets/settingspages/LookPage.cpp
index 06d33361..728563ba 100644
--- a/src/widgets/settingspages/LookPage.cpp
+++ b/src/widgets/settingspages/LookPage.cpp
@@ -83,9 +83,12 @@ void LookPage::addInterfaceTab(LayoutCreator<QVBoxLayout> layout)
 
         QObject::connect(theme, &QComboBox::currentTextChanged,
                          [w](const QString &themeName) {
-                             if (themeName == "Custom") {
+                             if (themeName == "Custom")
+                             {
                                  w->show();
-                             } else {
+                             }
+                             else
+                             {
                                  w->hide();
                              }
                              getApp()->windows->forceLayoutChannelViews();
@@ -97,9 +100,12 @@ void LookPage::addInterfaceTab(LayoutCreator<QVBoxLayout> layout)
 
         {
             w->setButtonSymbols(QDoubleSpinBox::NoButtons);
-            if (getApp()->themes->themeName.getValue() != "Custom") {
+            if (getApp()->themes->themeName.getValue() != "Custom")
+            {
                 w->hide();
-            } else {
+            }
+            else
+            {
                 w->show();
             }
             w->setRange(-1.0, 1.0);
@@ -181,6 +187,9 @@ void LookPage::addMessageTab(LayoutCreator<QVBoxLayout> layout)
     layout.append(this->createCheckBox(
         "Alternate background", getSettings()->alternateMessageBackground));
 
+    layout.append(
+        this->createCheckBox("Compact emotes", getSettings()->compactEmotes));
+
     layout.append(this->createCheckBox("Grey out historic messages",
                                        getSettings()->greyOutHistoricMessages));
     // --
diff --git a/src/widgets/settingspages/SettingsPage.cpp b/src/widgets/settingspages/SettingsPage.cpp
index 21afcf90..01af4453 100644
--- a/src/widgets/settingspages/SettingsPage.cpp
+++ b/src/widgets/settingspages/SettingsPage.cpp
@@ -1,5 +1,8 @@
 #include "SettingsPage.hpp"
 
+#include "Application.hpp"
+#include "singletons/WindowManager.hpp"
+
 #include <QDebug>
 #include <QPainter>
 
@@ -51,8 +54,8 @@ QCheckBox *SettingsPage::createCheckBox(
     // update setting on toggle
     QObject::connect(checkbox, &QCheckBox::toggled, this,
                      [&setting](bool state) {
-                         qDebug() << "update checkbox value";
-                         setting = state;  //
+                         setting = state;
+                         getApp()->windows->forceLayoutChannelViews();
                      });
 
     return checkbox;