diff --git a/Telegram/Resources/langs/rewrites/en.json b/Telegram/Resources/langs/rewrites/en.json
index 3f456d7b1..f23619866 100644
--- a/Telegram/Resources/langs/rewrites/en.json
+++ b/Telegram/Resources/langs/rewrites/en.json
@@ -28,6 +28,7 @@
 	"ktg_mac_menu_show": "Show Kotatogram",
 	"ktg_settings_kotato": "Kotatogram Settings",
 	"ktg_settings_chats": "Chats",
+	"ktg_settings_emoji_outline": "Big emoji outline",
 	"ktg_fonts_title": "Fonts",
 	"ktg_settings_fonts": "Change application fonts",
 	"ktg_fonts_reset": "Reset",
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp b/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp
index b5f0b20f9..087b5938b 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "chat_helpers/stickers_emoji_image_loader.h"
 
+#include "kotato/kotato_settings.h"
 #include "styles/style_chat.h"
 
 #include <QtCore/QtMath>
@@ -35,7 +36,9 @@ QImage EmojiImageLoader::prepare(EmojiPtr emoji) const {
 	auto tinted = QImage(
 		QSize(st::largeEmojiSize, st::largeEmojiSize) * factor,
 		QImage::Format_ARGB32_Premultiplied);
-	tinted.fill(Qt::white);
+	tinted.fill(::Kotato::JsonSettings::GetBool("big_emoji_outline")
+		? Qt::white
+		: QColor(0, 0, 0, 0));
 	if (loaded) {
 		QPainter p(&tinted);
 		p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
index f4cc13c4c..80e01663d 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "chat_helpers/stickers_emoji_pack.h"
 
+#include "kotato/kotato_settings.h"
 #include "chat_helpers/stickers_emoji_image_loader.h"
 #include "history/view/history_view_element.h"
 #include "history/history_item.h"
@@ -112,6 +113,13 @@ EmojiPack::EmojiPack(not_null<Main::Session*> session)
 		refreshAll();
 	}, _lifetime);
 
+	::Kotato::JsonSettings::Events(
+		"big_emoji_outline"
+	) | rpl::start_with_next([=] {
+		_images.clear();
+		refreshAll();
+	}, _lifetime);
+
 	Ui::Emoji::Updated(
 	) | rpl::start_with_next([=] {
 		_images.clear();
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 557c9f320..d4ed7f6d7 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/history_widget.h"
 
+#include "kotato/kotato_settings.h"
 #include "api/api_editing.h"
 #include "api/api_bot.h"
 #include "api/api_chat_participants.h"
@@ -634,6 +635,14 @@ HistoryWidget::HistoryWidget(
 		});
 	}, lifetime());
 
+	::Kotato::JsonSettings::Events(
+		"big_emoji_outline"
+	) | rpl::start_with_next([=] {
+		crl::on_main(this, [=] {
+			updateHistoryGeometry();
+		});
+	}, lifetime());
+
 	session().data().channelDifferenceTooLong(
 	) | rpl::filter([=](not_null<ChannelData*> channel) {
 		return _peer == channel.get();
diff --git a/Telegram/SourceFiles/kotato/kotato_settings.cpp b/Telegram/SourceFiles/kotato/kotato_settings.cpp
index e94eee215..cf239b9f2 100644
--- a/Telegram/SourceFiles/kotato/kotato_settings.cpp
+++ b/Telegram/SourceFiles/kotato/kotato_settings.cpp
@@ -226,6 +226,9 @@ const std::map<QString, Definition, std::greater<QString>> DefinitionMap {
 	{ "fonts/size", {
 		.type = SettingType::IntSetting,
 		.defaultValue = 0, }},
+	{ "big_emoji_outline", {
+		.type = SettingType::BoolSetting,
+		.defaultValue = true, }},
 };
 
 using OldOptionKey = QString;
diff --git a/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp b/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp
index c468c1a20..7f4ef3ba1 100644
--- a/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp
+++ b/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp
@@ -88,6 +88,8 @@ void SetupKotatoChats(
 void SetupKotatoMessages(not_null<Ui::VerticalLayout*> container) {
 	Ui::AddSubsectionTitle(container, rktr("ktg_settings_messages"));
 
+	SettingsMenuJsonSwitch(ktg_settings_emoji_outline, big_emoji_outline);
+
 	Ui::AddSkip(container);
 }