diff --git a/Telegram/Resources/icons/ayu/edited.png b/Telegram/Resources/icons/ayu/edited.png
index d14626a9d..775d79908 100644
Binary files a/Telegram/Resources/icons/ayu/edited.png and b/Telegram/Resources/icons/ayu/edited.png differ
diff --git a/Telegram/Resources/icons/ayu/edited@2x.png b/Telegram/Resources/icons/ayu/edited@2x.png
index f3140cf6a..f879df639 100644
Binary files a/Telegram/Resources/icons/ayu/edited@2x.png and b/Telegram/Resources/icons/ayu/edited@2x.png differ
diff --git a/Telegram/Resources/icons/ayu/edited@3x.png b/Telegram/Resources/icons/ayu/edited@3x.png
index 26e7cc543..cb63905ec 100644
Binary files a/Telegram/Resources/icons/ayu/edited@3x.png and b/Telegram/Resources/icons/ayu/edited@3x.png differ
diff --git a/Telegram/Resources/icons/ayu/trash_bin.png b/Telegram/Resources/icons/ayu/trash_bin.png
index 056b7d8dc..d04d36c13 100644
Binary files a/Telegram/Resources/icons/ayu/trash_bin.png and b/Telegram/Resources/icons/ayu/trash_bin.png differ
diff --git a/Telegram/Resources/icons/ayu/trash_bin@2x.png b/Telegram/Resources/icons/ayu/trash_bin@2x.png
index 323f42a66..7440cbb7c 100644
Binary files a/Telegram/Resources/icons/ayu/trash_bin@2x.png and b/Telegram/Resources/icons/ayu/trash_bin@2x.png differ
diff --git a/Telegram/Resources/icons/ayu/trash_bin@3x.png b/Telegram/Resources/icons/ayu/trash_bin@3x.png
index 02a715435..12704a4a5 100644
Binary files a/Telegram/Resources/icons/ayu/trash_bin@3x.png and b/Telegram/Resources/icons/ayu/trash_bin@3x.png differ
diff --git a/Telegram/SourceFiles/ayu/ayu_settings.cpp b/Telegram/SourceFiles/ayu/ayu_settings.cpp
index ec208a0df..b74233f59 100644
--- a/Telegram/SourceFiles/ayu/ayu_settings.cpp
+++ b/Telegram/SourceFiles/ayu/ayu_settings.cpp
@@ -240,7 +240,7 @@ AyuGramSettings::AyuGramSettings() {
 #endif
 	;
 	simpleQuotesAndReplies = true;
-	replaceBottomInfoWithIcons = true;
+	replaceBottomInfoWithIcons = false;
 	deletedMark = "🧹";
 	editedMark = Core::IsAppLaunched() ? tr::lng_edited(tr::now) : QString("edited");
 	recentStickersCount = 100;
diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp
index efba614cc..092455a0c 100644
--- a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp
+++ b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp
@@ -1325,7 +1325,8 @@ void SetupWideMultiplierSlider(not_null<Ui::VerticalLayout*> container,
 	constexpr auto kMinSize = 1.00;
 	// const auto kMaxSize = 4.00;
 	constexpr auto kStep = 0.05;
-	const auto valueToIndex = [=](double value) {
+	const auto valueToIndex = [=](double value)
+	{
 		return static_cast<int>(std::round((value - kMinSize) / kStep));
 	};
 	const auto indexToValue = [=](int index)
@@ -1460,7 +1461,10 @@ void SetupMarks(not_null<Ui::VerticalLayout*> container) {
 
 	AddButtonWithIcon(
 		container,
-		tr::ayu_ReplaceMarksWithIcons(),
+		tr::ayu_ReplaceMarksWithIcons() | rpl::map([=](QString val)
+		{
+			return val + " β";
+		}),
 		st::settingsButtonNoIcon
 	)->toggleOn(
 		rpl::single(settings->replaceBottomInfoWithIcons)
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
index d9abd270f..ce15289b6 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
@@ -461,6 +461,9 @@ void BottomInfo::layoutDateText() {
 				owner->customEmojiManager().registerInternalEmoji(icon, padding)
 			);
 			deleted = Ui::Text::Colorized(added, 1);
+			if (!(_data.flags & Data::Flag::Edited)) {
+				deleted.append(' ');
+			}
 		}
 
 		TextWithEntities edited;
@@ -472,12 +475,13 @@ void BottomInfo::layoutDateText() {
 				owner->customEmojiManager().registerInternalEmoji(icon, padding)
 			);
 			edited = Ui::Text::Colorized(added, 1);
+			edited.append(' ');
 		} else if (_data.flags & Data::Flag::EstimateDate) {
 		    edited = TextWithEntities{ tr::lng_approximate(tr::now) + ' ' };
 		}
 
 		const auto author = _data.author;
-		const auto prefix = !author.isEmpty() ? u", "_q : QString();
+		const auto prefix = !author.isEmpty() ? (_data.flags & Data::Flag::Edited ? u" "_q : u", "_q) : QString();
 
 		const auto date = TextWithEntities{}.append(edited).append(QLocale().toString(
 			_data.date.time(),