diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 1660c27585..8734c6d0f8 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -66,6 +66,7 @@ ComposeIcons {
 	menuGifAdd: icon;
 	menuGifRemove: icon;
 	menuMute: icon;
+	menuUnmute: icon;
 	menuSchedule: icon;
 	menuWhenOnline: icon;
 	menuSpoiler: icon;
@@ -615,6 +616,7 @@ defaultComposeIcons: ComposeIcons {
 	menuGifAdd: menuIconGif;
 	menuGifRemove: menuIconDelete;
 	menuMute: menuIconMute;
+	menuUnmute: menuIconUnmute;
 	menuSchedule: menuIconSchedule;
 	menuWhenOnline: menuIconWhenOnline;
 	menuSpoiler: menuIconSpoiler;
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index 35e31e2af5..361fe9fe65 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -527,7 +527,7 @@ bool ShouldSendSilent(
 		const Api::SendOptions &options) {
 	const auto& settings = AyuSettings::getInstance();
 	if (settings.sendWithoutSound) {
-		return true;
+		return !options.silent;
 	}
 
 	return options.silent
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 5d0c6a8411..2513a792cb 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -644,6 +644,7 @@ storiesEmojiPan: EmojiPan(defaultEmojiPan) {
 		menuGifAdd: icon {{ "menu/gif", storiesComposeWhiteText }};
 		menuGifRemove: icon {{ "menu/delete", storiesComposeWhiteText }};
 		menuMute: icon {{ "menu/mute", storiesComposeWhiteText }};
+		menuUnmute: icon {{ "menu/unmute", storiesComposeWhiteText }};
 		menuSchedule: icon {{ "menu/calendar", storiesComposeWhiteText }};
 		menuWhenOnline: icon {{ "menu/send_when_online", storiesComposeWhiteText }};
 		menuSpoiler: icon {{ "menu/spoiler_on", storiesComposeWhiteText }};
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 118bcee597..0eaad13aa3 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -58,6 +58,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtWidgets/QApplication>
 
+// AyuGram includes
+#include "ayu/ayu_settings.h"
+
+
 namespace SendMenu {
 namespace {
 
@@ -690,10 +694,11 @@ FillMenuResult FillSendMenu(
 		: st::defaultComposeIcons;
 
 	if (sending && type != Type::Reminder) {
+		const auto& settings = AyuSettings::getInstance();
 		menu->addAction(
-			tr::lng_send_silent_message(tr::now),
+			settings.sendWithoutSound ? tr::ayu_SendWithSound(tr::now) : tr::lng_send_silent_message(tr::now),
 			[=] { action({ Api::SendOptions{ .silent = true } }, details); },
-			&icons.menuMute);
+			settings.sendWithoutSound ? &icons.menuUnmute : &icons.menuMute);
 	}
 	if (sending && type != Type::SilentOnly) {
 		menu->addAction(