diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 9cc1b2fca9..c1bccb4495 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -7249,7 +7249,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_article_media_slideshow" = "Slideshow";
 "lng_article_insert_details" = "Details";
 "lng_article_insert_table" = "Table";
-"lng_article_insert_map" = "Map";
 "lng_article_limit_length" = "The article is too long.";
 "lng_article_limit_depth" = "The article is nested too deeply.";
 "lng_article_limit_blocks" = "The article has too many blocks.";
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index b98c8f944e..ec1ae974f6 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -69,6 +69,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/attach/attach_bot_webview.h"
 #include "ui/controls/location_picker.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/delayed_activation.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/painter.h"
 #include "ui/text/text_custom_emoji.h"
@@ -2983,6 +2984,7 @@ std::unique_ptr<Ui::DropdownMenu> MakeAttachBotsMenu(
 	if (Data::CanSendAnyOf(peer, locationType, false)
 		&& Ui::LocationPicker::Available(config)) {
 		raw->addAction(tr::lng_maps_point(tr::now), [=] {
+			Ui::PreventDelayedActivation();
 			ChooseAndSendLocation(controller, config, actionFactory());
 		}, &st::menuIconAddress);
 	}
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_box.cpp b/Telegram/SourceFiles/iv/editor/iv_editor_box.cpp
index 153ff3babc..7d90f1fc4f 100644
--- a/Telegram/SourceFiles/iv/editor/iv_editor_box.cpp
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_box.cpp
@@ -154,7 +154,7 @@ enum class ToolbarActionId : uchar {
 	case ToolbarActionId::Table:
 		return tr::lng_article_insert_table(tr::now);
 	case ToolbarActionId::Location:
-		return tr::lng_article_insert_map(tr::now);
+		return tr::lng_maps_point(tr::now);
 	case ToolbarActionId::Divider:
 		return tr::lng_article_insert_divider(tr::now);
 	}
@@ -785,8 +785,8 @@ void Toolbar::fillAttachMenu(not_null<Ui::PopupMenu*> menu) {
 					RequestMediaType::PhotoVideo);
 			}
 		},
-		&st::menuIconPhoto,
-		&st::menuIconPhoto);
+		&st::ivEditorToolbarAttachIcon,
+		&st::ivEditorToolbarAttachIcon);
 	menu->addAction(
 		tr::lng_in_dlg_audio_file(tr::now),
 		[=] {
@@ -796,17 +796,18 @@ void Toolbar::fillAttachMenu(not_null<Ui::PopupMenu*> menu) {
 					RequestMediaType::Audio);
 			}
 		},
-		&st::ivEditorToolbarAudioIcon,
-		&st::ivEditorToolbarAudioIcon);
+		&st::menuIconSoundOn,
+		&st::menuIconSoundOn);
 	if (_requestMap) {
 		menu->addAction(
-			tr::lng_article_insert_map(tr::now),
+			tr::lng_maps_point(tr::now),
 			[=] {
 				if (_editor) {
 					const auto parent = _tooltipParent;
 					auto closeRequests = parent
 						? static_cast<Ui::RpWidget*>(parent.data())->death()
 						: rpl::never<>();
+					Ui::PreventDelayedActivation();
 					_requestMap(
 						not_null<Widget*>(_editor.data()),
 						parent,
diff --git a/Telegram/SourceFiles/iv/iv.style b/Telegram/SourceFiles/iv/iv.style
index f3088e3da9..d0eb9cc16f 100644
--- a/Telegram/SourceFiles/iv/iv.style
+++ b/Telegram/SourceFiles/iv/iv.style
@@ -187,7 +187,6 @@ ivEditorToolbarBulletListIcon: icon {{ "menu/rich/bullet_list-24x24", menuIconCo
 ivEditorToolbarTaskListIcon: icon {{ "menu/rich/task_list-24x24", menuIconColor }};
 ivEditorToolbarPullquoteIcon: icon {{ "menu/rich/pullquote-24x24", menuIconColor }};
 ivEditorToolbarAttachIcon: icon {{ "menu/rich/attach-24x24", menuIconColor }};
-ivEditorToolbarAudioIcon: icon {{ "menu/rich/audio-24x24", menuIconColor }};
 ivEditorToolbarDetailsIcon: icon {{ "menu/rich/details-24x24", menuIconColor }};
 ivEditorToolbarTableIcon: icon {{ "menu/rich/table-24x24", menuIconColor }};
 ivEditorToolbarLocationIcon: icon {{ "menu/rich/location-24x24", menuIconColor }};