diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 7412592163..7cc0af58ba 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -129,8 +129,6 @@ set(ayugram_files
         ayu/ui/ayu_logo.h
         ayu/ui/utils/ayu_profile_values.cpp
         ayu/ui/utils/ayu_profile_values.h
-        ayu/ui/settings/icon_picker.cpp
-        ayu/ui/settings/icon_picker.h
         ayu/ui/settings/settings_ayu.cpp
         ayu/ui/settings/settings_ayu.h
         ayu/ui/context_menu/context_menu.cpp
@@ -143,10 +141,8 @@ set(ayugram_files
         ayu/ui/message_history/history_item.h
         ayu/ui/message_history/history_section.cpp
         ayu/ui/message_history/history_section.h
-        ayu/ui/boxes/edit_deleted_mark.cpp
-        ayu/ui/boxes/edit_deleted_mark.h
-        ayu/ui/boxes/edit_edited_mark.cpp
-        ayu/ui/boxes/edit_edited_mark.h
+        ayu/ui/boxes/edit_mark_box.cpp
+        ayu/ui/boxes/edit_mark_box.h
         ayu/ui/boxes/font_selector.cpp
         ayu/ui/boxes/font_selector.h
         ayu/ui/boxes/theme_selector_box.cpp
@@ -155,6 +151,8 @@ set(ayugram_files
         ayu/ui/boxes/message_shot_box.h
         ayu/ui/components/image_view.cpp
         ayu/ui/components/image_view.h
+        ayu/ui/components/icon_picker.cpp
+        ayu/ui/components/icon_picker.h
         ayu/libs/json.hpp
         ayu/libs/json_ext.hpp
         ayu/libs/sqlite/sqlite3.c
diff --git a/Telegram/SourceFiles/api/api_polls.cpp b/Telegram/SourceFiles/api/api_polls.cpp
index 303dd8f4e4..9a68a71e01 100644
--- a/Telegram/SourceFiles/api/api_polls.cpp
+++ b/Telegram/SourceFiles/api/api_polls.cpp
@@ -171,7 +171,7 @@ void Polls::sendVotes(
 		hideSending();
 		_session->updates().applyUpdates(result);
 
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		if (!settings.sendReadMessages && settings.markReadAfterAction && item)
 		{
 			readHistory(item);
diff --git a/Telegram/SourceFiles/api/api_send_progress.cpp b/Telegram/SourceFiles/api/api_send_progress.cpp
index 18cbbc3c64..2f3eeabc63 100644
--- a/Telegram/SourceFiles/api/api_send_progress.cpp
+++ b/Telegram/SourceFiles/api/api_send_progress.cpp
@@ -118,7 +118,7 @@ void SendProgressManager::send(const Key &key, int progress) {
 	}
 
 	// AyuGram sendUploadProgress
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.sendUploadProgress)
 	{
 		DEBUG_LOG(("[AyuGram] Don't send upload progress"));
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 2cdb347706..5bac3c0aab 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -998,7 +998,7 @@ void Updates::updateOnline(crl::time lastNonIdleTime, bool gotOtherOffline) {
 	});
 
 	// AyuGram sendOnlinePackets
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	const auto& config = _session->serverConfig();
 	bool isOnlineOrig = Core::App().hasActiveWindow(&session());
 	bool isOnline = settings.sendOnlinePackets && isOnlineOrig;
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index cf03883baa..44b5427fd6 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -426,7 +426,7 @@ void ApiWrap::toggleHistoryArchived(
 		if (archived) {
 			history->setFolder(_session->data().folder(archiveId));
 		} else {
-			const auto& settings = AyuSettings::getInstance();
+			const auto &settings = AyuSettings::getInstance();
 			if (settings.hideAllChatsFolder) {
 				if (const auto window = Core::App().activeWindow()) {
 					if (const auto controller = window->sessionController()) {
@@ -1303,7 +1303,7 @@ void ApiWrap::migrateFail(not_null<PeerData*> peer, const QString &error) {
 
 void ApiWrap::markContentsRead(
 		const base::flat_set<not_null<HistoryItem*>> &items) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	auto markedIds = QVector<MTPint>();
 	auto channelMarkedIds = base::flat_map<
@@ -1349,7 +1349,7 @@ void ApiWrap::markContentsRead(not_null<HistoryItem*> item) {
 		return;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.sendReadMessages && !passthrough) {
 		return;
 	}
@@ -1752,7 +1752,7 @@ void ApiWrap::joinChannel(not_null<ChannelData*> channel) {
 		using Flag = ChannelDataFlag;
 		chatParticipants().loadSimilarPeers(channel);
 
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		if (!settings.collapseSimilarChannels) {
 			channel->setFlags(channel->flags() | Flag::SimilarExpanded);
 		}
@@ -3380,7 +3380,7 @@ void ApiWrap::forwardMessages(
 					shared->callback();
 				}
 
-				const auto& settings = AyuSettings::getInstance();
+				const auto &settings = AyuSettings::getInstance();
 				if (!settings.sendReadMessages && settings.markReadAfterAction && history->lastMessage())
 				{
 					readHistory(history->lastMessage());
diff --git a/Telegram/SourceFiles/ayu/ayu_infra.cpp b/Telegram/SourceFiles/ayu/ayu_infra.cpp
index 5571b36ec6..71bb7804a4 100644
--- a/Telegram/SourceFiles/ayu/ayu_infra.cpp
+++ b/Telegram/SourceFiles/ayu/ayu_infra.cpp
@@ -28,7 +28,7 @@ void initLang() {
 }
 
 void initUiSettings() {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	AyuUiSettings::setMonoFont(settings.monoFont);
 	AyuUiSettings::setWideMultiplier(settings.wideMultiplier);
diff --git a/Telegram/SourceFiles/ayu/ayu_settings.cpp b/Telegram/SourceFiles/ayu/ayu_settings.cpp
index e3ea5e76ec..f38b86d612 100644
--- a/Telegram/SourceFiles/ayu/ayu_settings.cpp
+++ b/Telegram/SourceFiles/ayu/ayu_settings.cpp
@@ -417,8 +417,8 @@ void set_localPremium(bool val) {
 	settings->localPremium = val;
 }
 
-void set_appIcon(QString val) {
-	settings->appIcon = std::move(val);
+void set_appIcon(const QString &val) {
+	settings->appIcon = val;
 }
 
 void set_simpleQuotesAndReplies(bool val) {
@@ -429,13 +429,13 @@ void set_replaceBottomInfoWithIcons(bool val) {
 	settings->replaceBottomInfoWithIcons = val;
 }
 
-void set_deletedMark(QString val) {
-	settings->deletedMark = std::move(val);
+void set_deletedMark(const QString &val) {
+	settings->deletedMark = val;
 	deletedMarkReactive = settings->deletedMark;
 }
 
-void set_editedMark(QString val) {
-	settings->editedMark = std::move(val);
+void set_editedMark(const QString &val) {
+	settings->editedMark = val;
 	editedMarkReactive = settings->editedMark;
 }
 
@@ -522,7 +522,7 @@ void set_showStreamerToggleInTray(bool val) {
 	settings->showStreamerToggleInTray = val;
 }
 
-void set_monoFont(QString val) {
+void set_monoFont(const QString &val) {
 	settings->monoFont = val;
 }
 
diff --git a/Telegram/SourceFiles/ayu/ayu_settings.h b/Telegram/SourceFiles/ayu/ayu_settings.h
index 6bbf81c7c7..44939b05fb 100644
--- a/Telegram/SourceFiles/ayu/ayu_settings.h
+++ b/Telegram/SourceFiles/ayu/ayu_settings.h
@@ -132,11 +132,11 @@ void set_increaseWebviewWidth(bool val);
 void set_disableNotificationsDelay(bool val);
 void set_localPremium(bool val);
 
-void set_appIcon(QString val);
+void set_appIcon(const QString &val);
 void set_simpleQuotesAndReplies(bool val);
 void set_replaceBottomInfoWithIcons(bool val);
-void set_deletedMark(QString val);
-void set_editedMark(QString val);
+void set_deletedMark(const QString &val);
+void set_editedMark(const QString &val);
 void set_recentStickersCount(int val);
 
 void set_showReactionsPanelInContextMenu(int val);
@@ -162,7 +162,7 @@ void set_showStreamerToggleInDrawer(bool val);
 void set_showGhostToggleInTray(bool val);
 void set_showStreamerToggleInTray(bool val);
 
-void set_monoFont(QString val);
+void set_monoFont(const QString &val);
 
 void set_hideNotificationCounters(bool val);
 void set_hideNotificationBadge(bool val);
diff --git a/Telegram/SourceFiles/ayu/ayu_worker.cpp b/Telegram/SourceFiles/ayu/ayu_worker.cpp
index 6ed8a19335..5cfc3faadc 100644
--- a/Telegram/SourceFiles/ayu/ayu_worker.cpp
+++ b/Telegram/SourceFiles/ayu/ayu_worker.cpp
@@ -42,7 +42,7 @@ void runOnce() {
 		lateInit();
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.sendOfflinePacketAfterOnline) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/ayu/ui/ayu_logo.cpp b/Telegram/SourceFiles/ayu/ui/ayu_logo.cpp
index 45395f1ccf..59d00abe2d 100644
--- a/Telegram/SourceFiles/ayu/ui/ayu_logo.cpp
+++ b/Telegram/SourceFiles/ayu/ui/ayu_logo.cpp
@@ -14,7 +14,7 @@ static QImage LAST_LOADED_NO_MARGIN;
 namespace AyuAssets {
 
 void loadAppIco() {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	QString appDataPath = QDir::fromNativeSeparators(qgetenv("APPDATA"));
 	QString tempIconPath = appDataPath + "/AyuGram.ico";
@@ -30,7 +30,7 @@ void loadAppIco() {
 }
 
 void loadIcons() {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (LAST_LOADED_NAME != settings.appIcon) {
 		LAST_LOADED_NAME = settings.appIcon;
 
diff --git a/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.cpp b/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.cpp
deleted file mode 100644
index 1cc86f7aef..0000000000
--- a/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// This is the source code of AyuGram for Desktop.
-//
-// We do not and cannot prevent the use of our code,
-// but be respectful and credit the original author.
-//
-// Copyright @Radolyn, 2025
-#include "edit_edited_mark.h"
-
-#include "boxes/peer_list_controllers.h"
-#include "lang/lang_keys.h"
-#include "styles/style_boxes.h"
-#include "styles/style_layers.h"
-#include "styles/style_widgets.h"
-#include "ui/widgets/popup_menu.h"
-#include "ui/widgets/fields/input_field.h"
-#include "ui/widgets/fields/special_fields.h"
-
-#include "ayu/ayu_settings.h"
-
-EditEditedMarkBox::EditEditedMarkBox(QWidget *)
-	: _text(
-		this,
-		st::defaultInputField,
-		tr::ayu_EditedMarkText(),
-		AyuSettings::getInstance().editedMark) {
-}
-
-void EditEditedMarkBox::prepare() {
-	const auto defaultEditedMark = tr::lng_edited(tr::now);
-	auto newHeight = st::contactPadding.top() + _text->height();
-
-	setTitle(tr::ayu_EditedMarkText());
-
-	newHeight += st::boxPadding.bottom() + st::contactPadding.bottom();
-	setDimensions(st::boxWidth, newHeight);
-
-	addLeftButton(tr::ayu_BoxActionReset(),
-				  [=]
-				  {
-					  _text->setText(defaultEditedMark);
-				  });
-	addButton(tr::lng_settings_save(),
-			  [=]
-			  {
-				  save();
-			  });
-	addButton(tr::lng_cancel(),
-			  [=]
-			  {
-				  closeBox();
-			  });
-
-	const auto submitted = [=]
-	{
-		submit();
-	};
-	_text->submits(
-	) | rpl::start_with_next(submitted, _text->lifetime());
-}
-
-void EditEditedMarkBox::setInnerFocus() {
-	_text->setFocusFast();
-}
-
-void EditEditedMarkBox::submit() {
-	if (_text->getLastText().trimmed().isEmpty()) {
-		_text->setFocus();
-		_text->showError();
-	} else {
-		save();
-	}
-}
-
-void EditEditedMarkBox::resizeEvent(QResizeEvent *e) {
-	BoxContent::resizeEvent(e);
-
-	_text->resize(
-		width()
-		- st::boxPadding.left()
-		- st::newGroupInfoPadding.left()
-		- st::boxPadding.right(),
-		_text->height());
-
-	const auto left = st::boxPadding.left() + st::newGroupInfoPadding.left();
-	_text->moveToLeft(left, st::contactPadding.top());
-}
-
-void EditEditedMarkBox::save() {
-	AyuSettings::set_editedMark(_text->getLastText());
-	AyuSettings::save();
-
-	closeBox();
-}
diff --git a/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.h b/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.h
deleted file mode 100644
index d12e3bca2b..0000000000
--- a/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// This is the source code of AyuGram for Desktop.
-//
-// We do not and cannot prevent the use of our code,
-// but be respectful and credit the original author.
-//
-// Copyright @Radolyn, 2025
-#pragma once
-
-#include "base/timer.h"
-#include "boxes/abstract_box.h"
-#include "mtproto/sender.h"
-
-class EditEditedMarkBox : public Ui::BoxContent
-{
-public:
-	EditEditedMarkBox(QWidget *);
-
-protected:
-	void setInnerFocus() override;
-	void prepare() override;
-	void resizeEvent(QResizeEvent *e) override;
-
-private:
-	void submit();
-	void save();
-
-	object_ptr<Ui::InputField> _text;
-};
diff --git a/Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.cpp b/Telegram/SourceFiles/ayu/ui/boxes/edit_mark_box.cpp
similarity index 68%
rename from Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.cpp
rename to Telegram/SourceFiles/ayu/ui/boxes/edit_mark_box.cpp
index c077b9aeef..225adbda6c 100644
--- a/Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.cpp
+++ b/Telegram/SourceFiles/ayu/ui/boxes/edit_mark_box.cpp
@@ -4,7 +4,9 @@
 // but be respectful and credit the original author.
 //
 // Copyright @Radolyn, 2025
-#include "edit_deleted_mark.h"
+#include "edit_mark_box.h"
+
+#include <utility>
 
 #include "boxes/peer_list_controllers.h"
 #include "lang/lang_keys.h"
@@ -17,19 +19,25 @@
 
 #include "ayu/ayu_settings.h"
 
-EditDeletedMarkBox::EditDeletedMarkBox(QWidget *)
-	: _text(
-		this,
-		st::defaultInputField,
-		tr::ayu_DeletedMarkText(),
-		AyuSettings::getInstance().deletedMark) {
+EditMarkBox::EditMarkBox(QWidget *,
+						 rpl::producer<QString> title,
+						 const QString &currentValue,
+						 QString defaultValue,
+						 const Fn<void(const QString &)> &saveCallback)
+	: _title(title)
+	  , _defaultValue(std::move(defaultValue))
+	  , _saveCallback(saveCallback)
+	  , _text(
+		  this,
+		  st::defaultInputField,
+		  title,
+		  currentValue) {
 }
 
-void EditDeletedMarkBox::prepare() {
-	const auto defaultDeletedMark = "🧹";
+void EditMarkBox::prepare() {
 	auto newHeight = st::contactPadding.top() + _text->height();
 
-	setTitle(tr::ayu_DeletedMarkText());
+	setTitle(_title);
 
 	newHeight += st::boxPadding.bottom() + st::contactPadding.bottom();
 	setDimensions(st::boxWidth, newHeight);
@@ -37,7 +45,7 @@ void EditDeletedMarkBox::prepare() {
 	addLeftButton(tr::ayu_BoxActionReset(),
 				  [=]
 				  {
-					  _text->setText(defaultDeletedMark);
+					  _text->setText(_defaultValue);
 				  });
 
 	addButton(tr::lng_settings_save(),
@@ -59,11 +67,11 @@ void EditDeletedMarkBox::prepare() {
 	) | rpl::start_with_next(submitted, _text->lifetime());
 }
 
-void EditDeletedMarkBox::setInnerFocus() {
+void EditMarkBox::setInnerFocus() {
 	_text->setFocusFast();
 }
 
-void EditDeletedMarkBox::submit() {
+void EditMarkBox::submit() {
 	if (_text->getLastText().trimmed().isEmpty()) {
 		_text->setFocus();
 		_text->showError();
@@ -72,7 +80,7 @@ void EditDeletedMarkBox::submit() {
 	}
 }
 
-void EditDeletedMarkBox::resizeEvent(QResizeEvent *e) {
+void EditMarkBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 
 	_text->resize(
@@ -86,9 +94,7 @@ void EditDeletedMarkBox::resizeEvent(QResizeEvent *e) {
 	_text->moveToLeft(left, st::contactPadding.top());
 }
 
-void EditDeletedMarkBox::save() {
-	AyuSettings::set_deletedMark(_text->getLastText());
-	AyuSettings::save();
-
+void EditMarkBox::save() {
+	_saveCallback(_text->getLastText());
 	closeBox();
 }
diff --git a/Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.h b/Telegram/SourceFiles/ayu/ui/boxes/edit_mark_box.h
similarity index 58%
rename from Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.h
rename to Telegram/SourceFiles/ayu/ui/boxes/edit_mark_box.h
index f2479a8b49..c5201141ca 100644
--- a/Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.h
+++ b/Telegram/SourceFiles/ayu/ui/boxes/edit_mark_box.h
@@ -9,10 +9,14 @@
 #include "base/timer.h"
 #include "boxes/abstract_box.h"
 
-class EditDeletedMarkBox : public Ui::BoxContent
+namespace Ui {
+class InputField;
+}
+
+class EditMarkBox : public Ui::BoxContent
 {
 public:
-	EditDeletedMarkBox(QWidget *);
+	EditMarkBox(QWidget *, rpl::producer<QString> title, const QString& currentValue, QString  defaultValue, const Fn<void(const QString&)> &saveCallback);
 
 protected:
 	void setInnerFocus() override;
@@ -23,5 +27,9 @@ private:
 	void submit();
 	void save();
 
+	rpl::producer<QString> _title;
+	QString _defaultValue;
+	Fn<void(const QString&)> _saveCallback;
+
 	object_ptr<Ui::InputField> _text;
 };
diff --git a/Telegram/SourceFiles/ayu/ui/boxes/message_shot_box.cpp b/Telegram/SourceFiles/ayu/ui/boxes/message_shot_box.cpp
index 9b69d02cd2..872affb742 100644
--- a/Telegram/SourceFiles/ayu/ui/boxes/message_shot_box.cpp
+++ b/Telegram/SourceFiles/ayu/ui/boxes/message_shot_box.cpp
@@ -38,7 +38,7 @@ void MessageShotBox::prepare() {
 void MessageShotBox::setupContent() {
 	_selectedPalette = std::make_shared<style::palette>();
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	const auto savedShowColorfulReplies = !settings.simpleQuotesAndReplies;
 
 	using namespace Settings;
diff --git a/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp b/Telegram/SourceFiles/ayu/ui/components/icon_picker.cpp
similarity index 98%
rename from Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp
rename to Telegram/SourceFiles/ayu/ui/components/icon_picker.cpp
index 4be98b0355..64b8940dde 100644
--- a/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp
+++ b/Telegram/SourceFiles/ayu/ui/components/icon_picker.cpp
@@ -121,7 +121,7 @@ void IconPicker::paintEvent(QPaintEvent *e) {
 }
 
 void IconPicker::mousePressEvent(QMouseEvent *e) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	auto changed = false;
 
 	auto x = e->pos().x();
diff --git a/Telegram/SourceFiles/ayu/ui/settings/icon_picker.h b/Telegram/SourceFiles/ayu/ui/components/icon_picker.h
similarity index 100%
rename from Telegram/SourceFiles/ayu/ui/settings/icon_picker.h
rename to Telegram/SourceFiles/ayu/ui/components/icon_picker.h
diff --git a/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp b/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp
index 7216520af4..f4778ee9c7 100644
--- a/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp
+++ b/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp
@@ -197,7 +197,7 @@ void AddHistoryAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item) {
 }
 
 void AddHideMessageAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!needToShowItem(settings.showHideMessageInContextMenu)) {
 		return;
 	}
@@ -220,7 +220,7 @@ void AddHideMessageAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item) {
 }
 
 void AddUserMessagesAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!needToShowItem(settings.showUserMessagesInContextMenu)) {
 		return;
 	}
@@ -245,7 +245,7 @@ void AddUserMessagesAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item) {
 }
 
 void AddMessageDetailsAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!needToShowItem(settings.showMessageDetailsInContextMenu)) {
 		return;
 	}
@@ -464,7 +464,7 @@ void AddReadUntilAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item) {
 		return;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.sendReadMessages) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp
index 9ace785559..520ea113b9 100644
--- a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp
+++ b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp
@@ -7,8 +7,7 @@
 #include "settings_ayu.h"
 
 #include "ayu/ayu_settings.h"
-#include "ayu/ui/boxes/edit_deleted_mark.h"
-#include "ayu/ui/boxes/edit_edited_mark.h"
+#include "ayu/ui/boxes/edit_mark_box.h"
 #include "ayu/ui/boxes/font_selector.h"
 
 #include "lang_auto.h"
@@ -27,7 +26,7 @@
 #include "styles/style_settings.h"
 #include "styles/style_widgets.h"
 
-#include "icon_picker.h"
+#include "../components/icon_picker.h"
 #include "tray.h"
 #include "core/application.h"
 #include "main/main_domain.h"
@@ -37,7 +36,6 @@
 #include "ui/boxes/confirm_box.h"
 #include "ui/boxes/single_choice_box.h"
 #include "ui/text/text_utilities.h"
-#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/continuous_sliders.h"
@@ -464,41 +462,41 @@ Ayu::Ayu(
 }
 
 void SetupGhostModeToggle(not_null<Ui::VerticalLayout*> container) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	AddSubsectionTitle(container, tr::ayu_GhostEssentialsHeader());
 
 	std::vector checkboxes{
 		NestedEntry{
-			tr::ayu_DontReadMessages(tr::now), !settings.sendReadMessages, [=](bool enabled)
+			tr::ayu_DontReadMessages(tr::now), !settings->sendReadMessages, [=](bool enabled)
 			{
 				AyuSettings::set_sendReadMessages(!enabled);
 				AyuSettings::save();
 			}
 		},
 		NestedEntry{
-			tr::ayu_DontReadStories(tr::now), !settings.sendReadStories, [=](bool enabled)
+			tr::ayu_DontReadStories(tr::now), !settings->sendReadStories, [=](bool enabled)
 			{
 				AyuSettings::set_sendReadStories(!enabled);
 				AyuSettings::save();
 			}
 		},
 		NestedEntry{
-			tr::ayu_DontSendOnlinePackets(tr::now), !settings.sendOnlinePackets, [=](bool enabled)
+			tr::ayu_DontSendOnlinePackets(tr::now), !settings->sendOnlinePackets, [=](bool enabled)
 			{
 				AyuSettings::set_sendOnlinePackets(!enabled);
 				AyuSettings::save();
 			}
 		},
 		NestedEntry{
-			tr::ayu_DontSendUploadProgress(tr::now), !settings.sendUploadProgress, [=](bool enabled)
+			tr::ayu_DontSendUploadProgress(tr::now), !settings->sendUploadProgress, [=](bool enabled)
 			{
 				AyuSettings::set_sendUploadProgress(!enabled);
 				AyuSettings::save();
 			}
 		},
 		NestedEntry{
-			tr::ayu_SendOfflinePacketAfterOnline(tr::now), settings.sendOfflinePacketAfterOnline, [=](bool enabled)
+			tr::ayu_SendOfflinePacketAfterOnline(tr::now), settings->sendOfflinePacketAfterOnline, [=](bool enabled)
 			{
 				AyuSettings::set_sendOfflinePacketAfterOnline(enabled);
 				AyuSettings::save();
@@ -510,13 +508,14 @@ void SetupGhostModeToggle(not_null<Ui::VerticalLayout*> container) {
 }
 
 void SetupGhostEssentials(not_null<Ui::VerticalLayout*> container) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	SetupGhostModeToggle(container);
 
-	auto markReadAfterActionVal = container->lifetime().make_state<rpl::variable<bool>>(settings.sendOfflinePacketAfterOnline);
+	auto markReadAfterActionVal = container->lifetime().make_state<rpl::variable<bool>>(
+		settings->markReadAfterAction);
 	auto useScheduledMessagesVal = container->lifetime().make_state<rpl::variable<
-		bool>>(settings.useScheduledMessages);
+		bool>>(settings->useScheduledMessages);
 
 	AddButtonWithIcon(
 		container,
@@ -528,7 +527,7 @@ void SetupGhostEssentials(not_null<Ui::VerticalLayout*> container) {
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.sendOfflinePacketAfterOnline);
+			return (enabled != settings->markReadAfterAction);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -555,7 +554,7 @@ void SetupGhostEssentials(not_null<Ui::VerticalLayout*> container) {
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.useScheduledMessages);
+			return (enabled != settings->useScheduledMessages);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -577,12 +576,12 @@ void SetupGhostEssentials(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_SendWithoutSoundByDefault(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.sendWithoutSound)
+		rpl::single(settings->sendWithoutSound)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.sendWithoutSound);
+			return (enabled != settings->sendWithoutSound);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -595,7 +594,7 @@ void SetupGhostEssentials(not_null<Ui::VerticalLayout*> container) {
 }
 
 void SetupSpyEssentials(not_null<Ui::VerticalLayout*> container) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	AddSubsectionTitle(container, tr::ayu_SpyEssentialsHeader());
 
@@ -604,12 +603,12 @@ void SetupSpyEssentials(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_SaveDeletedMessages(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.saveDeletedMessages)
+		rpl::single(settings->saveDeletedMessages)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.saveDeletedMessages);
+			return (enabled != settings->saveDeletedMessages);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -623,12 +622,12 @@ void SetupSpyEssentials(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_SaveMessagesHistory(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.saveMessagesHistory)
+		rpl::single(settings->saveMessagesHistory)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.saveMessagesHistory);
+			return (enabled != settings->saveMessagesHistory);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -646,12 +645,12 @@ void SetupSpyEssentials(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_MessageSavingSaveForBots(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.saveForBots)
+		rpl::single(settings->saveForBots)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.saveForBots);
+			return (enabled != settings->saveForBots);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -662,7 +661,7 @@ void SetupSpyEssentials(not_null<Ui::VerticalLayout*> container) {
 }
 
 void SetupMessageFilters(not_null<Ui::VerticalLayout*> container) {
-	auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	AddSubsectionTitle(container, tr::ayu_RegexFilters());
 
@@ -671,12 +670,12 @@ void SetupMessageFilters(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_FiltersHideFromBlocked(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.hideFromBlocked)
+		rpl::single(settings->hideFromBlocked)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.hideFromBlocked);
+			return (enabled != settings->hideFromBlocked);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -687,7 +686,7 @@ void SetupMessageFilters(not_null<Ui::VerticalLayout*> container) {
 }
 
 void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	AddSubsectionTitle(container, tr::ayu_QoLTogglesHeader());
 
@@ -696,12 +695,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_DisableAds(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.disableAds)
+		rpl::single(settings->disableAds)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.disableAds);
+			return (enabled != settings->disableAds);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -715,12 +714,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_DisableStories(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.disableStories)
+		rpl::single(settings->disableStories)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.disableStories);
+			return (enabled != settings->disableStories);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -734,12 +733,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_DisableCustomBackgrounds(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.disableCustomBackgrounds)
+		rpl::single(settings->disableCustomBackgrounds)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.disableCustomBackgrounds);
+			return (enabled != settings->disableCustomBackgrounds);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -753,12 +752,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_SimpleQuotesAndReplies(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.simpleQuotesAndReplies)
+		rpl::single(settings->simpleQuotesAndReplies)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.simpleQuotesAndReplies);
+			return (enabled != settings->simpleQuotesAndReplies);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -769,14 +768,14 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
 
 	std::vector checkboxes = {
 		NestedEntry{
-			tr::ayu_CollapseSimilarChannels(tr::now), settings.collapseSimilarChannels, [=](bool enabled)
+			tr::ayu_CollapseSimilarChannels(tr::now), settings->collapseSimilarChannels, [=](bool enabled)
 			{
 				AyuSettings::set_collapseSimilarChannels(enabled);
 				AyuSettings::save();
 			}
 		},
 		NestedEntry{
-			tr::ayu_HideSimilarChannelsTab(tr::now), settings.hideSimilarChannels, [=](bool enabled)
+			tr::ayu_HideSimilarChannelsTab(tr::now), settings->hideSimilarChannels, [=](bool enabled)
 			{
 				AyuSettings::set_hideSimilarChannels(enabled);
 				AyuSettings::save();
@@ -795,12 +794,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_DisableNotificationsDelay(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.disableNotificationsDelay)
+		rpl::single(settings->disableNotificationsDelay)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.disableNotificationsDelay);
+			return (enabled != settings->disableNotificationsDelay);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -814,12 +813,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_ShowOnlyAddedEmojisAndStickers(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.showOnlyAddedEmojisAndStickers)
+		rpl::single(settings->showOnlyAddedEmojisAndStickers)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showOnlyAddedEmojisAndStickers);
+			return (enabled != settings->showOnlyAddedEmojisAndStickers);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -833,12 +832,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_LocalPremium(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.localPremium)
+		rpl::single(settings->localPremium)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.localPremium);
+			return (enabled != settings->localPremium);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -856,7 +855,7 @@ void SetupAppIcon(not_null<Ui::VerticalLayout*> container) {
 
 void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
 							  not_null<Window::SessionController*> controller) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	AddSkip(container);
 	AddSubsectionTitle(container, tr::ayu_ContextMenuElementsHeader());
@@ -870,7 +869,7 @@ void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
 	AddChooseButtonWithIconAndRightText(
 		container,
 		controller,
-		settings.showReactionsPanelInContextMenu,
+		settings->showReactionsPanelInContextMenu,
 		options,
 		tr::ayu_SettingsContextMenuReactionsPanel(),
 		tr::ayu_SettingsContextMenuTitle(),
@@ -883,7 +882,7 @@ void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
 	AddChooseButtonWithIconAndRightText(
 		container,
 		controller,
-		settings.showViewsPanelInContextMenu,
+		settings->showViewsPanelInContextMenu,
 		options,
 		tr::ayu_SettingsContextMenuViewsPanel(),
 		tr::ayu_SettingsContextMenuTitle(),
@@ -897,7 +896,7 @@ void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
 	AddChooseButtonWithIconAndRightText(
 		container,
 		controller,
-		settings.showHideMessageInContextMenu,
+		settings->showHideMessageInContextMenu,
 		options,
 		tr::ayu_ContextHideMessage(),
 		tr::ayu_SettingsContextMenuTitle(),
@@ -910,7 +909,7 @@ void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
 	AddChooseButtonWithIconAndRightText(
 		container,
 		controller,
-		settings.showUserMessagesInContextMenu,
+		settings->showUserMessagesInContextMenu,
 		options,
 		tr::ayu_UserMessagesMenuText(),
 		tr::ayu_SettingsContextMenuTitle(),
@@ -923,7 +922,7 @@ void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
 	AddChooseButtonWithIconAndRightText(
 		container,
 		controller,
-		settings.showMessageDetailsInContextMenu,
+		settings->showMessageDetailsInContextMenu,
 		options,
 		tr::ayu_MessageDetailsPC(),
 		tr::ayu_SettingsContextMenuTitle(),
@@ -939,7 +938,7 @@ void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
 }
 
 void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	AddSkip(container);
 	AddSubsectionTitle(container, tr::ayu_MessageFieldElementsHeader());
@@ -950,12 +949,12 @@ void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
 		st::settingsButton,
 		{&st::messageFieldAttachIcon}
 	)->toggleOn(
-		rpl::single(settings.showAttachButtonInMessageField)
+		rpl::single(settings->showAttachButtonInMessageField)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showAttachButtonInMessageField);
+			return (enabled != settings->showAttachButtonInMessageField);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -970,12 +969,12 @@ void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
 		st::settingsButton,
 		{&st::messageFieldCommandsIcon}
 	)->toggleOn(
-		rpl::single(settings.showCommandsButtonInMessageField)
+		rpl::single(settings->showCommandsButtonInMessageField)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showCommandsButtonInMessageField);
+			return (enabled != settings->showCommandsButtonInMessageField);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -990,12 +989,12 @@ void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
 		st::settingsButton,
 		{&st::messageFieldTTLIcon}
 	)->toggleOn(
-		rpl::single(settings.showAutoDeleteButtonInMessageField)
+		rpl::single(settings->showAutoDeleteButtonInMessageField)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showAutoDeleteButtonInMessageField);
+			return (enabled != settings->showAutoDeleteButtonInMessageField);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1010,12 +1009,12 @@ void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
 		st::settingsButton,
 		{&st::messageFieldEmojiIcon}
 	)->toggleOn(
-		rpl::single(settings.showEmojiButtonInMessageField)
+		rpl::single(settings->showEmojiButtonInMessageField)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showEmojiButtonInMessageField);
+			return (enabled != settings->showEmojiButtonInMessageField);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1030,12 +1029,12 @@ void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
 		st::settingsButton,
 		{&st::messageFieldVoiceIcon}
 	)->toggleOn(
-		rpl::single(settings.showMicrophoneButtonInMessageField)
+		rpl::single(settings->showMicrophoneButtonInMessageField)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showMicrophoneButtonInMessageField);
+			return (enabled != settings->showMicrophoneButtonInMessageField);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1049,7 +1048,7 @@ void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
 }
 
 void SetupMessageFieldPopups(not_null<Ui::VerticalLayout*> container) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	AddSkip(container);
 	AddSubsectionTitle(container, tr::ayu_MessageFieldPopupsHeader());
@@ -1060,12 +1059,12 @@ void SetupMessageFieldPopups(not_null<Ui::VerticalLayout*> container) {
 		st::settingsButton,
 		{&st::messageFieldAttachIcon}
 	)->toggleOn(
-		rpl::single(settings.showAttachPopup)
+		rpl::single(settings->showAttachPopup)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showAttachPopup);
+			return (enabled != settings->showAttachPopup);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1080,12 +1079,12 @@ void SetupMessageFieldPopups(not_null<Ui::VerticalLayout*> container) {
 		st::settingsButton,
 		{&st::messageFieldEmojiIcon}
 	)->toggleOn(
-		rpl::single(settings.showEmojiPopup)
+		rpl::single(settings->showEmojiPopup)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showEmojiPopup);
+			return (enabled != settings->showEmojiPopup);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1099,7 +1098,7 @@ void SetupMessageFieldPopups(not_null<Ui::VerticalLayout*> container) {
 }
 
 void SetupDrawerElements(not_null<Ui::VerticalLayout*> container) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	AddSkip(container);
 	AddSubsectionTitle(container, tr::ayu_DrawerElementsHeader());
@@ -1110,12 +1109,12 @@ void SetupDrawerElements(not_null<Ui::VerticalLayout*> container) {
 		st::settingsButton,
 		{&st::ayuLReadMenuIcon}
 	)->toggleOn(
-		rpl::single(settings.showLReadToggleInDrawer)
+		rpl::single(settings->showLReadToggleInDrawer)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showLReadToggleInDrawer);
+			return (enabled != settings->showLReadToggleInDrawer);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1130,12 +1129,12 @@ void SetupDrawerElements(not_null<Ui::VerticalLayout*> container) {
 		st::settingsButton,
 		{&st::ayuSReadMenuIcon}
 	)->toggleOn(
-		rpl::single(settings.showSReadToggleInDrawer)
+		rpl::single(settings->showSReadToggleInDrawer)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showSReadToggleInDrawer);
+			return (enabled != settings->showSReadToggleInDrawer);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1150,12 +1149,12 @@ void SetupDrawerElements(not_null<Ui::VerticalLayout*> container) {
 		st::settingsButton,
 		{&st::ayuGhostIcon}
 	)->toggleOn(
-		rpl::single(settings.showGhostToggleInDrawer)
+		rpl::single(settings->showGhostToggleInDrawer)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showGhostToggleInDrawer);
+			return (enabled != settings->showGhostToggleInDrawer);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1171,12 +1170,12 @@ void SetupDrawerElements(not_null<Ui::VerticalLayout*> container) {
 		st::settingsButton,
 		{&st::ayuStreamerModeMenuIcon}
 	)->toggleOn(
-		rpl::single(settings.showStreamerToggleInDrawer)
+		rpl::single(settings->showStreamerToggleInDrawer)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showStreamerToggleInDrawer);
+			return (enabled != settings->showStreamerToggleInDrawer);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1188,7 +1187,7 @@ void SetupDrawerElements(not_null<Ui::VerticalLayout*> container) {
 }
 
 void SetupTrayElements(not_null<Ui::VerticalLayout*> container) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	AddSkip(container);
 	AddSubsectionTitle(container, tr::ayu_TrayElementsHeader());
@@ -1198,12 +1197,12 @@ void SetupTrayElements(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_EnableGhostModeTray(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.showGhostToggleInTray)
+		rpl::single(settings->showGhostToggleInTray)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showGhostToggleInTray);
+			return (enabled != settings->showGhostToggleInTray);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1218,12 +1217,12 @@ void SetupTrayElements(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_EnableStreamerModeTray(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.showStreamerToggleInTray)
+		rpl::single(settings->showStreamerToggleInTray)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showStreamerToggleInTray);
+			return (enabled != settings->showStreamerToggleInTray);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1236,7 +1235,7 @@ void SetupTrayElements(not_null<Ui::VerticalLayout*> container) {
 
 void SetupShowPeerId(not_null<Ui::VerticalLayout*> container,
 					 not_null<Window::SessionController*> controller) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	const auto options = std::vector{
 		QString(tr::ayu_SettingsShowID_Hide(tr::now)),
@@ -1270,7 +1269,7 @@ void SetupShowPeerId(not_null<Ui::VerticalLayout*> container,
 									{
 										.title = tr::ayu_SettingsShowID(),
 										.options = options,
-										.initialSelection = settings.showPeerId,
+										.initialSelection = settings->showPeerId,
 										.callback = save,
 									});
 				}));
@@ -1278,7 +1277,7 @@ void SetupShowPeerId(not_null<Ui::VerticalLayout*> container,
 }
 
 void SetupRecentStickersLimitSlider(not_null<Ui::VerticalLayout*> container) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	container->add(
 		object_ptr<Button>(container,
@@ -1300,7 +1299,7 @@ void SetupRecentStickersLimitSlider(not_null<Ui::VerticalLayout*> container) {
 	{
 		label->setText(QString::number(amount));
 	};
-	updateLabel(settings.recentStickersCount);
+	updateLabel(settings->recentStickersCount);
 
 	slider->setPseudoDiscrete(
 		200 + 1,
@@ -1309,7 +1308,7 @@ void SetupRecentStickersLimitSlider(not_null<Ui::VerticalLayout*> container) {
 		{
 			return amount;
 		},
-		settings.recentStickersCount,
+		settings->recentStickersCount,
 		[=](int amount)
 		{
 			updateLabel(amount);
@@ -1325,7 +1324,7 @@ void SetupRecentStickersLimitSlider(not_null<Ui::VerticalLayout*> container) {
 
 void SetupWideMultiplierSlider(not_null<Ui::VerticalLayout*> container,
 							   not_null<Window::SessionController*> controller) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	container->add(
 		object_ptr<Button>(container,
@@ -1360,12 +1359,12 @@ void SetupWideMultiplierSlider(not_null<Ui::VerticalLayout*> container,
 		return kMinSize + index * kStep;
 	};
 
-	updateLabel(settings.wideMultiplier);
+	updateLabel(settings->wideMultiplier);
 
 	slider->setPseudoDiscrete(
 		kSizeAmount,
 		[=](int index) { return index; },
-		valueToIndex(settings.wideMultiplier),
+		valueToIndex(settings->wideMultiplier),
 		[=](int index)
 		{
 			updateLabel(indexToValue(index));
@@ -1394,13 +1393,13 @@ void SetupWideMultiplierSlider(not_null<Ui::VerticalLayout*> container,
 }
 
 void SetupFonts(not_null<Ui::VerticalLayout*> container, not_null<Window::SessionController*> controller) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	const auto monoButton = AddButtonWithLabel(
 		container,
 		tr::ayu_MonospaceFont(),
 		rpl::single(
-			settings.monoFont.isEmpty() ? tr::ayu_FontDefault(tr::now) : settings.monoFont
+			settings->monoFont.isEmpty() ? tr::ayu_FontDefault(tr::now) : settings->monoFont
 		),
 		st::settingsButtonNoIcon);
 	const auto monoGuard = Ui::CreateChild<base::binary_guard>(monoButton.get());
@@ -1419,7 +1418,7 @@ void SetupFonts(not_null<Ui::VerticalLayout*> container, not_null<Window::Sessio
 }
 
 void SetupSendConfirmations(not_null<Ui::VerticalLayout*> container) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	AddSubsectionTitle(container, tr::ayu_ConfirmationsTitle());
 
@@ -1428,12 +1427,12 @@ void SetupSendConfirmations(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_StickerConfirmation(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.stickerConfirmation)
+		rpl::single(settings->stickerConfirmation)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.stickerConfirmation);
+			return (enabled != settings->stickerConfirmation);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1447,12 +1446,12 @@ void SetupSendConfirmations(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_GIFConfirmation(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.gifConfirmation)
+		rpl::single(settings->gifConfirmation)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.gifConfirmation);
+			return (enabled != settings->gifConfirmation);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1466,12 +1465,12 @@ void SetupSendConfirmations(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_VoiceConfirmation(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.voiceConfirmation)
+		rpl::single(settings->voiceConfirmation)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.voiceConfirmation);
+			return (enabled != settings->voiceConfirmation);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1482,19 +1481,19 @@ void SetupSendConfirmations(not_null<Ui::VerticalLayout*> container) {
 }
 
 void SetupMarks(not_null<Ui::VerticalLayout*> container) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	AddButtonWithIcon(
 		container,
 		tr::ayu_ReplaceMarksWithIcons(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.replaceBottomInfoWithIcons)
+		rpl::single(settings->replaceBottomInfoWithIcons)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.replaceBottomInfoWithIcons);
+			return (enabled != settings->replaceBottomInfoWithIcons);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1511,7 +1510,16 @@ void SetupMarks(not_null<Ui::VerticalLayout*> container) {
 	)->addClickHandler(
 		[=]()
 		{
-			auto box = Box<EditDeletedMarkBox>();
+			auto box = Box<EditMarkBox>(
+				tr::ayu_DeletedMarkText(),
+				settings->deletedMark,
+				QString("🧹"),
+				[=](const QString &value)
+				{
+					AyuSettings::set_deletedMark(value);
+					AyuSettings::save();
+				}
+			);
 			Ui::show(std::move(box));
 		});
 
@@ -1523,25 +1531,34 @@ void SetupMarks(not_null<Ui::VerticalLayout*> container) {
 	)->addClickHandler(
 		[=]()
 		{
-			auto box = Box<EditEditedMarkBox>();
+			auto box = Box<EditMarkBox>(
+				tr::ayu_EditedMarkText(),
+				settings->editedMark,
+				tr::lng_edited(tr::now),
+				[=](const QString &value)
+				{
+					AyuSettings::set_editedMark(value);
+					AyuSettings::save();
+				}
+			);
 			Ui::show(std::move(box));
 		});
 }
 
 void SetupFolderSettings(not_null<Ui::VerticalLayout*> container, not_null<Window::SessionController*> controller) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	AddButtonWithIcon(
 		container,
 		tr::ayu_HideNotificationCounters(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.hideNotificationCounters)
+		rpl::single(settings->hideNotificationCounters)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.hideNotificationCounters);
+			return (enabled != settings->hideNotificationCounters);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1557,12 +1574,12 @@ void SetupFolderSettings(not_null<Ui::VerticalLayout*> container, not_null<Windo
 		tr::ayu_HideNotificationBadge(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.hideNotificationBadge)
+		rpl::single(settings->hideNotificationBadge)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.hideNotificationBadge);
+			return (enabled != settings->hideNotificationBadge);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1581,12 +1598,12 @@ void SetupFolderSettings(not_null<Ui::VerticalLayout*> container, not_null<Windo
 		tr::ayu_HideAllChats(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.hideAllChatsFolder)
+		rpl::single(settings->hideAllChatsFolder)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.hideAllChatsFolder);
+			return (enabled != settings->hideAllChatsFolder);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1597,7 +1614,7 @@ void SetupFolderSettings(not_null<Ui::VerticalLayout*> container, not_null<Windo
 }
 
 void SetupChannelSettings(not_null<Ui::VerticalLayout*> container, not_null<Window::SessionController*> controller) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	const auto options = std::vector{
 		tr::ayu_ChannelBottomButtonHide(tr::now),
@@ -1608,7 +1625,7 @@ void SetupChannelSettings(not_null<Ui::VerticalLayout*> container, not_null<Wind
 	AddChooseButtonWithIconAndRightText(
 		container,
 		controller,
-		settings.channelBottomButton,
+		settings->channelBottomButton,
 		options,
 		tr::ayu_ChannelBottomButton(),
 		tr::ayu_ChannelBottomButton(),
@@ -1620,7 +1637,7 @@ void SetupChannelSettings(not_null<Ui::VerticalLayout*> container, not_null<Wind
 }
 
 void SetupNerdSettings(not_null<Ui::VerticalLayout*> container, not_null<Window::SessionController*> controller) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	SetupShowPeerId(container, controller);
 
@@ -1629,12 +1646,12 @@ void SetupNerdSettings(not_null<Ui::VerticalLayout*> container, not_null<Window:
 		tr::ayu_SettingsShowMessageSeconds(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.showMessageSeconds)
+		rpl::single(settings->showMessageSeconds)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showMessageSeconds);
+			return (enabled != settings->showMessageSeconds);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1648,12 +1665,12 @@ void SetupNerdSettings(not_null<Ui::VerticalLayout*> container, not_null<Window:
 		tr::ayu_SettingsShowMessageShot(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.showMessageShot)
+		rpl::single(settings->showMessageShot)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.showMessageShot);
+			return (enabled != settings->showMessageShot);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1664,7 +1681,7 @@ void SetupNerdSettings(not_null<Ui::VerticalLayout*> container, not_null<Window:
 }
 
 void SetupWebviewSettings(not_null<Ui::VerticalLayout*> container) {
-	const auto& settings = AyuSettings::getInstance();
+	auto *settings = &AyuSettings::getInstance();
 
 	AddSubsectionTitle(container, rpl::single(QString("Webview")));
 
@@ -1673,12 +1690,12 @@ void SetupWebviewSettings(not_null<Ui::VerticalLayout*> container) {
 		tr::ayu_SettingsSpoofWebviewAsAndroid(),
 		st::settingsButtonNoIcon
 	)->toggleOn(
-		rpl::single(settings.spoofWebviewAsAndroid)
+		rpl::single(settings->spoofWebviewAsAndroid)
 	)->toggledValue(
 	) | rpl::filter(
 		[=](bool enabled)
 		{
-			return (enabled != settings.spoofWebviewAsAndroid);
+			return (enabled != settings->spoofWebviewAsAndroid);
 		}) | start_with_next(
 		[=](bool enabled)
 		{
@@ -1689,14 +1706,14 @@ void SetupWebviewSettings(not_null<Ui::VerticalLayout*> container) {
 
 	std::vector checkboxes = {
 		NestedEntry{
-			tr::ayu_SettingsIncreaseWebviewHeight(tr::now), settings.increaseWebviewHeight, [=](bool enabled)
+			tr::ayu_SettingsIncreaseWebviewHeight(tr::now), settings->increaseWebviewHeight, [=](bool enabled)
 			{
 				AyuSettings::set_increaseWebviewHeight(enabled);
 				AyuSettings::save();
 			}
 		},
 		NestedEntry{
-			tr::ayu_SettingsIncreaseWebviewWidth(tr::now), settings.increaseWebviewWidth, [=](bool enabled)
+			tr::ayu_SettingsIncreaseWebviewWidth(tr::now), settings->increaseWebviewWidth, [=](bool enabled)
 			{
 				AyuSettings::set_increaseWebviewWidth(enabled);
 				AyuSettings::save();
diff --git a/Telegram/SourceFiles/ayu/ui/utils/ayu_profile_values.cpp b/Telegram/SourceFiles/ayu/ui/utils/ayu_profile_values.cpp
index c5169b074d..d2fddc4a50 100644
--- a/Telegram/SourceFiles/ayu/ui/utils/ayu_profile_values.cpp
+++ b/Telegram/SourceFiles/ayu/ui/utils/ayu_profile_values.cpp
@@ -15,7 +15,7 @@ constexpr auto kMaxChannelId = -1000000000000;
 QString IDString(not_null<PeerData*> peer) {
 	auto resultId = QString::number(getBareID(peer));
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.showPeerId == 2) {
 		if (peer->isChannel()) {
 			resultId = QString::number(peerToChannel(peer->id).bare - kMaxChannelId).prepend("-");
diff --git a/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp b/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp
index b2c3dd3817..66632715ca 100644
--- a/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp
+++ b/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp
@@ -108,7 +108,7 @@ bool isMessageHidden(const not_null<HistoryItem*> item) {
 		return true;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.hideFromBlocked) {
 		if (item->from()->isUser() &&
 			item->from()->asUser()->isBlocked()) {
@@ -513,7 +513,7 @@ int getScheduleTime(int64 sumSize) {
 }
 
 bool isMessageSavable(const not_null<HistoryItem *> item) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	if (!settings.saveDeletedMessages) {
 		return false;
diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index 184c373647..fb02fa7a8f 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -1731,7 +1731,7 @@ ShareBox::SubmitCallback ShareBox::DefaultForwardCallback(
 						}
 					}
 
-					const auto& settings = AyuSettings::getInstance();
+					const auto &settings = AyuSettings::getInstance();
 					if (!settings.sendReadMessages && settings.markReadAfterAction && history->lastMessage())
 					{
 						readHistory(history->lastMessage());
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index e281ffa327..ab35c28a8c 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -2259,7 +2259,7 @@ void EmojiListWidget::refreshCustom() {
 		&& !_allowWithoutPremium;
 	const auto owner = &session->data();
 	const auto &sets = owner->stickers().sets();
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	const auto push = [&](uint64 setId, bool installed) {
 		const auto megagroup = _megagroupSet
 			&& (setId == Data::Stickers::MegagroupSetId);
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 7fa8993757..0732be3700 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -408,7 +408,7 @@ bool FieldAutocomplete::clearFilteredBotCommands() {
 FieldAutocomplete::StickerRows FieldAutocomplete::getStickerSuggestions() {
 	const auto data = &_session->data().stickers();
 	const auto list = data->getListByEmoji({ _emoji }, _stickersSeed);
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	auto result = ranges::views::all(
 		list
 	) | ranges::views::filter([&](not_null<DocumentData*> sticker) {
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index faee7841bb..1970176897 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -502,7 +502,7 @@ void GifsListWidget::selectInlineResult(
 		return;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (AyuSettings::isUseScheduledMessages()) {
 		auto current = base::unixtime::now();
 		options.scheduled = current + 12;
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 4d0d324935..e3f2c7da7b 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -763,7 +763,7 @@ void StickersListWidget::fillFilteredStickersRow() {
 }
 
 void StickersListWidget::addSearchRow(not_null<StickersSet*> set) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.showOnlyAddedEmojisAndStickers && !SetInMyList(set->flags)) {
 		return;
 	}
@@ -1910,7 +1910,7 @@ void StickersListWidget::mouseReleaseEvent(QMouseEvent *e) {
 				&& (e->modifiers() & Qt::ControlModifier)) {
 				showStickerSetBox(document, set.id);
 			} else {
-				const auto& settings = AyuSettings::getInstance();
+				const auto &settings = AyuSettings::getInstance();
 				auto from = messageSentAnimationInfo(
 					sticker->section,
 					sticker->index,
@@ -2339,7 +2339,7 @@ auto StickersListWidget::collectRecentStickers() -> std::vector<Sticker> {
 	result.reserve(cloudCount + recent.size() + customCount);
 	_custom.reserve(cloudCount + recent.size() + customCount);
 
-    const auto& settings = AyuSettings::getInstance();
+    const auto &settings = AyuSettings::getInstance();
 
 	auto add = [&](not_null<DocumentData*> document, bool custom) {
 		if (result.size() >= settings.recentStickersCount) {
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
index e2772b3aaa..c8291d1436 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
@@ -474,7 +474,7 @@ void TabbedPanel::showStarted() {
 }
 
 bool TabbedPanel::eventFilter(QObject *obj, QEvent *e) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	if (TabbedPanelShowOnClick.value() || !settings.showEmojiPopup) {
 		return false;
diff --git a/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp b/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
index a8477291de..2be42e9c6e 100644
--- a/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
@@ -195,7 +195,7 @@ PreviewWrap::PreviewWrap(
 		}
 	}, lifetime());
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	{
 		const auto close = Ui::CreateChild<Ui::RoundButton>(
diff --git a/Telegram/SourceFiles/data/components/promo_suggestions.cpp b/Telegram/SourceFiles/data/components/promo_suggestions.cpp
index 43cafca12b..ce027c6703 100644
--- a/Telegram/SourceFiles/data/components/promo_suggestions.cpp
+++ b/Telegram/SourceFiles/data/components/promo_suggestions.cpp
@@ -115,7 +115,7 @@ void PromoSuggestions::refreshTopPromotion() {
 					|= _dismissedSuggestions.emplace(qs(suggestion)).second;
 			}
 
-			const auto& settings = AyuSettings::getInstance();
+			const auto &settings = AyuSettings::getInstance();
 			if (settings.disableAds) {
 				setTopPromoted(nullptr, QString(), QString());
 				return;
diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index 81a8d57e0b..fa0674124b 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -228,7 +228,7 @@ void SponsoredMessages::inject(
 }
 
 bool SponsoredMessages::canHaveFor(not_null<History*> history) const {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.disableAds) {
 		return false;
 	}
@@ -242,7 +242,7 @@ bool SponsoredMessages::canHaveFor(not_null<History*> history) const {
 }
 
 bool SponsoredMessages::isTopBarFor(not_null<History*> history) const {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.disableAds) {
 		return false;
 	}
diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index c4b3d28630..6d0ecd4022 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -484,7 +484,7 @@ void ChatFilters::requestToggleTags(bool value, Fn<void()> fail) {
 
 void ChatFilters::received(const QVector<MTPDialogFilter> &list) {
 	// AyuGram hideAllChatsFolder
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	auto position = 0;
 	auto changed = false;
@@ -526,7 +526,7 @@ void ChatFilters::received(const QVector<MTPDialogFilter> &list) {
 
 void ChatFilters::apply(const MTPUpdate &update) {
 	// AyuGram hideAllChatsFolder
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	update.match([&](const MTPDupdateDialogFilter &data) {
 		if (const auto filter = data.vfilter()) {
@@ -912,7 +912,7 @@ FilterId ChatFilters::lookupId(int index) const {
 		return FilterId(); // AyuGram: fix crash when using `hideAllChatsFolder`
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	if (_owner->session().user()->isPremium() || !_list.front().id() || settings.hideAllChatsFolder) {
 		return _list[index].id();
diff --git a/Telegram/SourceFiles/data/data_histories.cpp b/Telegram/SourceFiles/data/data_histories.cpp
index 59060f9612..6939217295 100644
--- a/Telegram/SourceFiles/data/data_histories.cpp
+++ b/Telegram/SourceFiles/data/data_histories.cpp
@@ -627,7 +627,7 @@ void Histories::sendReadRequests() {
 	DEBUG_LOG(("Reading: send requests with count %1.").arg(_states.size()));
 
 	// AyuGram sendReadMessages
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.sendReadMessages) {
 		DEBUG_LOG(("[AyuGram] Don't read messages"));
 		_states.clear();
diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index 4e87a05fb2..8d905461cd 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -1491,7 +1491,7 @@ void Reactions::send(not_null<HistoryItem*> item, bool addToRecent) {
 		_sentRequests.remove(id);
 		_owner->session().api().applyUpdates(result);
 
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		if (!settings.sendReadMessages && settings.markReadAfterAction && item) {
 			readHistory(item);
 		}
diff --git a/Telegram/SourceFiles/data/data_peer_values.cpp b/Telegram/SourceFiles/data/data_peer_values.cpp
index 762cd86373..717a00bbc6 100644
--- a/Telegram/SourceFiles/data/data_peer_values.cpp
+++ b/Telegram/SourceFiles/data/data_peer_values.cpp
@@ -399,7 +399,7 @@ rpl::producer<bool> PeerPremiumValue(not_null<PeerData*> peer) {
 }
 
 rpl::producer<bool> AmPremiumValue(not_null<Main::Session*> session) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.localPremium) {
 		return rpl::single(true);
 	}
diff --git a/Telegram/SourceFiles/data/data_replies_list.cpp b/Telegram/SourceFiles/data/data_replies_list.cpp
index 00884f67f2..d520913655 100644
--- a/Telegram/SourceFiles/data/data_replies_list.cpp
+++ b/Telegram/SourceFiles/data/data_replies_list.cpp
@@ -1005,7 +1005,7 @@ void RepliesList::sendReadTillRequest() {
 	const auto api = &_history->session().api();
 	api->request(base::take(_readRequestId)).cancel();
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.sendReadMessages) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 4d32e35e57..c1a6047da9 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -318,7 +318,7 @@ Session::Session(not_null<Main::Session*> session)
 		}, _lifetime);
 
 		// AyuGram disableStories
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		if (!settings.disableStories) {
 			_stories->loadMore(Data::StorySourcesList::NotHidden);
 		}
@@ -2486,7 +2486,7 @@ void Session::updateEditedMessage(const MTPMessage &data) {
 	}
 
 	// AyuGram saveMessagesHistory
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	HistoryMessageEdition edit;
 
 	if (data.type() != mtpc_message) {
@@ -2638,7 +2638,7 @@ void Session::unregisterMessageTTL(
 }
 
 void Session::checkTTLs() {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	_ttlCheckTimer.cancel();
 	const auto now = base::unixtime::now();
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index d327f49f18..ef8d55c959 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -1120,7 +1120,7 @@ void Stories::markAsRead(FullStoryId id, bool viewed) {
 		return;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.sendReadStories) {
 		return;
 	}
@@ -1270,7 +1270,7 @@ void Stories::toggleHidden(
 void Stories::sendMarkAsReadRequest(
 		not_null<PeerData*> peer,
 		StoryId tillId) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.sendReadStories) {
 		return;
 	}
@@ -1305,7 +1305,7 @@ void Stories::checkQuitPreventFinished() {
 void Stories::sendMarkAsReadRequests() {
 	_markReadTimer.cancel();
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.sendReadStories) {
 		return;
 	}
@@ -1329,7 +1329,7 @@ void Stories::sendIncrementViewsRequests() {
 		return;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.sendReadStories) {
 		return;
 	}
@@ -1941,7 +1941,7 @@ bool Stories::isQuitPrevent() {
 		sendIncrementViewsRequests();
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.sendReadStories || _markReadRequests.empty() && _incrementViewsRequests.empty()) {
 		return false;
 	}
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index 60b06e0b61..5cc7fe3084 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -490,7 +490,7 @@ bool UserData::isFake() const {
 
 bool UserData::isPremium() const {
 	if (id) {
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		if (settings.localPremium) {
 			if (getSession(id.value)) {
 				return true;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
index 5ad217ebea..e8f745d139 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
@@ -553,7 +553,7 @@ void Row::paintUserpic(
 		updateCornerBadgeShown(peer, nullptr, hasUnreadBadgesAbove);
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	const auto cornerBadgeShown = !_cornerBadgeUserpic
 		? _cornerBadgeShown
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 667171b95b..348808135e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1307,7 +1307,7 @@ void Widget::setupMainMenuToggle() {
 			? &st::dialogsMenuToggleUnread
 			: &st::dialogsMenuToggleUnreadMuted;
 
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		if (settings.hideNotificationCounters) {
 			icon = nullptr;
 		}
@@ -1318,7 +1318,7 @@ void Widget::setupMainMenuToggle() {
 
 void Widget::setupStories() {
 	// AyuGram disableStories
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.disableStories) {
 		return;
 	}
@@ -2277,7 +2277,7 @@ void Widget::updateStoriesVisibility() {
 		return;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.disableStories) {
 		_stories->setVisible(false);
 		return;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 063551f996..18c0151f1f 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1253,7 +1253,7 @@ void HistoryItem::setCommentsItemId(FullMsgId id) {
 void HistoryItem::setServiceText(PreparedServiceText &&prepared) {
 	auto text = std::move(prepared.text);
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (date() > 0) {
 		const auto timeString = QString(" (%1)").arg(QLocale().toString(
 			base::unixtime::parse(_date),
@@ -2183,7 +2183,7 @@ void HistoryItem::clearMediaAsExpired() {
 		return;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.saveDeletedMessages) {
 		return;
 	}
@@ -3189,7 +3189,7 @@ void HistoryItem::setDeleted() {
 	_deleted = true;
 
 	if (isService()) {
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		setAyuHint(settings.deletedMark);
 	} else {
 		history()->owner().requestItemViewRefresh(this);
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 65d43a511a..8ec2505a50 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -484,7 +484,7 @@ void HistoryMessageReply::updateData(
 		&& (asExternal || _fields.manualQuote);
 	_multiline = !_fields.storyId && (asExternal || nonEmptyQuote);
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	const auto author = resolvedMessage
 							? resolvedMessage->from().get()
 							: resolvedStory
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index 050dee1005..715c91095d 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -525,7 +525,7 @@ QString NewMessagePostAuthor(const Api::SendAction &action) {
 bool ShouldSendSilent(
 		not_null<PeerData*> peer,
 		const Api::SendOptions &options) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.sendWithoutSound) {
 		return !options.silent;
 	}
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index b2113c07aa..0cb02c937b 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -510,7 +510,7 @@ HistoryWidget::HistoryWidget(
 
 	_fieldCharsCountManager.limitExceeds(
 	) | rpl::start_with_next([=] {
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		const auto hide = _fieldCharsCountManager.isLimitExceeded();
 		if (_silent) {
 			_silent->setVisible(!hide);
@@ -1980,7 +1980,7 @@ void HistoryWidget::fileChosen(ChatHelpers::FileChosen &&data) {
 			Data::InsertCustomEmoji(_field.data(), data.document);
 		}
 	} else if (_history) {
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		if (!settings.sendReadMessages && settings.markReadAfterAction) {
 			if (const auto lastMessage = history()->lastMessage()) {
 				readHistory(lastMessage);
@@ -2789,7 +2789,7 @@ void HistoryWidget::setHistory(History *history) {
 		return;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	const auto was = _attachBotsMenu && _history && _history->peer->isUser();
 	const auto now = _attachBotsMenu && history && history->peer->isUser() && settings.showAttachPopup;
@@ -2875,7 +2875,7 @@ void HistoryWidget::refreshAttachBotsMenu() {
 		return;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	_attachBotsMenu = InlineBots::MakeAttachBotsMenu(
 		this,
@@ -3201,7 +3201,7 @@ bool HistoryWidget::canWriteMessage() const {
 }
 
 void HistoryWidget::updateControlsVisibility() {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	auto fieldDisabledRemoved = (_fieldDisabled != nullptr);
 	const auto hideExtraButtons = _fieldCharsCountManager.isLimitExceeded();
@@ -4583,7 +4583,7 @@ void HistoryWidget::sendVoice(const VoiceToSend &data) {
 }
 
 void HistoryWidget::send(Api::SendOptions options) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (AyuSettings::isUseScheduledMessages() && !options.scheduled) {
 		auto current = base::unixtime::now();
 		options.scheduled = current + 12;
@@ -4784,7 +4784,7 @@ void HistoryWidget::goToDiscussionGroup() {
 }
 
 bool HistoryWidget::hasDiscussionGroup() const {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.channelBottomButton != 2) {
 		return false;
 	}
@@ -5377,7 +5377,7 @@ bool HistoryWidget::isChoosingTheme() const {
 }
 
 bool HistoryWidget::isMuteUnmute() const {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.channelBottomButton == 0) {
 		return false;
 	}
@@ -5394,7 +5394,7 @@ bool HistoryWidget::isSearching() const {
 }
 
 bool HistoryWidget::showRecordButton() const {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.showMicrophoneButtonInMessageField) {
 		return false;
 	}
@@ -5637,7 +5637,7 @@ void HistoryWidget::showKeyboardHideButton() {
 }
 
 void HistoryWidget::toggleKeyboard(bool manual) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	const auto fieldEnabled = canWriteMessage() && !_showAnimation;
 	if (_kbShown || _kbReplyTo) {
@@ -5865,7 +5865,7 @@ bool HistoryWidget::fieldOrDisabledShown() const {
 }
 
 void HistoryWidget::moveFieldControls() {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	auto keyboardHeight = 0;
 	auto bottom = height();
@@ -5966,7 +5966,7 @@ void HistoryWidget::moveFieldControls() {
 }
 
 void HistoryWidget::updateFieldSize() {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	const auto kbShowShown = _history && !_kbShown && _keyboard->hasMarkup();
 	auto fieldWidth = width()
@@ -7105,7 +7105,7 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) {
 		return;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	const auto wasVisible = _kbShown || _kbReplyTo;
 	const auto wasMsgId = _keyboard->forMsgId();
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 28b0860107..a1e14004e0 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -2129,7 +2129,7 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 					: 0),
 			};
 
-			const auto& settings = AyuSettings::getInstance();
+			const auto &settings = AyuSettings::getInstance();
 			if (AyuSettings::isUseScheduledMessages()) {
 				auto current = base::unixtime::now();
 				options.scheduled = current + 12 + 5;
@@ -2221,7 +2221,7 @@ void VoiceRecordBar::requestToSendWithOptions(Api::SendOptions options) {
 			options.ttlSeconds = std::numeric_limits<int>::max();
 		}
 
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		if (AyuSettings::isUseScheduledMessages()) {
 			auto current = base::unixtime::now();
 			options.scheduled = current + 12 + 5;
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
index 8225aa4a99..186c99e3d0 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
@@ -415,7 +415,7 @@ void BottomInfo::layout() {
 }
 
 void BottomInfo::layoutDateText() {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	if (!settings.replaceBottomInfoWithIcons) {
 		const auto deleted = (_data.flags & Data::Flag::AyuDeleted)
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index efe1beea85..a03c9ba96c 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -1513,7 +1513,7 @@ void AddWhoReactedAction(
 		not_null<QWidget*> context,
 		not_null<HistoryItem*> item,
 		not_null<Window::SessionController*> controller) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!AyuUi::needToShowItem(settings.showViewsPanelInContextMenu)) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_reply.cpp b/Telegram/SourceFiles/history/view/history_view_reply.cpp
index 71f579fdf5..6c3f680bca 100644
--- a/Telegram/SourceFiles/history/view/history_view_reply.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_reply.cpp
@@ -646,7 +646,7 @@ void Reply::paint(
 	Ui::Text::ValidateQuotePaintCache(*cache, quoteSt);
 	Ui::Text::FillQuotePaint(p, rect, *cache, quoteSt);
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.simpleQuotesAndReplies && backgroundEmoji) {
 		ValidateBackgroundEmoji(
 			backgroundEmojiId,
diff --git a/Telegram/SourceFiles/history/view/history_view_send_action.cpp b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
index 8a1d1539b9..92b2296c16 100644
--- a/Telegram/SourceFiles/history/view/history_view_send_action.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
@@ -67,7 +67,7 @@ bool SendActionPainter::updateNeedsAnimating(
 		return false;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.hideFromBlocked) {
 		if (user->isBlocked()) {
 			return false;
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
index 549ff6e42d..20d8d5232b 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -788,7 +788,7 @@ void TopBarWidget::infoClicked() {
 
 void TopBarWidget::backClicked() {
 	if (_activeChat.key.folder()) {
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		if (settings.hideAllChatsFolder) {
 			const auto filters = &_controller->session().data().chatsFilters();
 			const auto lookupId = filters->lookupId(_controller->session().premium() ? 0 : 1);
@@ -1156,7 +1156,7 @@ void TopBarWidget::updateControlsVisibility() {
 		return;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	_clear->show();
 	_delete->setVisible(_canDelete);
@@ -1337,14 +1337,14 @@ void TopBarWidget::updateMembersShowArea() {
 }
 
 bool TopBarWidget::showSelectedState() const {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	return (_selectedCount > 0)
 		&& (_canDelete || _canForward || _canSendNow || settings.showMessageShot);
 }
 
 void TopBarWidget::showSelected(SelectedState state) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	auto canDelete = (state.count > 0 && state.count == state.canDeleteCount);
 	auto canForward = (state.count > 0 && state.count == state.canForwardCount);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 0cbd0a5470..52398fa7c0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -325,7 +325,7 @@ Document::Document(
 			const auto &data = &_parent->data()->history()->owner();
 			_parent->data()->removeFromSharedMediaIndex();
 			setDocumentLinks(_data, realParent, [=] {
-				const auto& settings = AyuSettings::getInstance();
+				const auto &settings = AyuSettings::getInstance();
 				if (!settings.saveDeletedMessages) {
 					_openl = nullptr;
 				}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
index 8ceee136d6..ca88904a62 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -936,7 +936,7 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 	Ui::Text::ValidateQuotePaintCache(*cache, _st);
 	Ui::Text::FillQuotePaint(p, outer, *cache, _st);
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.simpleQuotesAndReplies && backgroundEmoji) {
 		ValidateBackgroundEmoji(
 			backgroundEmojiId,
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index 97dcb6f375..c2eae3ffb2 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -1189,7 +1189,7 @@ bool AdjustMenuGeometryForSelector(
 		not_null<Ui::PopupMenu*> menu,
 		QPoint desiredPosition,
 		not_null<Selector*> selector) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!AyuUi::needToShowItem(settings.showReactionsPanelInContextMenu)) {
 		return false;
 	}
@@ -1357,7 +1357,7 @@ AttachSelectorResult AttachSelectorToMenu(
 		Fn<void(ChosenReaction)> chosen,
 		TextWithEntities about,
 		IconFactory iconFactory) {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!AyuUi::needToShowItem(settings.showReactionsPanelInContextMenu)) {
 		return AttachSelectorResult::Skipped;
 	}
@@ -1409,7 +1409,7 @@ auto AttachSelectorToMenu(
 	IconFactory iconFactory,
 	Fn<bool()> paused)
 -> base::expected<not_null<Selector*>, AttachSelectorResult> {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!AyuUi::needToShowItem(settings.showReactionsPanelInContextMenu)) {
 		return base::make_unexpected(AttachSelectorResult::Skipped);
 	}
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index 6c66051178..4d689a7721 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -505,7 +505,7 @@ void TopBar::updateControlsVisibility(anim::type animated) {
 
 void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 	// AyuGram disableStories
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.disableStories) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 843f7bff4b..acc48462c5 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1193,7 +1193,7 @@ bool SetClickContext(
 }
 
 object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	auto result = object_ptr<Ui::VerticalLayout>(_wrap);
 	auto tracker = Ui::MultiSlideTracker();
diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
index 942c3b1b3a..80ceb966a1 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
@@ -140,7 +140,7 @@ object_ptr<Ui::RpWidget> InnerWidget::setupSharedMedia(
 	using namespace rpl::mappers;
 	using MediaType = Media::Type;
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	auto content = object_ptr<Ui::VerticalLayout>(parent);
 	auto tracker = Ui::MultiSlideTracker();
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 30279be011..992335f1a7 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -765,7 +765,7 @@ void BotAction::handleKeyPress(not_null<QKeyEvent*> e) {
 }
 
 QString WebviewPlatform() {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	return settings.spoofWebviewAsAndroid ? "android" : "tdesktop";
 }
 
diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
index b26195d4c5..b9987430ff 100644
--- a/Telegram/SourceFiles/main/main_session.cpp
+++ b/Telegram/SourceFiles/main/main_session.cpp
@@ -321,7 +321,7 @@ rpl::producer<> Session::downloaderTaskFinished() const {
 }
 
 bool Session::premium() const {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.localPremium) {
 		return true;
 	}
@@ -330,7 +330,7 @@ bool Session::premium() const {
 }
 
 bool Session::premiumPossible() const {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.localPremium) {
 		return true;
 	}
@@ -353,7 +353,7 @@ rpl::producer<bool> Session::premiumPossibleValue() const {
 		return _user->isPremium();
 	});
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.localPremium) {
 		premium = rpl::single(true);
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
index 4d5a744f59..0335bd9b74 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
@@ -100,7 +100,7 @@ void RepostView::draw(Painter &p, int x, int y, int availableWidth) {
 	Ui::Text::ValidateQuotePaintCache(*cache, quoteSt);
 	Ui::Text::FillQuotePaint(p, rect, *cache, quoteSt);
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.simpleQuotesAndReplies && backgroundEmoji) {
 		using namespace HistoryView;
 		if (backgroundEmoji->firstFrameMask.isNull()
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 0eaad13aa3..57920d2f12 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -694,7 +694,7 @@ FillMenuResult FillSendMenu(
 		: st::defaultComposeIcons;
 
 	if (sending && type != Type::Reminder) {
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		menu->addAction(
 			settings.sendWithoutSound ? tr::ayu_SendWithSound(tr::now) : tr::lng_send_silent_message(tr::now),
 			[=] { action({ Api::SendOptions{ .silent = true } }, details); },
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp
index 917041a7a9..3fb263bbdf 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.cpp
+++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp
@@ -512,7 +512,7 @@ void MainWindow::unreadCounterChangedHook() {
 }
 
 void MainWindow::updateTaskbarAndIconCounters() {
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	const auto counter = settings.hideNotificationBadge ? 0 : Core::App().unreadBadge();
 	const auto muted = settings.hideNotificationBadge ? 0 : Core::App().unreadBadgeMuted();
diff --git a/Telegram/SourceFiles/platform/win/tray_win.cpp b/Telegram/SourceFiles/platform/win/tray_win.cpp
index bf307ed0c3..8dcf5347dd 100644
--- a/Telegram/SourceFiles/platform/win/tray_win.cpp
+++ b/Telegram/SourceFiles/platform/win/tray_win.cpp
@@ -142,7 +142,7 @@ bool DarkTasbarValueValid/* = false*/;
 		ScaledLogoLight = base::flat_map<int, QImage>();
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.hideNotificationBadge) {
 		args.count = 0;
 	}
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 3a8087d9e0..9775fb7ed0 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -1042,7 +1042,7 @@ QPointer<Ui::RpWidget> Premium::createPinnedToTop(
 			}
 		}
 
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		if (settings.localPremium) {
 			return tr::ayu_LocalPremiumNotice(Ui::Text::RichLangValue);
 		}
diff --git a/Telegram/SourceFiles/tray.cpp b/Telegram/SourceFiles/tray.cpp
index a1f0034188..4af0e57ddc 100644
--- a/Telegram/SourceFiles/tray.cpp
+++ b/Telegram/SourceFiles/tray.cpp
@@ -102,7 +102,7 @@ void Tray::rebuildMenu() {
 			[=] { toggleSoundNotifications(); });
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	if (settings.showGhostToggleInTray) {
 		auto turnGhostModeText = _textUpdates.events(
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 9fa366665c..1891e7fb9c 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -386,7 +386,7 @@ Panel::Panel(Args &&args)
 , _allowClipboardRead(args.allowClipboardRead) {
 	_widget->setWindowFlag(Qt::WindowStaysOnTopHint, false);
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	auto size = QSize(st::botWebViewPanelSize);
 	if (settings.increaseWebviewHeight) {
 		size.setHeight(st::botWebViewPanelHeightIncreased);
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.cpp b/Telegram/SourceFiles/ui/chat/chat_style.cpp
index 8eac60bd3d..e8a2f4906b 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_style.cpp
@@ -48,7 +48,7 @@ void EnsureBlockquoteCache(
 	cache->outlines = colors.outlines;
 	cache->icon = colors.name;
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.simpleQuotesAndReplies) {
 		cache->bg = QColor(0, 0, 0, 0);
 	}
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index 2c62ba1cad..04bd0d31b3 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -340,7 +340,7 @@ System::Timing System::countTiming(
 		delay = config.notifyDefaultDelay;
 	}
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (settings.disableNotificationsDelay) {
 		delay = minimalDelay;
 	}
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index e2ff30b077..a2d4cdfd35 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -482,7 +482,7 @@ auto ChatThemeValueFromPeer(
 		peer
 	) | rpl::map([=](ResolvedTheme resolved)
 	-> rpl::producer<std::shared_ptr<Ui::ChatTheme>> {
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		// this check ensures that background is not a pattern wallpaper in a private chat
 		if (settings.disableCustomBackgrounds && resolved.paper && resolved.paper->media) {
 			resolved.paper = std::nullopt;
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index 0681286baf..52590c897d 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -140,7 +140,7 @@ void FiltersMenu::setupMainMenuIcon() {
 			? &st::windowFiltersMainMenuUnread
 			: &st::windowFiltersMainMenuUnreadMuted;
 
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 		if (settings.hideNotificationCounters) {
 			icon = nullptr;
 		}
@@ -177,7 +177,7 @@ void FiltersMenu::scrollToButton(not_null<Ui::RpWidget*> widget) {
 
 void FiltersMenu::refresh() {
 	// AyuGram hideAllChatsFolder
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	const auto filters = &_session->session().data().chatsFilters();
 	if (!filters->has() || _ignoreRefresh) {
@@ -310,7 +310,7 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
 			auto count = (chats + state.marks)
 				- (includeMuted ? 0 : muted);
 
-			const auto& settings = AyuSettings::getInstance();
+			const auto &settings = AyuSettings::getInstance();
 			if (settings.hideNotificationCounters) {
 				count = 0;
 				muted = 0;
@@ -457,7 +457,7 @@ void FiltersMenu::applyReorder(
 	}
 
 	// AyuGram hideAllChatsFolder
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	const auto filters = &_session->session().data().chatsFilters();
 	const auto &list = filters->list();
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 8552e9b56b..361951d477 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -639,7 +639,7 @@ void MainMenu::showFinished() {
 void MainMenu::setupMenu() {
 	using namespace Settings;
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 
 	const auto controller = _controller;
 	const auto addAction = [&](
@@ -706,7 +706,7 @@ void MainMenu::setupMenu() {
 			controller->showPeerHistory(controller->session().user());
 		});
 
-		const auto& settings = AyuSettings::getInstance();
+		const auto &settings = AyuSettings::getInstance();
 
 		if (settings.showLReadToggleInDrawer) {
 			addAction(
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index bf8d90d619..6f9d6b7df5 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1794,7 +1794,7 @@ void SessionController::activateFirstChatsFilter() {
 	}
 	_filtersActivated = true;
 
-	const auto& settings = AyuSettings::getInstance();
+	const auto &settings = AyuSettings::getInstance();
 	if (!settings.hideAllChatsFolder) {
 		setActiveChatsFilter(session().data().chatsFilters().defaultId());
 	}