diff --git a/Telegram/Resources/icons/send_control_scheduled.png b/Telegram/Resources/icons/send_control_scheduled.png
new file mode 100644
index 0000000000..dfa00bdcdf
Binary files /dev/null and b/Telegram/Resources/icons/send_control_scheduled.png differ
diff --git a/Telegram/Resources/icons/send_control_scheduled@2x.png b/Telegram/Resources/icons/send_control_scheduled@2x.png
new file mode 100644
index 0000000000..12cba3777c
Binary files /dev/null and b/Telegram/Resources/icons/send_control_scheduled@2x.png differ
diff --git a/Telegram/Resources/icons/send_control_scheduled@3x.png b/Telegram/Resources/icons/send_control_scheduled@3x.png
new file mode 100644
index 0000000000..a37f1171e2
Binary files /dev/null and b/Telegram/Resources/icons/send_control_scheduled@3x.png differ
diff --git a/Telegram/Resources/icons/send_control_scheduled_dot.png b/Telegram/Resources/icons/send_control_scheduled_dot.png
new file mode 100644
index 0000000000..ce83855fca
Binary files /dev/null and b/Telegram/Resources/icons/send_control_scheduled_dot.png differ
diff --git a/Telegram/Resources/icons/send_control_scheduled_dot@2x.png b/Telegram/Resources/icons/send_control_scheduled_dot@2x.png
new file mode 100644
index 0000000000..7422c92d62
Binary files /dev/null and b/Telegram/Resources/icons/send_control_scheduled_dot@2x.png differ
diff --git a/Telegram/Resources/icons/send_control_scheduled_dot@3x.png b/Telegram/Resources/icons/send_control_scheduled_dot@3x.png
new file mode 100644
index 0000000000..b1f4a9852c
Binary files /dev/null and b/Telegram/Resources/icons/send_control_scheduled_dot@3x.png differ
diff --git a/Telegram/SourceFiles/history/history.style b/Telegram/SourceFiles/history/history.style
index 347ad57a97..050ff6c517 100644
--- a/Telegram/SourceFiles/history/history.style
+++ b/Telegram/SourceFiles/history/history.style
@@ -268,8 +268,15 @@ historyBotCommandStart: IconButton(historyAttach) {
 	iconOver: icon {{ "send_control_bot_command", historyComposeIconFgOver }};
 }
 historyScheduledToggle: IconButton(historyAttach) {
-	icon: icon {{ "dialogs_calendar", historyComposeIconFg }};
-	iconOver: icon {{ "dialogs_calendar", historyComposeIconFgOver }};
+	icon: icon {
+		{ "send_control_scheduled", historyComposeIconFg },
+		{ "send_control_scheduled_dot", attentionButtonFg }
+	};
+	iconOver: icon {
+		{ "send_control_scheduled", historyComposeIconFgOver },
+		{ "send_control_scheduled_dot", attentionButtonFg }
+	};
+	iconPosition: point(-1px, -1px);
 }
 historyRecordVoiceFg: historyComposeIconFg;
 historyRecordVoiceFgOver: historyComposeIconFgOver;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index ef7a94a55d..0ab055df0a 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -638,7 +638,7 @@ HistoryWidget::HistoryWidget(
 		if (action.options.scheduled) {
 			crl::on_main(this, [=, history = action.history]{
 				controller->showSection(
-					HistoryView::ScheduledMemento(action.history));
+					HistoryView::ScheduledMemento(history));
 			});
 		} else {
 			fastShowAtEnd(action.history);
diff --git a/Telegram/SourceFiles/platform/mac/mac_touchbar.mm b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm
index 90d7eb5f39..592f619917 100644
--- a/Telegram/SourceFiles/platform/mac/mac_touchbar.mm
+++ b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm
@@ -810,7 +810,9 @@ void AppendEmojiPacks(std::vector<PickerScrubberItem> &to) {
 			if (const auto error = RestrictionToSendStickers()) {
 				Ui::show(Box<InformBox>(*error));
 			}
-			Api::SendExistingDocument(chat.history(), document);
+			Api::SendExistingDocument(
+				Api::MessageToSend(chat.history()),
+				document);
 			return true;
 		} else if (const auto emoji = _stickers[index].emoji) {
 			if (const auto inputField = qobject_cast<QTextEdit*>(