diff --git a/Telegram/Resources/icons/info/info_stories_to_archive.png b/Telegram/Resources/icons/info/info_stories_to_archive.png new file mode 100644 index 0000000000..f9c81896eb Binary files /dev/null and b/Telegram/Resources/icons/info/info_stories_to_archive.png differ diff --git a/Telegram/Resources/icons/info/info_stories_to_archive@2x.png b/Telegram/Resources/icons/info/info_stories_to_archive@2x.png new file mode 100644 index 0000000000..ef905891c4 Binary files /dev/null and b/Telegram/Resources/icons/info/info_stories_to_archive@2x.png differ diff --git a/Telegram/Resources/icons/info/info_stories_to_archive@3x.png b/Telegram/Resources/icons/info/info_stories_to_archive@3x.png new file mode 100644 index 0000000000..bc2fc30af1 Binary files /dev/null and b/Telegram/Resources/icons/info/info_stories_to_archive@3x.png differ diff --git a/Telegram/Resources/icons/info/info_stories_to_profile.png b/Telegram/Resources/icons/info/info_stories_to_profile.png new file mode 100644 index 0000000000..cfe465c5b3 Binary files /dev/null and b/Telegram/Resources/icons/info/info_stories_to_profile.png differ diff --git a/Telegram/Resources/icons/info/info_stories_to_profile@2x.png b/Telegram/Resources/icons/info/info_stories_to_profile@2x.png new file mode 100644 index 0000000000..1e9990c2fa Binary files /dev/null and b/Telegram/Resources/icons/info/info_stories_to_profile@2x.png differ diff --git a/Telegram/Resources/icons/info/info_stories_to_profile@3x.png b/Telegram/Resources/icons/info/info_stories_to_profile@3x.png new file mode 100644 index 0000000000..414fa60a26 Binary files /dev/null and b/Telegram/Resources/icons/info/info_stories_to_profile@3x.png differ diff --git a/Telegram/Resources/icons/menu/archive_open.png b/Telegram/Resources/icons/menu/archive_open.png new file mode 100644 index 0000000000..2e3090130c Binary files /dev/null and b/Telegram/Resources/icons/menu/archive_open.png differ diff --git a/Telegram/Resources/icons/menu/archive_open@2x.png b/Telegram/Resources/icons/menu/archive_open@2x.png new file mode 100644 index 0000000000..c95bd9f662 Binary files /dev/null and b/Telegram/Resources/icons/menu/archive_open@2x.png differ diff --git a/Telegram/Resources/icons/menu/archive_open@3x.png b/Telegram/Resources/icons/menu/archive_open@3x.png new file mode 100644 index 0000000000..74687f9ec2 Binary files /dev/null and b/Telegram/Resources/icons/menu/archive_open@3x.png differ diff --git a/Telegram/Resources/icons/menu/channel.png b/Telegram/Resources/icons/menu/channel.png index df2823788f..d6caf71311 100644 Binary files a/Telegram/Resources/icons/menu/channel.png and b/Telegram/Resources/icons/menu/channel.png differ diff --git a/Telegram/Resources/icons/menu/channel@2x.png b/Telegram/Resources/icons/menu/channel@2x.png index 68e65eadea..c68e6a6b08 100644 Binary files a/Telegram/Resources/icons/menu/channel@2x.png and b/Telegram/Resources/icons/menu/channel@2x.png differ diff --git a/Telegram/Resources/icons/menu/channel@3x.png b/Telegram/Resources/icons/menu/channel@3x.png index e3f8e50d36..0ce3d46a9c 100644 Binary files a/Telegram/Resources/icons/menu/channel@3x.png and b/Telegram/Resources/icons/menu/channel@3x.png differ diff --git a/Telegram/Resources/icons/menu/groups.png b/Telegram/Resources/icons/menu/groups.png new file mode 100644 index 0000000000..2fc454a364 Binary files /dev/null and b/Telegram/Resources/icons/menu/groups.png differ diff --git a/Telegram/Resources/icons/menu/groups@2x.png b/Telegram/Resources/icons/menu/groups@2x.png new file mode 100644 index 0000000000..986bc696db Binary files /dev/null and b/Telegram/Resources/icons/menu/groups@2x.png differ diff --git a/Telegram/Resources/icons/menu/groups@3x.png b/Telegram/Resources/icons/menu/groups@3x.png new file mode 100644 index 0000000000..28ed4085f2 Binary files /dev/null and b/Telegram/Resources/icons/menu/groups@3x.png differ diff --git a/Telegram/Resources/icons/menu/night_mode.png b/Telegram/Resources/icons/menu/night_mode.png new file mode 100644 index 0000000000..531195e736 Binary files /dev/null and b/Telegram/Resources/icons/menu/night_mode.png differ diff --git a/Telegram/Resources/icons/menu/night_mode@2x.png b/Telegram/Resources/icons/menu/night_mode@2x.png new file mode 100644 index 0000000000..1742270a36 Binary files /dev/null and b/Telegram/Resources/icons/menu/night_mode@2x.png differ diff --git a/Telegram/Resources/icons/menu/night_mode@3x.png b/Telegram/Resources/icons/menu/night_mode@3x.png new file mode 100644 index 0000000000..601217161b Binary files /dev/null and b/Telegram/Resources/icons/menu/night_mode@3x.png differ diff --git a/Telegram/Resources/icons/menu/profile.png b/Telegram/Resources/icons/menu/profile.png index 962419484c..99861b419c 100644 Binary files a/Telegram/Resources/icons/menu/profile.png and b/Telegram/Resources/icons/menu/profile.png differ diff --git a/Telegram/Resources/icons/menu/profile@2x.png b/Telegram/Resources/icons/menu/profile@2x.png index fe742a4124..14faac7683 100644 Binary files a/Telegram/Resources/icons/menu/profile@2x.png and b/Telegram/Resources/icons/menu/profile@2x.png differ diff --git a/Telegram/Resources/icons/menu/profile@3x.png b/Telegram/Resources/icons/menu/profile@3x.png index e2cf036670..f760db92b7 100644 Binary files a/Telegram/Resources/icons/menu/profile@3x.png and b/Telegram/Resources/icons/menu/profile@3x.png differ diff --git a/Telegram/Resources/icons/menu/saved_messages.png b/Telegram/Resources/icons/menu/saved_messages.png new file mode 100644 index 0000000000..3b8ba1eb7e Binary files /dev/null and b/Telegram/Resources/icons/menu/saved_messages.png differ diff --git a/Telegram/Resources/icons/menu/saved_messages@2x.png b/Telegram/Resources/icons/menu/saved_messages@2x.png new file mode 100644 index 0000000000..b89a092311 Binary files /dev/null and b/Telegram/Resources/icons/menu/saved_messages@2x.png differ diff --git a/Telegram/Resources/icons/menu/saved_messages@3x.png b/Telegram/Resources/icons/menu/saved_messages@3x.png new file mode 100644 index 0000000000..6fa7627de4 Binary files /dev/null and b/Telegram/Resources/icons/menu/saved_messages@3x.png differ diff --git a/Telegram/Resources/icons/menu/settings.png b/Telegram/Resources/icons/menu/settings.png index 4453866e9b..27b0cbcd62 100644 Binary files a/Telegram/Resources/icons/menu/settings.png and b/Telegram/Resources/icons/menu/settings.png differ diff --git a/Telegram/Resources/icons/menu/settings@2x.png b/Telegram/Resources/icons/menu/settings@2x.png index e255fb46a7..76e0fbbe4b 100644 Binary files a/Telegram/Resources/icons/menu/settings@2x.png and b/Telegram/Resources/icons/menu/settings@2x.png differ diff --git a/Telegram/Resources/icons/menu/settings@3x.png b/Telegram/Resources/icons/menu/settings@3x.png index 79b2cf6d2b..5135a603e8 100644 Binary files a/Telegram/Resources/icons/menu/settings@3x.png and b/Telegram/Resources/icons/menu/settings@3x.png differ diff --git a/Telegram/Resources/icons/menu/stories_archive.png b/Telegram/Resources/icons/menu/stories_archive.png index d86b5dc87d..a98e8583cb 100644 Binary files a/Telegram/Resources/icons/menu/stories_archive.png and b/Telegram/Resources/icons/menu/stories_archive.png differ diff --git a/Telegram/Resources/icons/menu/stories_archive@2x.png b/Telegram/Resources/icons/menu/stories_archive@2x.png index f2c59be338..5c56025698 100644 Binary files a/Telegram/Resources/icons/menu/stories_archive@2x.png and b/Telegram/Resources/icons/menu/stories_archive@2x.png differ diff --git a/Telegram/Resources/icons/menu/stories_archive@3x.png b/Telegram/Resources/icons/menu/stories_archive@3x.png index f6369c74cd..715f241bae 100644 Binary files a/Telegram/Resources/icons/menu/stories_archive@3x.png and b/Telegram/Resources/icons/menu/stories_archive@3x.png differ diff --git a/Telegram/Resources/icons/menu/stories_archive_section.png b/Telegram/Resources/icons/menu/stories_archive_section.png new file mode 100644 index 0000000000..d86b5dc87d Binary files /dev/null and b/Telegram/Resources/icons/menu/stories_archive_section.png differ diff --git a/Telegram/Resources/icons/menu/stories_archive_section@2x.png b/Telegram/Resources/icons/menu/stories_archive_section@2x.png new file mode 100644 index 0000000000..f2c59be338 Binary files /dev/null and b/Telegram/Resources/icons/menu/stories_archive_section@2x.png differ diff --git a/Telegram/Resources/icons/menu/stories_archive_section@3x.png b/Telegram/Resources/icons/menu/stories_archive_section@3x.png new file mode 100644 index 0000000000..f6369c74cd Binary files /dev/null and b/Telegram/Resources/icons/menu/stories_archive_section@3x.png differ diff --git a/Telegram/Resources/icons/menu/stories_save.png b/Telegram/Resources/icons/menu/stories_save.png new file mode 100644 index 0000000000..68d2a12f43 Binary files /dev/null and b/Telegram/Resources/icons/menu/stories_save.png differ diff --git a/Telegram/Resources/icons/menu/stories_save@2x.png b/Telegram/Resources/icons/menu/stories_save@2x.png new file mode 100644 index 0000000000..3270541597 Binary files /dev/null and b/Telegram/Resources/icons/menu/stories_save@2x.png differ diff --git a/Telegram/Resources/icons/menu/stories_save@3x.png b/Telegram/Resources/icons/menu/stories_save@3x.png new file mode 100644 index 0000000000..e97dac0abd Binary files /dev/null and b/Telegram/Resources/icons/menu/stories_save@3x.png differ diff --git a/Telegram/Resources/icons/menu/stories_saved.png b/Telegram/Resources/icons/menu/stories_saved.png deleted file mode 100644 index 727dc35f30..0000000000 Binary files a/Telegram/Resources/icons/menu/stories_saved.png and /dev/null differ diff --git a/Telegram/Resources/icons/menu/stories_saved@2x.png b/Telegram/Resources/icons/menu/stories_saved@2x.png deleted file mode 100644 index 3e68c61823..0000000000 Binary files a/Telegram/Resources/icons/menu/stories_saved@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/menu/stories_saved@3x.png b/Telegram/Resources/icons/menu/stories_saved@3x.png deleted file mode 100644 index 9fc3db0d68..0000000000 Binary files a/Telegram/Resources/icons/menu/stories_saved@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/menu/stories_saved_section.png b/Telegram/Resources/icons/menu/stories_saved_section.png new file mode 100644 index 0000000000..31a29d96b1 Binary files /dev/null and b/Telegram/Resources/icons/menu/stories_saved_section.png differ diff --git a/Telegram/Resources/icons/menu/stories_saved_section@2x.png b/Telegram/Resources/icons/menu/stories_saved_section@2x.png new file mode 100644 index 0000000000..02a9f4687e Binary files /dev/null and b/Telegram/Resources/icons/menu/stories_saved_section@2x.png differ diff --git a/Telegram/Resources/icons/menu/stories_saved_section@3x.png b/Telegram/Resources/icons/menu/stories_saved_section@3x.png new file mode 100644 index 0000000000..8de09fb323 Binary files /dev/null and b/Telegram/Resources/icons/menu/stories_saved_section@3x.png differ diff --git a/Telegram/Resources/icons/menu/stories_to_chats.png b/Telegram/Resources/icons/menu/stories_to_chats.png new file mode 100644 index 0000000000..b5129521c8 Binary files /dev/null and b/Telegram/Resources/icons/menu/stories_to_chats.png differ diff --git a/Telegram/Resources/icons/menu/stories_to_chats@2x.png b/Telegram/Resources/icons/menu/stories_to_chats@2x.png new file mode 100644 index 0000000000..575fcc811a Binary files /dev/null and b/Telegram/Resources/icons/menu/stories_to_chats@2x.png differ diff --git a/Telegram/Resources/icons/menu/stories_to_chats@3x.png b/Telegram/Resources/icons/menu/stories_to_chats@3x.png new file mode 100644 index 0000000000..00f6b959b4 Binary files /dev/null and b/Telegram/Resources/icons/menu/stories_to_chats@3x.png differ diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp index 253b789cea..243c36b437 100644 --- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp +++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp @@ -477,10 +477,10 @@ void FillSourceMenu( controller->showSection(Info::Stories::Make( peer, Info::Stories::Tab::Archive)); - }, &st::menuIconStoriesArchive); + }, &st::menuIconStoriesArchiveSection); add(tr::lng_stories_my_title(tr::now), [=] { controller->showSection(Info::Stories::Make(peer)); - }, &st::menuIconStoriesSaved); + }, &st::menuIconStoriesSavedSection); } else { add(tr::lng_profile_send_message(tr::now), [=] { controller->showPeerHistory(peer); @@ -508,7 +508,7 @@ void FillSourceMenu( if (in(Data::StorySourcesList::Hidden)) { add(tr::lng_stories_show_in_chats(tr::now), [=] { toggle(true); - }, &st::menuIconAddToFolder); + }, &st::menuIconStoriesToChats); } } } diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index 21687e562b..eb746c3c57 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -176,12 +176,12 @@ infoTopBarDelete: IconButton(infoTopBarForward) { iconOver: icon {{ "info/info_media_delete", boxTitleCloseFgOver }}; } infoTopBarSaveStories: IconButton(infoTopBarForward) { - icon: icon {{ "menu/stories_saved", boxTitleCloseFg }}; - iconOver: icon {{ "menu/stories_saved", boxTitleCloseFgOver }}; + icon: icon {{ "info/info_stories_to_profile", boxTitleCloseFg }}; + iconOver: icon {{ "info/info_stories_to_profile", boxTitleCloseFgOver }}; } infoTopBarArchiveStories: IconButton(infoTopBarForward) { - icon: icon {{ "menu/archive", boxTitleCloseFg }}; - iconOver: icon {{ "menu/archive", boxTitleCloseFgOver }}; + icon: icon {{ "info/info_stories_to_archive", boxTitleCloseFg }}; + iconOver: icon {{ "info/info_stories_to_archive", boxTitleCloseFgOver }}; } infoTopBar: InfoTopBar { height: infoTopBarHeight; @@ -251,12 +251,12 @@ infoLayerTopBarDelete: IconButton(infoLayerTopBarForward) { iconOver: icon {{ "info/info_media_delete", boxTitleCloseFgOver }}; } infoLayerTopBarSaveStories: IconButton(infoLayerTopBarForward) { - icon: icon {{ "menu/stories_saved", boxTitleCloseFg }}; - iconOver: icon {{ "menu/stories_saved", boxTitleCloseFgOver }}; + icon: icon {{ "info/info_stories_to_profile", boxTitleCloseFg }}; + iconOver: icon {{ "info/info_stories_to_profile", boxTitleCloseFgOver }}; } infoLayerTopBarArchiveStories: IconButton(infoLayerTopBarForward) { - icon: icon {{ "menu/archive", boxTitleCloseFg }}; - iconOver: icon {{ "menu/archive", boxTitleCloseFgOver }}; + icon: icon {{ "info/info_stories_to_archive", boxTitleCloseFg }}; + iconOver: icon {{ "info/info_stories_to_archive", boxTitleCloseFgOver }}; } infoLayerTopBar: InfoTopBar(infoTopBar) { height: infoLayerTopBarHeight; diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp index 7fb64b9d20..8a06efa5c1 100644 --- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp +++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp @@ -1029,7 +1029,9 @@ void ListWidget::showContextMenu( ? tr::lng_mediaview_save_to_profile : tr::lng_archived_add)(tr::now), crl::guard(this, [this] { toggleStoryPinSelected(); }), - (pin ? &st::menuIconStoriesSaved : &st::menuIconArchive)); + (pin + ? &st::menuIconStoriesSave + : &st::menuIconStoriesArchive)); } if (canForwardAll()) { _contextMenu->addAction( @@ -1070,7 +1072,9 @@ void ListWidget::showContextMenu( crl::guard(this, [=] { toggleStoryPin({ 1, globalId.itemId }); }), - (pin ? &st::menuIconStoriesSaved : &st::menuIconArchive)); + (pin + ? &st::menuIconStoriesSave + : &st::menuIconStoriesArchive)); } if (selectionData.canForward) { _contextMenu->addAction( diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style index 853af9e435..2fd6327a4d 100644 --- a/Telegram/SourceFiles/settings/settings.style +++ b/Telegram/SourceFiles/settings/settings.style @@ -93,13 +93,7 @@ settingsIconThemes: icon {{ "settings/palette", settingsIconFg }}; settingsIconGroup: icon {{ "settings/group", settingsIconFg }}; settingsIconChannel: icon {{ "settings/channel", settingsIconFg }}; settingsIconUser: icon {{ "settings/user", settingsIconFg }}; -settingsIconSavedMessages: icon {{ "settings/saved_messages", settingsIconFg }}; -settingsIconStories: icon {{ "settings/stories", settingsIconFg }}; settingsIconKey: icon {{ "settings/key", settingsIconFg }}; -settingsIconReload: icon {{ "settings/reload", settingsIconFg }}; -settingsIconNight: icon {{ "settings/night", settingsIconFg }}; -settingsIconSettings: icon {{ "settings/settings", settingsIconFg }}; -settingsIconArchive: icon {{ "settings/archive", settingsIconFg }}; settingsIconPlus: icon {{ "settings/plus", settingsIconFg }}; settingsIconMinus: icon {{ "settings/minus", settingsIconFg }}; settingsIconTimer: icon {{ "settings/timer", settingsIconFg }}; diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style index 3c697f3162..1830268813 100644 --- a/Telegram/SourceFiles/ui/menu_icons.style +++ b/Telegram/SourceFiles/ui/menu_icons.style @@ -104,8 +104,15 @@ menuIconNewWindow: icon {{ "menu/new_window", menuIconColor }}; menuIconChatBubble: icon {{ "menu/chat_bubble", menuIconColor }}; menuIconPhone: icon {{ "menu/phone", menuIconColor }}; menuIconChannel: icon {{ "menu/channel", menuIconColor }}; -menuIconStoriesSaved: icon {{ "menu/stories_saved", menuIconColor }}; +menuIconStoriesSavedSection: icon {{ "menu/stories_saved_section", menuIconColor }}; +menuIconStoriesArchiveSection: icon {{ "menu/stories_archive_section", menuIconColor }}; +menuIconStoriesSave: icon {{ "menu/stories_save", menuIconColor }}; menuIconStoriesArchive: icon {{ "menu/stories_archive", menuIconColor }}; +menuIconArchiveOpen: icon {{ "menu/archive_open", menuIconColor }}; +menuIconGroups: icon {{ "menu/groups", menuIconColor }}; +menuIconSavedMessages: icon {{ "menu/saved_messages", menuIconColor }}; +menuIconNightMode: icon {{ "menu/night_mode", menuIconColor }}; +menuIconStoriesToChats: icon {{ "menu/stories_to_chats", menuIconColor }}; menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }}; menuIconTTLAnyTextPosition: point(11px, 22px); @@ -126,8 +133,8 @@ mediaMenuIconDelete: icon {{ "menu/delete", mediaviewMenuFg }}; mediaMenuIconShowAll: icon {{ "menu/all_media", mediaviewMenuFg }}; mediaMenuIconProfile: icon {{ "menu/profile", mediaviewMenuFg }}; mediaMenuIconReport: icon {{ "menu/report", mediaviewMenuFg }}; -mediaMenuIconSaveStory: icon {{ "menu/stories_saved", mediaviewMenuFg }}; -mediaMenuIconArchiveStory: icon {{ "menu/archive", mediaviewMenuFg }}; +mediaMenuIconSaveStory: icon {{ "menu/stories_save", mediaviewMenuFg }}; +mediaMenuIconArchiveStory: icon {{ "menu/stories_archive", mediaviewMenuFg }}; menuIconDeleteAttention: icon {{ "menu/delete", menuIconAttentionColor }}; menuIconLeaveAttention: icon {{ "menu/leave", menuIconAttentionColor }}; diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp index 13f4e45bff..14f9a1cd17 100644 --- a/Telegram/SourceFiles/window/window_main_menu.cpp +++ b/Telegram/SourceFiles/window/window_main_menu.cpp @@ -587,7 +587,7 @@ void MainMenu::setupArchive() { inner, tr::lng_archived_name(), st::mainMenuButton, - { &st::settingsIconArchive, kIconGray }); + { &st::menuIconArchiveOpen }); inner->add( object_ptr(inner), { 0, st::mainMenuSkip, 0, st::mainMenuSkip }); @@ -734,13 +734,13 @@ void MainMenu::setupMenu() { if (!_controller->session().supportMode()) { addAction( tr::lng_create_group_title(), - { &st::settingsIconGroup, kIconLightBlue } + { &st::menuIconGroups } )->setClickedCallback([=] { controller->showNewGroup(); }); addAction( tr::lng_create_channel_title(), - { &st::settingsIconChannel, kIconLightOrange } + { &st::menuIconChannel } )->setClickedCallback([=] { controller->showNewChannel(); }); @@ -752,10 +752,7 @@ void MainMenu::setupMenu() { _menu, tr::lng_menu_my_stories(), st::mainMenuButton, - IconDescriptor{ - &st::settingsIconStories, - kIconDarkBlue - }))); + IconDescriptor{ &st::menuIconStoriesSavedSection }))); const auto stories = &controller->session().data().stories(); if (stories->archiveCount() > 0) { wrap->toggle(true, anim::type::instant); @@ -776,32 +773,32 @@ void MainMenu::setupMenu() { addAction( tr::lng_menu_contacts(), - { &st::settingsIconUser, kIconRed } + { &st::menuIconProfile } )->setClickedCallback([=] { controller->show(PrepareContactsBox(controller)); }); addAction( tr::lng_menu_calls(), - { &st::settingsIconCalls, kIconGreen } + { &st::menuIconPhone } )->setClickedCallback([=] { ShowCallsBox(controller); }); addAction( tr::lng_saved_messages(), - { &st::settingsIconSavedMessages, kIconLightBlue } + { &st::menuIconSavedMessages } )->setClickedCallback([=] { controller->showPeerHistory(controller->session().user()); }); } else { addAction( tr::lng_profile_add_contact(), - { &st::settingsIconUser, kIconRed } + { &st::menuIconProfile } )->setClickedCallback([=] { controller->showAddContact(); }); addAction( rpl::single(u"Fix chats order"_q), - { &st::settingsIconPin, kIconGreen } + { &st::menuIconPin } )->toggleOn(rpl::single( _controller->session().settings().supportFixChatsOrder() ))->toggledChanges( @@ -811,21 +808,21 @@ void MainMenu::setupMenu() { }, _menu->lifetime()); addAction( rpl::single(u"Reload templates"_q), - { &st::settingsIconReload, kIconLightBlue } + { &st::menuIconRestore } )->setClickedCallback([=] { _controller->session().supportTemplates().reload(); }); } addAction( tr::lng_menu_settings(), - { &st::settingsIconSettings, kIconPurple } + { &st::menuIconSettings } )->setClickedCallback([=] { controller->showSettings(); }); _nightThemeToggle = addAction( tr::lng_menu_night_mode(), - { &st::settingsIconNight, kIconDarkBlue } + { &st::menuIconNightMode } )->toggleOn(_nightThemeSwitches.events_starting_with( Window::Theme::IsNightMode() ));