diff --git a/Telegram/Resources/icons/chat/seen_checks.png b/Telegram/Resources/icons/chat/seen_checks.png deleted file mode 100644 index c65944de13..0000000000 Binary files a/Telegram/Resources/icons/chat/seen_checks.png and /dev/null differ diff --git a/Telegram/Resources/icons/chat/seen_checks@2x.png b/Telegram/Resources/icons/chat/seen_checks@2x.png deleted file mode 100644 index 801e26d857..0000000000 Binary files a/Telegram/Resources/icons/chat/seen_checks@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/chat/seen_checks@3x.png b/Telegram/Resources/icons/chat/seen_checks@3x.png deleted file mode 100644 index 49333c2948..0000000000 Binary files a/Telegram/Resources/icons/chat/seen_checks@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/chat/seen_played.png b/Telegram/Resources/icons/chat/seen_played.png deleted file mode 100644 index ca24dd2a52..0000000000 Binary files a/Telegram/Resources/icons/chat/seen_played.png and /dev/null differ diff --git a/Telegram/Resources/icons/chat/seen_played@2x.png b/Telegram/Resources/icons/chat/seen_played@2x.png deleted file mode 100644 index 99884aae9e..0000000000 Binary files a/Telegram/Resources/icons/chat/seen_played@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/chat/seen_played@3x.png b/Telegram/Resources/icons/chat/seen_played@3x.png deleted file mode 100644 index cab65eb3b2..0000000000 Binary files a/Telegram/Resources/icons/chat/seen_played@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/menu/add_account.png b/Telegram/Resources/icons/menu/add_account.png index 175540e136..535725f0bb 100644 Binary files a/Telegram/Resources/icons/menu/add_account.png and b/Telegram/Resources/icons/menu/add_account.png differ diff --git a/Telegram/Resources/icons/menu/add_account@2x.png b/Telegram/Resources/icons/menu/add_account@2x.png index 81583e5c6f..ef74df51a4 100644 Binary files a/Telegram/Resources/icons/menu/add_account@2x.png and b/Telegram/Resources/icons/menu/add_account@2x.png differ diff --git a/Telegram/Resources/icons/menu/add_account@3x.png b/Telegram/Resources/icons/menu/add_account@3x.png index d6597b7871..22d6c56c4a 100644 Binary files a/Telegram/Resources/icons/menu/add_account@3x.png and b/Telegram/Resources/icons/menu/add_account@3x.png differ diff --git a/Telegram/Resources/icons/menu/admin.png b/Telegram/Resources/icons/menu/admin.png index bb9ed4c87b..6ddda6a108 100644 Binary files a/Telegram/Resources/icons/menu/admin.png and b/Telegram/Resources/icons/menu/admin.png differ diff --git a/Telegram/Resources/icons/menu/admin@2x.png b/Telegram/Resources/icons/menu/admin@2x.png index 8baaecb1e7..d63fde8cc6 100644 Binary files a/Telegram/Resources/icons/menu/admin@2x.png and b/Telegram/Resources/icons/menu/admin@2x.png differ diff --git a/Telegram/Resources/icons/menu/admin@3x.png b/Telegram/Resources/icons/menu/admin@3x.png index ce868945d5..6d87a2798c 100644 Binary files a/Telegram/Resources/icons/menu/admin@3x.png and b/Telegram/Resources/icons/menu/admin@3x.png differ diff --git a/Telegram/Resources/icons/menu/admin_promote.png b/Telegram/Resources/icons/menu/admin_promote.png index ce7a550e62..9ad438f571 100644 Binary files a/Telegram/Resources/icons/menu/admin_promote.png and b/Telegram/Resources/icons/menu/admin_promote.png differ diff --git a/Telegram/Resources/icons/menu/admin_promote@2x.png b/Telegram/Resources/icons/menu/admin_promote@2x.png index e91ce78908..f76977c15b 100644 Binary files a/Telegram/Resources/icons/menu/admin_promote@2x.png and b/Telegram/Resources/icons/menu/admin_promote@2x.png differ diff --git a/Telegram/Resources/icons/menu/admin_promote@3x.png b/Telegram/Resources/icons/menu/admin_promote@3x.png index 8f9317cbfb..2ab6368320 100644 Binary files a/Telegram/Resources/icons/menu/admin_promote@3x.png and b/Telegram/Resources/icons/menu/admin_promote@3x.png differ diff --git a/Telegram/Resources/icons/menu/all_media.png b/Telegram/Resources/icons/menu/all_media.png index 9febf576c8..7d8119b3d1 100644 Binary files a/Telegram/Resources/icons/menu/all_media.png and b/Telegram/Resources/icons/menu/all_media.png differ diff --git a/Telegram/Resources/icons/menu/all_media@2x.png b/Telegram/Resources/icons/menu/all_media@2x.png index b2b3b6ce15..a689a34bbe 100644 Binary files a/Telegram/Resources/icons/menu/all_media@2x.png and b/Telegram/Resources/icons/menu/all_media@2x.png differ diff --git a/Telegram/Resources/icons/menu/all_media@3x.png b/Telegram/Resources/icons/menu/all_media@3x.png index 4fa10d48f3..d5390cc6da 100644 Binary files a/Telegram/Resources/icons/menu/all_media@3x.png and b/Telegram/Resources/icons/menu/all_media@3x.png differ diff --git a/Telegram/Resources/icons/menu/archive.png b/Telegram/Resources/icons/menu/archive.png index 432bf2f7b5..4fce81e920 100644 Binary files a/Telegram/Resources/icons/menu/archive.png and b/Telegram/Resources/icons/menu/archive.png differ diff --git a/Telegram/Resources/icons/menu/archive@2x.png b/Telegram/Resources/icons/menu/archive@2x.png index 59914bb170..feb6cab453 100644 Binary files a/Telegram/Resources/icons/menu/archive@2x.png and b/Telegram/Resources/icons/menu/archive@2x.png differ diff --git a/Telegram/Resources/icons/menu/archive@3x.png b/Telegram/Resources/icons/menu/archive@3x.png index c449fce34b..9be5d6369b 100644 Binary files a/Telegram/Resources/icons/menu/archive@3x.png and b/Telegram/Resources/icons/menu/archive@3x.png differ diff --git a/Telegram/Resources/icons/menu/block.png b/Telegram/Resources/icons/menu/block.png index 3f9efcd873..6c81ea74d6 100644 Binary files a/Telegram/Resources/icons/menu/block.png and b/Telegram/Resources/icons/menu/block.png differ diff --git a/Telegram/Resources/icons/menu/block@2x.png b/Telegram/Resources/icons/menu/block@2x.png index f6cad1fe4a..90612c87d8 100644 Binary files a/Telegram/Resources/icons/menu/block@2x.png and b/Telegram/Resources/icons/menu/block@2x.png differ diff --git a/Telegram/Resources/icons/menu/block@3x.png b/Telegram/Resources/icons/menu/block@3x.png index 5e0ced5d56..7eb4c2925c 100644 Binary files a/Telegram/Resources/icons/menu/block@3x.png and b/Telegram/Resources/icons/menu/block@3x.png differ diff --git a/Telegram/Resources/icons/menu/calendar.png b/Telegram/Resources/icons/menu/calendar.png index 036bd32e49..b61e0f5287 100644 Binary files a/Telegram/Resources/icons/menu/calendar.png and b/Telegram/Resources/icons/menu/calendar.png differ diff --git a/Telegram/Resources/icons/menu/calendar@2x.png b/Telegram/Resources/icons/menu/calendar@2x.png index c53106f9b9..7fbdb50606 100644 Binary files a/Telegram/Resources/icons/menu/calendar@2x.png and b/Telegram/Resources/icons/menu/calendar@2x.png differ diff --git a/Telegram/Resources/icons/menu/calendar@3x.png b/Telegram/Resources/icons/menu/calendar@3x.png index c855738736..5f9447922c 100644 Binary files a/Telegram/Resources/icons/menu/calendar@3x.png and b/Telegram/Resources/icons/menu/calendar@3x.png differ diff --git a/Telegram/Resources/icons/menu/cancel.png b/Telegram/Resources/icons/menu/cancel.png index f88a31e39c..c52cecef63 100644 Binary files a/Telegram/Resources/icons/menu/cancel.png and b/Telegram/Resources/icons/menu/cancel.png differ diff --git a/Telegram/Resources/icons/menu/cancel@2x.png b/Telegram/Resources/icons/menu/cancel@2x.png index ae05c193ee..2bb92f3eeb 100644 Binary files a/Telegram/Resources/icons/menu/cancel@2x.png and b/Telegram/Resources/icons/menu/cancel@2x.png differ diff --git a/Telegram/Resources/icons/menu/cancel@3x.png b/Telegram/Resources/icons/menu/cancel@3x.png index 151fe55ffc..3114f1ec0e 100644 Binary files a/Telegram/Resources/icons/menu/cancel@3x.png and b/Telegram/Resources/icons/menu/cancel@3x.png differ diff --git a/Telegram/Resources/icons/menu/clear.png b/Telegram/Resources/icons/menu/clear.png index 3d1ac4ba16..36dba229d8 100644 Binary files a/Telegram/Resources/icons/menu/clear.png and b/Telegram/Resources/icons/menu/clear.png differ diff --git a/Telegram/Resources/icons/menu/clear@2x.png b/Telegram/Resources/icons/menu/clear@2x.png index 3a6664bc76..9b249b44cd 100644 Binary files a/Telegram/Resources/icons/menu/clear@2x.png and b/Telegram/Resources/icons/menu/clear@2x.png differ diff --git a/Telegram/Resources/icons/menu/clear@3x.png b/Telegram/Resources/icons/menu/clear@3x.png index 1271ec8ed1..a83adaa89c 100644 Binary files a/Telegram/Resources/icons/menu/clear@3x.png and b/Telegram/Resources/icons/menu/clear@3x.png differ diff --git a/Telegram/Resources/icons/menu/collapse.png b/Telegram/Resources/icons/menu/collapse.png index 330cedb208..956c75aa89 100644 Binary files a/Telegram/Resources/icons/menu/collapse.png and b/Telegram/Resources/icons/menu/collapse.png differ diff --git a/Telegram/Resources/icons/menu/collapse@2x.png b/Telegram/Resources/icons/menu/collapse@2x.png index be2b93bf58..028c6cf9ba 100644 Binary files a/Telegram/Resources/icons/menu/collapse@2x.png and b/Telegram/Resources/icons/menu/collapse@2x.png differ diff --git a/Telegram/Resources/icons/menu/collapse@3x.png b/Telegram/Resources/icons/menu/collapse@3x.png index c9617e2716..1f4936b5d3 100644 Binary files a/Telegram/Resources/icons/menu/collapse@3x.png and b/Telegram/Resources/icons/menu/collapse@3x.png differ diff --git a/Telegram/Resources/icons/menu/colors.png b/Telegram/Resources/icons/menu/colors.png index e12e34a07a..b4113d0f18 100644 Binary files a/Telegram/Resources/icons/menu/colors.png and b/Telegram/Resources/icons/menu/colors.png differ diff --git a/Telegram/Resources/icons/menu/colors@2x.png b/Telegram/Resources/icons/menu/colors@2x.png index 675796b02e..868687c0d2 100644 Binary files a/Telegram/Resources/icons/menu/colors@2x.png and b/Telegram/Resources/icons/menu/colors@2x.png differ diff --git a/Telegram/Resources/icons/menu/colors@3x.png b/Telegram/Resources/icons/menu/colors@3x.png index 6329caf06e..19641ef375 100644 Binary files a/Telegram/Resources/icons/menu/colors@3x.png and b/Telegram/Resources/icons/menu/colors@3x.png differ diff --git a/Telegram/Resources/icons/menu/copy.png b/Telegram/Resources/icons/menu/copy.png index 2a80ac0093..a7e8215e11 100644 Binary files a/Telegram/Resources/icons/menu/copy.png and b/Telegram/Resources/icons/menu/copy.png differ diff --git a/Telegram/Resources/icons/menu/copy@2x.png b/Telegram/Resources/icons/menu/copy@2x.png index 5a2828a658..54a5623e63 100644 Binary files a/Telegram/Resources/icons/menu/copy@2x.png and b/Telegram/Resources/icons/menu/copy@2x.png differ diff --git a/Telegram/Resources/icons/menu/copy@3x.png b/Telegram/Resources/icons/menu/copy@3x.png index 611d391ad1..91f9b0582a 100644 Binary files a/Telegram/Resources/icons/menu/copy@3x.png and b/Telegram/Resources/icons/menu/copy@3x.png differ diff --git a/Telegram/Resources/icons/menu/create_poll.png b/Telegram/Resources/icons/menu/create_poll.png index 7918de74a3..de5f8018fb 100644 Binary files a/Telegram/Resources/icons/menu/create_poll.png and b/Telegram/Resources/icons/menu/create_poll.png differ diff --git a/Telegram/Resources/icons/menu/create_poll@2x.png b/Telegram/Resources/icons/menu/create_poll@2x.png index 17e5a7d0f3..99a38d2159 100644 Binary files a/Telegram/Resources/icons/menu/create_poll@2x.png and b/Telegram/Resources/icons/menu/create_poll@2x.png differ diff --git a/Telegram/Resources/icons/menu/create_poll@3x.png b/Telegram/Resources/icons/menu/create_poll@3x.png index 245b8978d4..7e9732dc86 100644 Binary files a/Telegram/Resources/icons/menu/create_poll@3x.png and b/Telegram/Resources/icons/menu/create_poll@3x.png differ diff --git a/Telegram/Resources/icons/menu/delete.png b/Telegram/Resources/icons/menu/delete.png index 9c17f40642..a87bbf735e 100644 Binary files a/Telegram/Resources/icons/menu/delete.png and b/Telegram/Resources/icons/menu/delete.png differ diff --git a/Telegram/Resources/icons/menu/delete@2x.png b/Telegram/Resources/icons/menu/delete@2x.png index 0d9d8c9c25..4c3b41ac6f 100644 Binary files a/Telegram/Resources/icons/menu/delete@2x.png and b/Telegram/Resources/icons/menu/delete@2x.png differ diff --git a/Telegram/Resources/icons/menu/delete@3x.png b/Telegram/Resources/icons/menu/delete@3x.png index daaf32b811..d94002fdfe 100644 Binary files a/Telegram/Resources/icons/menu/delete@3x.png and b/Telegram/Resources/icons/menu/delete@3x.png differ diff --git a/Telegram/Resources/icons/menu/discussion.png b/Telegram/Resources/icons/menu/discussion.png index 2fefee8b9a..180a17d2bb 100644 Binary files a/Telegram/Resources/icons/menu/discussion.png and b/Telegram/Resources/icons/menu/discussion.png differ diff --git a/Telegram/Resources/icons/menu/discussion@2x.png b/Telegram/Resources/icons/menu/discussion@2x.png index 495257521c..c7f148d6d5 100644 Binary files a/Telegram/Resources/icons/menu/discussion@2x.png and b/Telegram/Resources/icons/menu/discussion@2x.png differ diff --git a/Telegram/Resources/icons/menu/discussion@3x.png b/Telegram/Resources/icons/menu/discussion@3x.png index 3f6029d1e7..44f2f40a16 100644 Binary files a/Telegram/Resources/icons/menu/discussion@3x.png and b/Telegram/Resources/icons/menu/discussion@3x.png differ diff --git a/Telegram/Resources/icons/menu/download.png b/Telegram/Resources/icons/menu/download.png index 449dffea57..822e8716b6 100644 Binary files a/Telegram/Resources/icons/menu/download.png and b/Telegram/Resources/icons/menu/download.png differ diff --git a/Telegram/Resources/icons/menu/download@2x.png b/Telegram/Resources/icons/menu/download@2x.png index 6e489c2164..e9a78093e4 100644 Binary files a/Telegram/Resources/icons/menu/download@2x.png and b/Telegram/Resources/icons/menu/download@2x.png differ diff --git a/Telegram/Resources/icons/menu/download@3x.png b/Telegram/Resources/icons/menu/download@3x.png index 638c162487..9c19c3c061 100644 Binary files a/Telegram/Resources/icons/menu/download@3x.png and b/Telegram/Resources/icons/menu/download@3x.png differ diff --git a/Telegram/Resources/icons/menu/edit.png b/Telegram/Resources/icons/menu/edit.png index 04e52a0695..b328e4b99e 100644 Binary files a/Telegram/Resources/icons/menu/edit.png and b/Telegram/Resources/icons/menu/edit.png differ diff --git a/Telegram/Resources/icons/menu/edit@2x.png b/Telegram/Resources/icons/menu/edit@2x.png index 2417cc52c6..208dd25f27 100644 Binary files a/Telegram/Resources/icons/menu/edit@2x.png and b/Telegram/Resources/icons/menu/edit@2x.png differ diff --git a/Telegram/Resources/icons/menu/edit@3x.png b/Telegram/Resources/icons/menu/edit@3x.png index ef846b4935..f95298a9d0 100644 Binary files a/Telegram/Resources/icons/menu/edit@3x.png and b/Telegram/Resources/icons/menu/edit@3x.png differ diff --git a/Telegram/Resources/icons/menu/expand.png b/Telegram/Resources/icons/menu/expand.png index e817187b65..ad25da472f 100644 Binary files a/Telegram/Resources/icons/menu/expand.png and b/Telegram/Resources/icons/menu/expand.png differ diff --git a/Telegram/Resources/icons/menu/expand@2x.png b/Telegram/Resources/icons/menu/expand@2x.png index 5197da5b55..7ababd7d55 100644 Binary files a/Telegram/Resources/icons/menu/expand@2x.png and b/Telegram/Resources/icons/menu/expand@2x.png differ diff --git a/Telegram/Resources/icons/menu/expand@3x.png b/Telegram/Resources/icons/menu/expand@3x.png index 596ac8c3cd..0ad14a423e 100644 Binary files a/Telegram/Resources/icons/menu/expand@3x.png and b/Telegram/Resources/icons/menu/expand@3x.png differ diff --git a/Telegram/Resources/icons/menu/export.png b/Telegram/Resources/icons/menu/export.png index cc9fdee685..81303d4c81 100644 Binary files a/Telegram/Resources/icons/menu/export.png and b/Telegram/Resources/icons/menu/export.png differ diff --git a/Telegram/Resources/icons/menu/export@2x.png b/Telegram/Resources/icons/menu/export@2x.png index 43b2cc3281..e64e11e24c 100644 Binary files a/Telegram/Resources/icons/menu/export@2x.png and b/Telegram/Resources/icons/menu/export@2x.png differ diff --git a/Telegram/Resources/icons/menu/export@3x.png b/Telegram/Resources/icons/menu/export@3x.png index 518e2d39f2..76e573e138 100644 Binary files a/Telegram/Resources/icons/menu/export@3x.png and b/Telegram/Resources/icons/menu/export@3x.png differ diff --git a/Telegram/Resources/icons/menu/export_theme.png b/Telegram/Resources/icons/menu/export_theme.png new file mode 100644 index 0000000000..84a40f33e7 Binary files /dev/null and b/Telegram/Resources/icons/menu/export_theme.png differ diff --git a/Telegram/Resources/icons/menu/export_theme@2x.png b/Telegram/Resources/icons/menu/export_theme@2x.png new file mode 100644 index 0000000000..845195c2a8 Binary files /dev/null and b/Telegram/Resources/icons/menu/export_theme@2x.png differ diff --git a/Telegram/Resources/icons/menu/export_theme@3x.png b/Telegram/Resources/icons/menu/export_theme@3x.png new file mode 100644 index 0000000000..99e5001eec Binary files /dev/null and b/Telegram/Resources/icons/menu/export_theme@3x.png differ diff --git a/Telegram/Resources/icons/menu/favorite.png b/Telegram/Resources/icons/menu/favorite.png index 0e2fb54639..82cfd19a29 100644 Binary files a/Telegram/Resources/icons/menu/favorite.png and b/Telegram/Resources/icons/menu/favorite.png differ diff --git a/Telegram/Resources/icons/menu/favorite@2x.png b/Telegram/Resources/icons/menu/favorite@2x.png index 0b2892cf5b..3469864593 100644 Binary files a/Telegram/Resources/icons/menu/favorite@2x.png and b/Telegram/Resources/icons/menu/favorite@2x.png differ diff --git a/Telegram/Resources/icons/menu/favorite@3x.png b/Telegram/Resources/icons/menu/favorite@3x.png index 692c994e27..5a58bcc49d 100644 Binary files a/Telegram/Resources/icons/menu/favorite@3x.png and b/Telegram/Resources/icons/menu/favorite@3x.png differ diff --git a/Telegram/Resources/icons/menu/flip.png b/Telegram/Resources/icons/menu/flip.png new file mode 100644 index 0000000000..34acb7b999 Binary files /dev/null and b/Telegram/Resources/icons/menu/flip.png differ diff --git a/Telegram/Resources/icons/menu/flip@2x.png b/Telegram/Resources/icons/menu/flip@2x.png new file mode 100644 index 0000000000..596076d1d4 Binary files /dev/null and b/Telegram/Resources/icons/menu/flip@2x.png differ diff --git a/Telegram/Resources/icons/menu/flip@3x.png b/Telegram/Resources/icons/menu/flip@3x.png new file mode 100644 index 0000000000..f5dca8fe93 Binary files /dev/null and b/Telegram/Resources/icons/menu/flip@3x.png differ diff --git a/Telegram/Resources/icons/menu/forward.png b/Telegram/Resources/icons/menu/forward.png index d60f2dee71..c2c141a05c 100644 Binary files a/Telegram/Resources/icons/menu/forward.png and b/Telegram/Resources/icons/menu/forward.png differ diff --git a/Telegram/Resources/icons/menu/forward@2x.png b/Telegram/Resources/icons/menu/forward@2x.png index 70ac7a0ca7..ad8b12b8d5 100644 Binary files a/Telegram/Resources/icons/menu/forward@2x.png and b/Telegram/Resources/icons/menu/forward@2x.png differ diff --git a/Telegram/Resources/icons/menu/forward@3x.png b/Telegram/Resources/icons/menu/forward@3x.png index 2ab9b7f4b1..5a645c2910 100644 Binary files a/Telegram/Resources/icons/menu/forward@3x.png and b/Telegram/Resources/icons/menu/forward@3x.png differ diff --git a/Telegram/Resources/icons/menu/gif.png b/Telegram/Resources/icons/menu/gif.png index bf2e6267cc..9a76a1c8ff 100644 Binary files a/Telegram/Resources/icons/menu/gif.png and b/Telegram/Resources/icons/menu/gif.png differ diff --git a/Telegram/Resources/icons/menu/gif@2x.png b/Telegram/Resources/icons/menu/gif@2x.png index b0dff731cb..4f87590c4e 100644 Binary files a/Telegram/Resources/icons/menu/gif@2x.png and b/Telegram/Resources/icons/menu/gif@2x.png differ diff --git a/Telegram/Resources/icons/menu/gif@3x.png b/Telegram/Resources/icons/menu/gif@3x.png index 7ac35154b0..eccd873f1e 100644 Binary files a/Telegram/Resources/icons/menu/gif@3x.png and b/Telegram/Resources/icons/menu/gif@3x.png differ diff --git a/Telegram/Resources/icons/menu/import_theme.png b/Telegram/Resources/icons/menu/import_theme.png new file mode 100644 index 0000000000..f5af2f897e Binary files /dev/null and b/Telegram/Resources/icons/menu/import_theme.png differ diff --git a/Telegram/Resources/icons/menu/import_theme@2x.png b/Telegram/Resources/icons/menu/import_theme@2x.png new file mode 100644 index 0000000000..575e1e4395 Binary files /dev/null and b/Telegram/Resources/icons/menu/import_theme@2x.png differ diff --git a/Telegram/Resources/icons/menu/import_theme@3x.png b/Telegram/Resources/icons/menu/import_theme@3x.png new file mode 100644 index 0000000000..2169f43c35 Binary files /dev/null and b/Telegram/Resources/icons/menu/import_theme@3x.png differ diff --git a/Telegram/Resources/icons/menu/info.png b/Telegram/Resources/icons/menu/info.png index 6f8030d109..7753fe9f47 100644 Binary files a/Telegram/Resources/icons/menu/info.png and b/Telegram/Resources/icons/menu/info.png differ diff --git a/Telegram/Resources/icons/menu/info@2x.png b/Telegram/Resources/icons/menu/info@2x.png index 2f9b41516b..bf7e1d2d6d 100644 Binary files a/Telegram/Resources/icons/menu/info@2x.png and b/Telegram/Resources/icons/menu/info@2x.png differ diff --git a/Telegram/Resources/icons/menu/info@3x.png b/Telegram/Resources/icons/menu/info@3x.png index 4ea4275a59..af96e7cbfa 100644 Binary files a/Telegram/Resources/icons/menu/info@3x.png and b/Telegram/Resources/icons/menu/info@3x.png differ diff --git a/Telegram/Resources/icons/menu/invite.png b/Telegram/Resources/icons/menu/invite.png index 2d7dd94d92..ea0de5b309 100644 Binary files a/Telegram/Resources/icons/menu/invite.png and b/Telegram/Resources/icons/menu/invite.png differ diff --git a/Telegram/Resources/icons/menu/invite@2x.png b/Telegram/Resources/icons/menu/invite@2x.png index 17f87f9f0b..c2609e6df6 100644 Binary files a/Telegram/Resources/icons/menu/invite@2x.png and b/Telegram/Resources/icons/menu/invite@2x.png differ diff --git a/Telegram/Resources/icons/menu/invite@3x.png b/Telegram/Resources/icons/menu/invite@3x.png index 9fc1e000a3..06bfa637b4 100644 Binary files a/Telegram/Resources/icons/menu/invite@3x.png and b/Telegram/Resources/icons/menu/invite@3x.png differ diff --git a/Telegram/Resources/icons/menu/leave.png b/Telegram/Resources/icons/menu/leave.png index ad79e54580..f5f97bc1b1 100644 Binary files a/Telegram/Resources/icons/menu/leave.png and b/Telegram/Resources/icons/menu/leave.png differ diff --git a/Telegram/Resources/icons/menu/leave@2x.png b/Telegram/Resources/icons/menu/leave@2x.png index c9678f318f..055a952d93 100644 Binary files a/Telegram/Resources/icons/menu/leave@2x.png and b/Telegram/Resources/icons/menu/leave@2x.png differ diff --git a/Telegram/Resources/icons/menu/leave@3x.png b/Telegram/Resources/icons/menu/leave@3x.png index ec56270ebc..ba42fe7b16 100644 Binary files a/Telegram/Resources/icons/menu/leave@3x.png and b/Telegram/Resources/icons/menu/leave@3x.png differ diff --git a/Telegram/Resources/icons/menu/link.png b/Telegram/Resources/icons/menu/link.png index 8d9679f74b..55f7d4f692 100644 Binary files a/Telegram/Resources/icons/menu/link.png and b/Telegram/Resources/icons/menu/link.png differ diff --git a/Telegram/Resources/icons/menu/link@2x.png b/Telegram/Resources/icons/menu/link@2x.png index 84ac9670c8..8eaf08544e 100644 Binary files a/Telegram/Resources/icons/menu/link@2x.png and b/Telegram/Resources/icons/menu/link@2x.png differ diff --git a/Telegram/Resources/icons/menu/link@3x.png b/Telegram/Resources/icons/menu/link@3x.png index 005ddaf8c1..2b8a3d165e 100644 Binary files a/Telegram/Resources/icons/menu/link@3x.png and b/Telegram/Resources/icons/menu/link@3x.png differ diff --git a/Telegram/Resources/icons/menu/manage.png b/Telegram/Resources/icons/menu/manage.png index 67d20772f0..36acf2de97 100644 Binary files a/Telegram/Resources/icons/menu/manage.png and b/Telegram/Resources/icons/menu/manage.png differ diff --git a/Telegram/Resources/icons/menu/manage@2x.png b/Telegram/Resources/icons/menu/manage@2x.png index 158a8c8a52..21ccea9402 100644 Binary files a/Telegram/Resources/icons/menu/manage@2x.png and b/Telegram/Resources/icons/menu/manage@2x.png differ diff --git a/Telegram/Resources/icons/menu/manage@3x.png b/Telegram/Resources/icons/menu/manage@3x.png index 7a1f7cebb2..7b9767c872 100644 Binary files a/Telegram/Resources/icons/menu/manage@3x.png and b/Telegram/Resources/icons/menu/manage@3x.png differ diff --git a/Telegram/Resources/icons/menu/move_from_menu.png b/Telegram/Resources/icons/menu/move_from_menu.png index 3a4b3a76ca..0dc84b3dfa 100644 Binary files a/Telegram/Resources/icons/menu/move_from_menu.png and b/Telegram/Resources/icons/menu/move_from_menu.png differ diff --git a/Telegram/Resources/icons/menu/move_from_menu@2x.png b/Telegram/Resources/icons/menu/move_from_menu@2x.png index 13ff7f744f..ffb80903e3 100644 Binary files a/Telegram/Resources/icons/menu/move_from_menu@2x.png and b/Telegram/Resources/icons/menu/move_from_menu@2x.png differ diff --git a/Telegram/Resources/icons/menu/move_from_menu@3x.png b/Telegram/Resources/icons/menu/move_from_menu@3x.png index 81a5af2078..9822e6f2c6 100644 Binary files a/Telegram/Resources/icons/menu/move_from_menu@3x.png and b/Telegram/Resources/icons/menu/move_from_menu@3x.png differ diff --git a/Telegram/Resources/icons/menu/move_to_menu.png b/Telegram/Resources/icons/menu/move_to_menu.png index acd17770e5..5fe3b32c5c 100644 Binary files a/Telegram/Resources/icons/menu/move_to_menu.png and b/Telegram/Resources/icons/menu/move_to_menu.png differ diff --git a/Telegram/Resources/icons/menu/move_to_menu@2x.png b/Telegram/Resources/icons/menu/move_to_menu@2x.png index 6703436599..10a49d83bb 100644 Binary files a/Telegram/Resources/icons/menu/move_to_menu@2x.png and b/Telegram/Resources/icons/menu/move_to_menu@2x.png differ diff --git a/Telegram/Resources/icons/menu/move_to_menu@3x.png b/Telegram/Resources/icons/menu/move_to_menu@3x.png index 7136e1b2d3..4cf99120cf 100644 Binary files a/Telegram/Resources/icons/menu/move_to_menu@3x.png and b/Telegram/Resources/icons/menu/move_to_menu@3x.png differ diff --git a/Telegram/Resources/icons/menu/mute.png b/Telegram/Resources/icons/menu/mute.png index 6694f69698..af32326f4e 100644 Binary files a/Telegram/Resources/icons/menu/mute.png and b/Telegram/Resources/icons/menu/mute.png differ diff --git a/Telegram/Resources/icons/menu/mute@2x.png b/Telegram/Resources/icons/menu/mute@2x.png index e3536c815c..935b2ece56 100644 Binary files a/Telegram/Resources/icons/menu/mute@2x.png and b/Telegram/Resources/icons/menu/mute@2x.png differ diff --git a/Telegram/Resources/icons/menu/mute@3x.png b/Telegram/Resources/icons/menu/mute@3x.png index 6be5c9a8c1..4762b83de4 100644 Binary files a/Telegram/Resources/icons/menu/mute@3x.png and b/Telegram/Resources/icons/menu/mute@3x.png differ diff --git a/Telegram/Resources/icons/menu/palette.png b/Telegram/Resources/icons/menu/palette.png new file mode 100644 index 0000000000..2ce5d44a1c Binary files /dev/null and b/Telegram/Resources/icons/menu/palette.png differ diff --git a/Telegram/Resources/icons/menu/palette@2x.png b/Telegram/Resources/icons/menu/palette@2x.png new file mode 100644 index 0000000000..b88969cf1d Binary files /dev/null and b/Telegram/Resources/icons/menu/palette@2x.png differ diff --git a/Telegram/Resources/icons/menu/palette@3x.png b/Telegram/Resources/icons/menu/palette@3x.png new file mode 100644 index 0000000000..444a7c9289 Binary files /dev/null and b/Telegram/Resources/icons/menu/palette@3x.png differ diff --git a/Telegram/Resources/icons/menu/permissions.png b/Telegram/Resources/icons/menu/permissions.png index 6c494262c9..ab4309f711 100644 Binary files a/Telegram/Resources/icons/menu/permissions.png and b/Telegram/Resources/icons/menu/permissions.png differ diff --git a/Telegram/Resources/icons/menu/permissions@2x.png b/Telegram/Resources/icons/menu/permissions@2x.png index b3f0f947e0..777467dba5 100644 Binary files a/Telegram/Resources/icons/menu/permissions@2x.png and b/Telegram/Resources/icons/menu/permissions@2x.png differ diff --git a/Telegram/Resources/icons/menu/permissions@3x.png b/Telegram/Resources/icons/menu/permissions@3x.png index 4b2aab4c66..ec4c420d48 100644 Binary files a/Telegram/Resources/icons/menu/permissions@3x.png and b/Telegram/Resources/icons/menu/permissions@3x.png differ diff --git a/Telegram/Resources/icons/menu/pin.png b/Telegram/Resources/icons/menu/pin.png index 5ee8aa6a0f..33d71245d8 100644 Binary files a/Telegram/Resources/icons/menu/pin.png and b/Telegram/Resources/icons/menu/pin.png differ diff --git a/Telegram/Resources/icons/menu/pin@2x.png b/Telegram/Resources/icons/menu/pin@2x.png index b80a0d8cd5..08c7978464 100644 Binary files a/Telegram/Resources/icons/menu/pin@2x.png and b/Telegram/Resources/icons/menu/pin@2x.png differ diff --git a/Telegram/Resources/icons/menu/pin@3x.png b/Telegram/Resources/icons/menu/pin@3x.png index 2f13abb0ae..3540c235c7 100644 Binary files a/Telegram/Resources/icons/menu/pin@3x.png and b/Telegram/Resources/icons/menu/pin@3x.png differ diff --git a/Telegram/Resources/icons/menu/profile.png b/Telegram/Resources/icons/menu/profile.png index 57a0b4f804..df63a62ba4 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 cf430bce28..c029da4efc 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 5a69267744..e7df675b18 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/qr_code.png b/Telegram/Resources/icons/menu/qr_code.png index 6cc94fd809..81a8a966b7 100644 Binary files a/Telegram/Resources/icons/menu/qr_code.png and b/Telegram/Resources/icons/menu/qr_code.png differ diff --git a/Telegram/Resources/icons/menu/qr_code@2x.png b/Telegram/Resources/icons/menu/qr_code@2x.png index 019f62ef00..7b872deed1 100644 Binary files a/Telegram/Resources/icons/menu/qr_code@2x.png and b/Telegram/Resources/icons/menu/qr_code@2x.png differ diff --git a/Telegram/Resources/icons/menu/qr_code@3x.png b/Telegram/Resources/icons/menu/qr_code@3x.png index 889b689a96..79254064d1 100644 Binary files a/Telegram/Resources/icons/menu/qr_code@3x.png and b/Telegram/Resources/icons/menu/qr_code@3x.png differ diff --git a/Telegram/Resources/icons/menu/read.png b/Telegram/Resources/icons/menu/read.png index 13decacf38..748dceb406 100644 Binary files a/Telegram/Resources/icons/menu/read.png and b/Telegram/Resources/icons/menu/read.png differ diff --git a/Telegram/Resources/icons/menu/read@2x.png b/Telegram/Resources/icons/menu/read@2x.png index 8dcbaab00b..aa2a81d5b6 100644 Binary files a/Telegram/Resources/icons/menu/read@2x.png and b/Telegram/Resources/icons/menu/read@2x.png differ diff --git a/Telegram/Resources/icons/menu/read@3x.png b/Telegram/Resources/icons/menu/read@3x.png index a5035f7353..bf5e2b7eac 100644 Binary files a/Telegram/Resources/icons/menu/read@3x.png and b/Telegram/Resources/icons/menu/read@3x.png differ diff --git a/Telegram/Resources/icons/menu/read_audio.png b/Telegram/Resources/icons/menu/read_audio.png index cc19a57215..d5c17e8eeb 100644 Binary files a/Telegram/Resources/icons/menu/read_audio.png and b/Telegram/Resources/icons/menu/read_audio.png differ diff --git a/Telegram/Resources/icons/menu/read_audio@2x.png b/Telegram/Resources/icons/menu/read_audio@2x.png index 5b3556a499..02cc1967dc 100644 Binary files a/Telegram/Resources/icons/menu/read_audio@2x.png and b/Telegram/Resources/icons/menu/read_audio@2x.png differ diff --git a/Telegram/Resources/icons/menu/read_audio@3x.png b/Telegram/Resources/icons/menu/read_audio@3x.png index 64ad08126a..3114aac3c7 100644 Binary files a/Telegram/Resources/icons/menu/read_audio@3x.png and b/Telegram/Resources/icons/menu/read_audio@3x.png differ diff --git a/Telegram/Resources/icons/menu/read_reactions.png b/Telegram/Resources/icons/menu/read_reactions.png index f3a3799357..b9a7185285 100644 Binary files a/Telegram/Resources/icons/menu/read_reactions.png and b/Telegram/Resources/icons/menu/read_reactions.png differ diff --git a/Telegram/Resources/icons/menu/read_reactions@2x.png b/Telegram/Resources/icons/menu/read_reactions@2x.png index dad48eb495..aeb806f0fb 100644 Binary files a/Telegram/Resources/icons/menu/read_reactions@2x.png and b/Telegram/Resources/icons/menu/read_reactions@2x.png differ diff --git a/Telegram/Resources/icons/menu/read_reactions@3x.png b/Telegram/Resources/icons/menu/read_reactions@3x.png index cf413852cf..e39e7e45a6 100644 Binary files a/Telegram/Resources/icons/menu/read_reactions@3x.png and b/Telegram/Resources/icons/menu/read_reactions@3x.png differ diff --git a/Telegram/Resources/icons/menu/read_ticks.png b/Telegram/Resources/icons/menu/read_ticks.png index 8eaab34cc6..69a7cf5c9d 100644 Binary files a/Telegram/Resources/icons/menu/read_ticks.png and b/Telegram/Resources/icons/menu/read_ticks.png differ diff --git a/Telegram/Resources/icons/menu/read_ticks@2x.png b/Telegram/Resources/icons/menu/read_ticks@2x.png index 8345e90094..477f34d429 100644 Binary files a/Telegram/Resources/icons/menu/read_ticks@2x.png and b/Telegram/Resources/icons/menu/read_ticks@2x.png differ diff --git a/Telegram/Resources/icons/menu/read_ticks@3x.png b/Telegram/Resources/icons/menu/read_ticks@3x.png index 7f64c04a7d..86c38f0c28 100644 Binary files a/Telegram/Resources/icons/menu/read_ticks@3x.png and b/Telegram/Resources/icons/menu/read_ticks@3x.png differ diff --git a/Telegram/Resources/icons/menu/reply.png b/Telegram/Resources/icons/menu/reply.png index d52ca37e99..6d14fe2f3e 100644 Binary files a/Telegram/Resources/icons/menu/reply.png and b/Telegram/Resources/icons/menu/reply.png differ diff --git a/Telegram/Resources/icons/menu/reply@2x.png b/Telegram/Resources/icons/menu/reply@2x.png index 9b323de23a..b0c2f125e6 100644 Binary files a/Telegram/Resources/icons/menu/reply@2x.png and b/Telegram/Resources/icons/menu/reply@2x.png differ diff --git a/Telegram/Resources/icons/menu/reply@3x.png b/Telegram/Resources/icons/menu/reply@3x.png index 9f83501bdc..4b006f2227 100644 Binary files a/Telegram/Resources/icons/menu/reply@3x.png and b/Telegram/Resources/icons/menu/reply@3x.png differ diff --git a/Telegram/Resources/icons/menu/report.png b/Telegram/Resources/icons/menu/report.png index aed0311c7e..f78d515340 100644 Binary files a/Telegram/Resources/icons/menu/report.png and b/Telegram/Resources/icons/menu/report.png differ diff --git a/Telegram/Resources/icons/menu/report@2x.png b/Telegram/Resources/icons/menu/report@2x.png index e6e8a7fad2..607e9eb2ca 100644 Binary files a/Telegram/Resources/icons/menu/report@2x.png and b/Telegram/Resources/icons/menu/report@2x.png differ diff --git a/Telegram/Resources/icons/menu/report@3x.png b/Telegram/Resources/icons/menu/report@3x.png index dcca897851..83a0229f52 100644 Binary files a/Telegram/Resources/icons/menu/report@3x.png and b/Telegram/Resources/icons/menu/report@3x.png differ diff --git a/Telegram/Resources/icons/menu/reschedule.png b/Telegram/Resources/icons/menu/reschedule.png index 0d04287389..52f25f4f10 100644 Binary files a/Telegram/Resources/icons/menu/reschedule.png and b/Telegram/Resources/icons/menu/reschedule.png differ diff --git a/Telegram/Resources/icons/menu/reschedule@2x.png b/Telegram/Resources/icons/menu/reschedule@2x.png index 5984b3582e..85464053a8 100644 Binary files a/Telegram/Resources/icons/menu/reschedule@2x.png and b/Telegram/Resources/icons/menu/reschedule@2x.png differ diff --git a/Telegram/Resources/icons/menu/reschedule@3x.png b/Telegram/Resources/icons/menu/reschedule@3x.png index 5129daadef..e64a3c4890 100644 Binary files a/Telegram/Resources/icons/menu/reschedule@3x.png and b/Telegram/Resources/icons/menu/reschedule@3x.png differ diff --git a/Telegram/Resources/icons/menu/restart_bot.png b/Telegram/Resources/icons/menu/restart_bot.png index 423e4c5c10..713b280236 100644 Binary files a/Telegram/Resources/icons/menu/restart_bot.png and b/Telegram/Resources/icons/menu/restart_bot.png differ diff --git a/Telegram/Resources/icons/menu/restart_bot@2x.png b/Telegram/Resources/icons/menu/restart_bot@2x.png index 02e5f8f0fc..4f35a7aa3a 100644 Binary files a/Telegram/Resources/icons/menu/restart_bot@2x.png and b/Telegram/Resources/icons/menu/restart_bot@2x.png differ diff --git a/Telegram/Resources/icons/menu/restart_bot@3x.png b/Telegram/Resources/icons/menu/restart_bot@3x.png index dc2a0e425f..3429d712e5 100644 Binary files a/Telegram/Resources/icons/menu/restart_bot@3x.png and b/Telegram/Resources/icons/menu/restart_bot@3x.png differ diff --git a/Telegram/Resources/icons/menu/restore.png b/Telegram/Resources/icons/menu/restore.png new file mode 100644 index 0000000000..77c5cada63 Binary files /dev/null and b/Telegram/Resources/icons/menu/restore.png differ diff --git a/Telegram/Resources/icons/menu/restore@2x.png b/Telegram/Resources/icons/menu/restore@2x.png new file mode 100644 index 0000000000..c375ba499e Binary files /dev/null and b/Telegram/Resources/icons/menu/restore@2x.png differ diff --git a/Telegram/Resources/icons/menu/restore@3x.png b/Telegram/Resources/icons/menu/restore@3x.png new file mode 100644 index 0000000000..5afae757e7 Binary files /dev/null and b/Telegram/Resources/icons/menu/restore@3x.png differ diff --git a/Telegram/Resources/icons/menu/retract_vote.png b/Telegram/Resources/icons/menu/retract_vote.png index 8093da38ce..ae18d51e91 100644 Binary files a/Telegram/Resources/icons/menu/retract_vote.png and b/Telegram/Resources/icons/menu/retract_vote.png differ diff --git a/Telegram/Resources/icons/menu/retract_vote@2x.png b/Telegram/Resources/icons/menu/retract_vote@2x.png index 2a52169773..20a18160be 100644 Binary files a/Telegram/Resources/icons/menu/retract_vote@2x.png and b/Telegram/Resources/icons/menu/retract_vote@2x.png differ diff --git a/Telegram/Resources/icons/menu/retract_vote@3x.png b/Telegram/Resources/icons/menu/retract_vote@3x.png index 7c2af35a2f..ee6da2efda 100644 Binary files a/Telegram/Resources/icons/menu/retract_vote@3x.png and b/Telegram/Resources/icons/menu/retract_vote@3x.png differ diff --git a/Telegram/Resources/icons/menu/save_image.png b/Telegram/Resources/icons/menu/save_image.png index 820e092500..51899e9948 100644 Binary files a/Telegram/Resources/icons/menu/save_image.png and b/Telegram/Resources/icons/menu/save_image.png differ diff --git a/Telegram/Resources/icons/menu/save_image@2x.png b/Telegram/Resources/icons/menu/save_image@2x.png index 44c66941fd..05d1dae5c8 100644 Binary files a/Telegram/Resources/icons/menu/save_image@2x.png and b/Telegram/Resources/icons/menu/save_image@2x.png differ diff --git a/Telegram/Resources/icons/menu/save_image@3x.png b/Telegram/Resources/icons/menu/save_image@3x.png index b8b7225cd0..1464a3d673 100644 Binary files a/Telegram/Resources/icons/menu/save_image@3x.png and b/Telegram/Resources/icons/menu/save_image@3x.png differ diff --git a/Telegram/Resources/icons/menu/search.png b/Telegram/Resources/icons/menu/search.png index 8dedda843d..3305275604 100644 Binary files a/Telegram/Resources/icons/menu/search.png and b/Telegram/Resources/icons/menu/search.png differ diff --git a/Telegram/Resources/icons/menu/search@2x.png b/Telegram/Resources/icons/menu/search@2x.png index 45596db870..f01073322a 100644 Binary files a/Telegram/Resources/icons/menu/search@2x.png and b/Telegram/Resources/icons/menu/search@2x.png differ diff --git a/Telegram/Resources/icons/menu/search@3x.png b/Telegram/Resources/icons/menu/search@3x.png index fef63044e7..197f7a24cf 100644 Binary files a/Telegram/Resources/icons/menu/search@3x.png and b/Telegram/Resources/icons/menu/search@3x.png differ diff --git a/Telegram/Resources/icons/menu/select.png b/Telegram/Resources/icons/menu/select.png index cac996d72d..b67513cf58 100644 Binary files a/Telegram/Resources/icons/menu/select.png and b/Telegram/Resources/icons/menu/select.png differ diff --git a/Telegram/Resources/icons/menu/select@2x.png b/Telegram/Resources/icons/menu/select@2x.png index 67ff85b45a..901bf9e493 100644 Binary files a/Telegram/Resources/icons/menu/select@2x.png and b/Telegram/Resources/icons/menu/select@2x.png differ diff --git a/Telegram/Resources/icons/menu/select@3x.png b/Telegram/Resources/icons/menu/select@3x.png index 6974a22fc7..fad75def01 100644 Binary files a/Telegram/Resources/icons/menu/select@3x.png and b/Telegram/Resources/icons/menu/select@3x.png differ diff --git a/Telegram/Resources/icons/menu/send.png b/Telegram/Resources/icons/menu/send.png index 3050ae4ced..3daa1f2d8b 100644 Binary files a/Telegram/Resources/icons/menu/send.png and b/Telegram/Resources/icons/menu/send.png differ diff --git a/Telegram/Resources/icons/menu/send@2x.png b/Telegram/Resources/icons/menu/send@2x.png index 4edf9a6cb8..3c7fb08291 100644 Binary files a/Telegram/Resources/icons/menu/send@2x.png and b/Telegram/Resources/icons/menu/send@2x.png differ diff --git a/Telegram/Resources/icons/menu/send@3x.png b/Telegram/Resources/icons/menu/send@3x.png index eba0a1228a..3cf5d4a3e9 100644 Binary files a/Telegram/Resources/icons/menu/send@3x.png and b/Telegram/Resources/icons/menu/send@3x.png differ diff --git a/Telegram/Resources/icons/menu/send_when_online.png b/Telegram/Resources/icons/menu/send_when_online.png new file mode 100644 index 0000000000..c351562ebf Binary files /dev/null and b/Telegram/Resources/icons/menu/send_when_online.png differ diff --git a/Telegram/Resources/icons/menu/send_when_online@2x.png b/Telegram/Resources/icons/menu/send_when_online@2x.png new file mode 100644 index 0000000000..9099425f74 Binary files /dev/null and b/Telegram/Resources/icons/menu/send_when_online@2x.png differ diff --git a/Telegram/Resources/icons/menu/send_when_online@3x.png b/Telegram/Resources/icons/menu/send_when_online@3x.png new file mode 100644 index 0000000000..57be0db3dd Binary files /dev/null and b/Telegram/Resources/icons/menu/send_when_online@3x.png differ diff --git a/Telegram/Resources/icons/menu/settings.png b/Telegram/Resources/icons/menu/settings.png new file mode 100644 index 0000000000..9b7ba02b35 Binary files /dev/null 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 new file mode 100644 index 0000000000..79cd023acb Binary files /dev/null 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 new file mode 100644 index 0000000000..df16568339 Binary files /dev/null and b/Telegram/Resources/icons/menu/settings@3x.png differ diff --git a/Telegram/Resources/icons/menu/share.png b/Telegram/Resources/icons/menu/share.png index 43caf9bb1d..0083d3ce95 100644 Binary files a/Telegram/Resources/icons/menu/share.png and b/Telegram/Resources/icons/menu/share.png differ diff --git a/Telegram/Resources/icons/menu/share2.png b/Telegram/Resources/icons/menu/share2.png new file mode 100644 index 0000000000..cc8d32ac2d Binary files /dev/null and b/Telegram/Resources/icons/menu/share2.png differ diff --git a/Telegram/Resources/icons/menu/share2@2x.png b/Telegram/Resources/icons/menu/share2@2x.png new file mode 100644 index 0000000000..5b5fe00693 Binary files /dev/null and b/Telegram/Resources/icons/menu/share2@2x.png differ diff --git a/Telegram/Resources/icons/menu/share2@3x.png b/Telegram/Resources/icons/menu/share2@3x.png new file mode 100644 index 0000000000..450f17fdb6 Binary files /dev/null and b/Telegram/Resources/icons/menu/share2@3x.png differ diff --git a/Telegram/Resources/icons/menu/share@2x.png b/Telegram/Resources/icons/menu/share@2x.png index e68b22e440..71fd45bc8b 100644 Binary files a/Telegram/Resources/icons/menu/share@2x.png and b/Telegram/Resources/icons/menu/share@2x.png differ diff --git a/Telegram/Resources/icons/menu/share@3x.png b/Telegram/Resources/icons/menu/share@3x.png index 9877617803..9f2dadbbd8 100644 Binary files a/Telegram/Resources/icons/menu/share@3x.png and b/Telegram/Resources/icons/menu/share@3x.png differ diff --git a/Telegram/Resources/icons/menu/show_in_chat.png b/Telegram/Resources/icons/menu/show_in_chat.png index 6e61bf0ae7..e9e7c0b1bb 100644 Binary files a/Telegram/Resources/icons/menu/show_in_chat.png and b/Telegram/Resources/icons/menu/show_in_chat.png differ diff --git a/Telegram/Resources/icons/menu/show_in_chat@2x.png b/Telegram/Resources/icons/menu/show_in_chat@2x.png index a4c4bfa6ce..a69a81931c 100644 Binary files a/Telegram/Resources/icons/menu/show_in_chat@2x.png and b/Telegram/Resources/icons/menu/show_in_chat@2x.png differ diff --git a/Telegram/Resources/icons/menu/show_in_chat@3x.png b/Telegram/Resources/icons/menu/show_in_chat@3x.png index 04dac196be..3e363244c1 100644 Binary files a/Telegram/Resources/icons/menu/show_in_chat@3x.png and b/Telegram/Resources/icons/menu/show_in_chat@3x.png differ diff --git a/Telegram/Resources/icons/menu/show_in_folder.png b/Telegram/Resources/icons/menu/show_in_folder.png index df4875536a..c10ca4ac10 100644 Binary files a/Telegram/Resources/icons/menu/show_in_folder.png and b/Telegram/Resources/icons/menu/show_in_folder.png differ diff --git a/Telegram/Resources/icons/menu/show_in_folder@2x.png b/Telegram/Resources/icons/menu/show_in_folder@2x.png index c1a08be71e..0ff5f823cd 100644 Binary files a/Telegram/Resources/icons/menu/show_in_folder@2x.png and b/Telegram/Resources/icons/menu/show_in_folder@2x.png differ diff --git a/Telegram/Resources/icons/menu/show_in_folder@3x.png b/Telegram/Resources/icons/menu/show_in_folder@3x.png index c957b70d8b..fd4c347100 100644 Binary files a/Telegram/Resources/icons/menu/show_in_folder@3x.png and b/Telegram/Resources/icons/menu/show_in_folder@3x.png differ diff --git a/Telegram/Resources/icons/menu/stickers.png b/Telegram/Resources/icons/menu/stickers.png index 13e31e39b1..cd5982410b 100644 Binary files a/Telegram/Resources/icons/menu/stickers.png and b/Telegram/Resources/icons/menu/stickers.png differ diff --git a/Telegram/Resources/icons/menu/stickers@2x.png b/Telegram/Resources/icons/menu/stickers@2x.png index 22e686cd6c..58b4c68fa6 100644 Binary files a/Telegram/Resources/icons/menu/stickers@2x.png and b/Telegram/Resources/icons/menu/stickers@2x.png differ diff --git a/Telegram/Resources/icons/menu/stickers@3x.png b/Telegram/Resources/icons/menu/stickers@3x.png index ef62842ae3..b2ee00182b 100644 Binary files a/Telegram/Resources/icons/menu/stickers@3x.png and b/Telegram/Resources/icons/menu/stickers@3x.png differ diff --git a/Telegram/Resources/icons/menu/stop_poll.png b/Telegram/Resources/icons/menu/stop_poll.png index 4aa6c7041b..fefc3b20d8 100644 Binary files a/Telegram/Resources/icons/menu/stop_poll.png and b/Telegram/Resources/icons/menu/stop_poll.png differ diff --git a/Telegram/Resources/icons/menu/stop_poll@2x.png b/Telegram/Resources/icons/menu/stop_poll@2x.png index 2c4360511c..36844744e1 100644 Binary files a/Telegram/Resources/icons/menu/stop_poll@2x.png and b/Telegram/Resources/icons/menu/stop_poll@2x.png differ diff --git a/Telegram/Resources/icons/menu/stop_poll@3x.png b/Telegram/Resources/icons/menu/stop_poll@3x.png index ef509132bf..e776e66ad8 100644 Binary files a/Telegram/Resources/icons/menu/stop_poll@3x.png and b/Telegram/Resources/icons/menu/stop_poll@3x.png differ diff --git a/Telegram/Resources/icons/menu/unarchive.png b/Telegram/Resources/icons/menu/unarchive.png index f0d1a068a6..358c6f38d1 100644 Binary files a/Telegram/Resources/icons/menu/unarchive.png and b/Telegram/Resources/icons/menu/unarchive.png differ diff --git a/Telegram/Resources/icons/menu/unarchive@2x.png b/Telegram/Resources/icons/menu/unarchive@2x.png index f7f13290bf..807a027da9 100644 Binary files a/Telegram/Resources/icons/menu/unarchive@2x.png and b/Telegram/Resources/icons/menu/unarchive@2x.png differ diff --git a/Telegram/Resources/icons/menu/unarchive@3x.png b/Telegram/Resources/icons/menu/unarchive@3x.png index 02e8a3ca73..95e772123d 100644 Binary files a/Telegram/Resources/icons/menu/unarchive@3x.png and b/Telegram/Resources/icons/menu/unarchive@3x.png differ diff --git a/Telegram/Resources/icons/menu/unblock.png b/Telegram/Resources/icons/menu/unblock.png index 62966c2b74..9c204d83d8 100644 Binary files a/Telegram/Resources/icons/menu/unblock.png and b/Telegram/Resources/icons/menu/unblock.png differ diff --git a/Telegram/Resources/icons/menu/unblock@2x.png b/Telegram/Resources/icons/menu/unblock@2x.png index d40eb59444..3908aaedb2 100644 Binary files a/Telegram/Resources/icons/menu/unblock@2x.png and b/Telegram/Resources/icons/menu/unblock@2x.png differ diff --git a/Telegram/Resources/icons/menu/unblock@3x.png b/Telegram/Resources/icons/menu/unblock@3x.png index 22730b7f5e..8307f541ee 100644 Binary files a/Telegram/Resources/icons/menu/unblock@3x.png and b/Telegram/Resources/icons/menu/unblock@3x.png differ diff --git a/Telegram/Resources/icons/menu/unfavorite.png b/Telegram/Resources/icons/menu/unfavorite.png index 8286346ac8..dbad8a1547 100644 Binary files a/Telegram/Resources/icons/menu/unfavorite.png and b/Telegram/Resources/icons/menu/unfavorite.png differ diff --git a/Telegram/Resources/icons/menu/unfavorite@2x.png b/Telegram/Resources/icons/menu/unfavorite@2x.png index 1f852b1667..976f451354 100644 Binary files a/Telegram/Resources/icons/menu/unfavorite@2x.png and b/Telegram/Resources/icons/menu/unfavorite@2x.png differ diff --git a/Telegram/Resources/icons/menu/unfavorite@3x.png b/Telegram/Resources/icons/menu/unfavorite@3x.png index 0fbc2a0f5c..65642ed701 100644 Binary files a/Telegram/Resources/icons/menu/unfavorite@3x.png and b/Telegram/Resources/icons/menu/unfavorite@3x.png differ diff --git a/Telegram/Resources/icons/menu/unmute.png b/Telegram/Resources/icons/menu/unmute.png index 297348e08d..c6aa5c4cb0 100644 Binary files a/Telegram/Resources/icons/menu/unmute.png and b/Telegram/Resources/icons/menu/unmute.png differ diff --git a/Telegram/Resources/icons/menu/unmute@2x.png b/Telegram/Resources/icons/menu/unmute@2x.png index 405fc61a4f..b274b61ee9 100644 Binary files a/Telegram/Resources/icons/menu/unmute@2x.png and b/Telegram/Resources/icons/menu/unmute@2x.png differ diff --git a/Telegram/Resources/icons/menu/unmute@3x.png b/Telegram/Resources/icons/menu/unmute@3x.png index 50ddff29a1..5808a55945 100644 Binary files a/Telegram/Resources/icons/menu/unmute@3x.png and b/Telegram/Resources/icons/menu/unmute@3x.png differ diff --git a/Telegram/Resources/icons/menu/unpin.png b/Telegram/Resources/icons/menu/unpin.png index d6c21f81e0..9c62c0c332 100644 Binary files a/Telegram/Resources/icons/menu/unpin.png and b/Telegram/Resources/icons/menu/unpin.png differ diff --git a/Telegram/Resources/icons/menu/unpin@2x.png b/Telegram/Resources/icons/menu/unpin@2x.png index 89a0aead5b..37c34e80b7 100644 Binary files a/Telegram/Resources/icons/menu/unpin@2x.png and b/Telegram/Resources/icons/menu/unpin@2x.png differ diff --git a/Telegram/Resources/icons/menu/unpin@3x.png b/Telegram/Resources/icons/menu/unpin@3x.png index 8393d38a8a..0151d858d4 100644 Binary files a/Telegram/Resources/icons/menu/unpin@3x.png and b/Telegram/Resources/icons/menu/unpin@3x.png differ diff --git a/Telegram/Resources/icons/menu/unread.png b/Telegram/Resources/icons/menu/unread.png index 6b60c4f560..0e83965882 100644 Binary files a/Telegram/Resources/icons/menu/unread.png and b/Telegram/Resources/icons/menu/unread.png differ diff --git a/Telegram/Resources/icons/menu/unread@2x.png b/Telegram/Resources/icons/menu/unread@2x.png index af93310564..b452b9e744 100644 Binary files a/Telegram/Resources/icons/menu/unread@2x.png and b/Telegram/Resources/icons/menu/unread@2x.png differ diff --git a/Telegram/Resources/icons/menu/unread@3x.png b/Telegram/Resources/icons/menu/unread@3x.png index 220ce7598b..d8571a7c9b 100644 Binary files a/Telegram/Resources/icons/menu/unread@3x.png and b/Telegram/Resources/icons/menu/unread@3x.png differ diff --git a/Telegram/Resources/icons/menu/view_replies.png b/Telegram/Resources/icons/menu/view_replies.png index 0c119764fb..2f57201cc9 100644 Binary files a/Telegram/Resources/icons/menu/view_replies.png and b/Telegram/Resources/icons/menu/view_replies.png differ diff --git a/Telegram/Resources/icons/menu/view_replies@2x.png b/Telegram/Resources/icons/menu/view_replies@2x.png index cc358365a0..4121c8a13c 100644 Binary files a/Telegram/Resources/icons/menu/view_replies@2x.png and b/Telegram/Resources/icons/menu/view_replies@2x.png differ diff --git a/Telegram/Resources/icons/menu/view_replies@3x.png b/Telegram/Resources/icons/menu/view_replies@3x.png index b261bca6c1..8055156bd7 100644 Binary files a/Telegram/Resources/icons/menu/view_replies@3x.png and b/Telegram/Resources/icons/menu/view_replies@3x.png differ diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp index daf5d0f1a5..0ca7114891 100644 --- a/Telegram/SourceFiles/boxes/connection_box.cpp +++ b/Telegram/SourceFiles/boxes/connection_box.cpp @@ -535,7 +535,7 @@ void ProxyRow::showMenu() { if (_view.deleted) { addAction(tr::lng_proxy_menu_restore(tr::now), [=] { _restoreClicks.fire({}); - }, &st::menuIconDelete); + }, &st::menuIconRestore); } else { addAction(tr::lng_proxy_menu_delete(tr::now), [=] { _deleteClicks.fire({}); diff --git a/Telegram/SourceFiles/boxes/language_box.cpp b/Telegram/SourceFiles/boxes/language_box.cpp index 94635ebf81..110787f3b3 100644 --- a/Telegram/SourceFiles/boxes/language_box.cpp +++ b/Telegram/SourceFiles/boxes/language_box.cpp @@ -477,7 +477,7 @@ void Rows::showMenu(int index) { if (row->removed) { addAction(tr::lng_proxy_menu_restore(tr::now), [=] { restore(row); - }, &st::menuIconDelete); + }, &st::menuIconRestore); } else { addAction(tr::lng_proxy_menu_delete(tr::now), [=] { remove(row); diff --git a/Telegram/SourceFiles/editor/scene/scene_item_base.cpp b/Telegram/SourceFiles/editor/scene/scene_item_base.cpp index 0e7484ea51..f4c7d5df01 100644 --- a/Telegram/SourceFiles/editor/scene/scene_item_base.cpp +++ b/Telegram/SourceFiles/editor/scene/scene_item_base.cpp @@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_keys.h" #include "ui/widgets/popup_menu.h" #include "styles/style_editor.h" +#include "styles/style_menu_icons.h" #include #include @@ -195,26 +196,35 @@ void ItemBase::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { const auto add = [&]( auto base, const QKeySequence &sequence, - Fn callback) { + Fn callback, + const style::icon *icon) { // TODO: refactor. const auto sequenceText = QChar('\t') + sequence.toString(QKeySequence::NativeText); - _menu->addAction(base(tr::now) + sequenceText, std::move(callback)); + _menu->addAction( + base(tr::now) + sequenceText, + std::move(callback), + icon); }; - _menu = base::make_unique_q(nullptr); + _menu = base::make_unique_q( + nullptr, + st::popupMenuWithIcons); add( tr::lng_photo_editor_menu_delete, kDeleteSequence, - [=] { actionDelete(); }); + [=] { actionDelete(); }, + &st::menuIconDelete); add( tr::lng_photo_editor_menu_flip, kFlipSequence, - [=] { actionFlip(); }); + [=] { actionFlip(); }, + &st::menuIconFlip); add( tr::lng_photo_editor_menu_duplicate, kDuplicateSequence, - [=] { actionDuplicate(); }); + [=] { actionDuplicate(); }, + &st::menuIconCopy); _menu->popup(event->screenPos()); } diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp index b2f690d1fe..d53b4f5f3c 100644 --- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp +++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp @@ -553,7 +553,7 @@ bool AddRescheduleAction( box->closeBox(); } }, box->lifetime()); - }, &st::menuIconSchedule); + }, &st::menuIconReschedule); return true; } diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp index 9c510efdae..30a328de0a 100644 --- a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp +++ b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp @@ -42,7 +42,7 @@ void FillSendUntilOnlineMenu( (*menu)->addAction( tr::lng_scheduled_send_until_online(tr::now), std::move(callback), - &st::menuIconSend); + &st::menuIconWhenOnline); (*menu)->popup(QCursor::pos()); return true; }); diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style index 9409e3cf92..672903080d 100644 --- a/Telegram/SourceFiles/media/view/media_view.style +++ b/Telegram/SourceFiles/media/view/media_view.style @@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL using "ui/basic.style"; using "ui/widgets/widgets.style"; +using "ui/menu_icons.style"; mediaviewOverDuration: 150; @@ -137,7 +138,7 @@ mediaviewFileIconSize: 80px; mediaviewFileLink: defaultLinkButton; -mediaviewMenu: Menu(defaultMenu) { +mediaviewMenu: Menu(menuWithIcons) { itemBg: mediaviewMenuBg; itemBgOver: mediaviewMenuBgOver; itemFg: mediaviewMenuFg; diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index 8c1fb901d4..21fb4d6906 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -63,6 +63,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/random.h" #include "base/unixtime.h" #include "base/qt_signal_producer.h" +#include "base/qt_adapters.h" #include "base/event_filter.h" #include "main/main_account.h" #include "main/main_domain.h" // Domain::activeSessionValue. @@ -75,7 +76,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "facades.h" #include "styles/style_media_view.h" #include "styles/style_chat.h" -#include "base/qt_adapters.h" +#include "styles/style_menu_icons.h" #ifdef Q_OS_MAC #include "platform/mac/touchbar/mac_touchbar_media_view.h" @@ -901,30 +902,46 @@ void OverlayWidget::refreshCaptionGeometry() { void OverlayWidget::fillContextMenuActions(const MenuCallback &addAction) { if (_document && _document->loading()) { - addAction(tr::lng_cancel(tr::now), [=] { saveCancel(); }); + addAction( + tr::lng_cancel(tr::now), + [=] { saveCancel(); }, + &st::mediaMenuIconCancel); } if (_message && _message->isRegular()) { - addAction(tr::lng_context_to_msg(tr::now), [=] { toMessage(); }); + addAction( + tr::lng_context_to_msg(tr::now), + [=] { toMessage(); }, + &st::mediaMenuIconShowInChat); } if (_document && !_document->filepath(true).isEmpty()) { const auto text = Platform::IsMac() ? tr::lng_context_show_in_finder(tr::now) : tr::lng_context_show_in_folder(tr::now); - addAction(text, [=] { showInFolder(); }); + addAction( + text, + [=] { showInFolder(); }, + &st::mediaMenuIconShowInFolder); } if (!hasCopyRestriction()) { if ((_document && documentContentShown()) || (_photo && _photoMedia->loaded())) { - addAction(tr::lng_mediaview_copy(tr::now), [=] { copyMedia(); }); + addAction( + tr::lng_mediaview_copy(tr::now), + [=] { copyMedia(); }, + &st::mediaMenuIconCopy); } } if ((_photo && _photo->hasAttachedStickers()) || (_document && _document->hasAttachedStickers())) { addAction( tr::lng_context_attached_stickers(tr::now), - [=] { showAttachedStickers(); }); + [=] { showAttachedStickers(); }, + &st::mediaMenuIconStickers); } if (_message && _message->allowsForward()) { - addAction(tr::lng_mediaview_forward(tr::now), [=] { forwardMedia(); }); + addAction( + tr::lng_mediaview_forward(tr::now), + [=] { forwardMedia(); }, + &st::mediaMenuIconForward); } const auto canDelete = [&] { if (_message && _message->canDelete()) { @@ -944,17 +961,26 @@ void OverlayWidget::fillContextMenuActions(const MenuCallback &addAction) { return false; }(); if (canDelete) { - addAction(tr::lng_mediaview_delete(tr::now), [=] { deleteMedia(); }); + addAction( + tr::lng_mediaview_delete(tr::now), + [=] { deleteMedia(); }, + &st::mediaMenuIconDelete); } if (!hasCopyRestriction()) { - addAction(tr::lng_mediaview_save_as(tr::now), [=] { saveAs(); }); + addAction( + tr::lng_mediaview_save_as(tr::now), + [=] { saveAs(); }, + &st::mediaMenuIconDownload); } if (const auto overviewType = computeOverviewType()) { const auto text = _document ? tr::lng_mediaview_files_all(tr::now) : tr::lng_mediaview_photos_all(tr::now); - addAction(text, [=] { showMediaOverview(); }); + addAction( + text, + [=] { showMediaOverview(); }, + &st::mediaMenuIconShowAll); } } @@ -4419,8 +4445,11 @@ bool OverlayWidget::handleContextMenu(std::optional position) { _menu = base::make_unique_q( _widget, st::mediaviewPopupMenu); - fillContextMenuActions([&] (const QString &text, Fn handler) { - _menu->addAction(text, std::move(handler)); + fillContextMenuActions([&]( + const QString &text, + Fn handler, + const style::icon *icon) { + _menu->addAction(text, std::move(handler), icon); }); _menu->setDestroyedCallback(crl::guard(_widget, [=] { activateControls(); @@ -4666,8 +4695,11 @@ void OverlayWidget::receiveMouse() { void OverlayWidget::showDropdown() { _dropdown->clearActions(); - fillContextMenuActions([&] (const QString &text, Fn handler) { - _dropdown->addAction(text, std::move(handler)); + fillContextMenuActions([&]( + const QString &text, + Fn handler, + const style::icon *icon) { + _dropdown->addAction(text, std::move(handler), icon); }); _dropdown->moveToRight(0, height() - _dropdown->height()); _dropdown->showAnimated(Ui::PanelAnimation::Origin::BottomRight); diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h index d6d779ebc6..40f6edbb6d 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h @@ -274,7 +274,10 @@ private: void updateControls(); void updateControlsGeometry(); - using MenuCallback = Fn)>; + using MenuCallback = Fn, + const style::icon *)>; void fillContextMenuActions(const MenuCallback &addAction); void resizeCenteredControls(); diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style index 320acaaecd..0ad6913781 100644 --- a/Telegram/SourceFiles/ui/chat/chat.style +++ b/Telegram/SourceFiles/ui/chat/chat.style @@ -905,22 +905,22 @@ defaultWhoRead: WhoRead { photoSize: 30px; photoSkip: 5px; nameLeft: 57px; - iconPosition: point(22px, 11px); - itemPadding: margins(61px, 9px, 17px, 7px); + iconPosition: point(10px, 7px); + itemPadding: margins(41px, 9px, 17px, 7px); } whoReadMenu: PopupMenu(popupMenuWithIcons) { scrollPadding: margins(0px, 6px, 0px, 6px); maxHeight: 387px; menu: Menu(menuWithIcons) { - separatorPadding: margins(0px, 6px, 0px, 8px); + separatorPadding: margins(0px, 6px, 0px, 5px); } } -whoReadChecks: icon{{ "chat/seen_checks", windowFg }}; -whoReadChecksOver: icon{{ "chat/seen_checks", windowFgOver }}; -whoReadChecksDisabled: icon{{ "chat/seen_checks", menuFgDisabled }}; -whoReadPlayed: icon{{ "chat/seen_played", windowFg }}; -whoReadPlayedOver: icon{{ "chat/seen_played", windowFgOver }}; -whoReadPlayedDisabled: icon {{ "chat/seen_played", menuFgDisabled }}; +whoReadChecks: icon{{ "menu/read_ticks", menuSubmenuArrowFg }}; +whoReadChecksOver: icon{{ "menu/read_ticks", menuSubmenuArrowFg }}; +whoReadChecksDisabled: icon{{ "menu/read_ticks", menuFgDisabled }}; +whoReadPlayed: icon{{ "menu/read_audio", menuSubmenuArrowFg }}; +whoReadPlayedOver: icon{{ "menu/read_audio", menuSubmenuArrowFg }}; +whoReadPlayedDisabled: icon {{ "menu/read_audio", menuFgDisabled }}; historyRequestsUserpics: GroupCallUserpics { size: 22px; diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style index 6e34d9617b..3a9e815527 100644 --- a/Telegram/SourceFiles/ui/menu_icons.style +++ b/Telegram/SourceFiles/ui/menu_icons.style @@ -9,8 +9,8 @@ using "ui/colors.palette"; using "ui/widgets/widgets.style"; menuWithIcons: Menu(defaultMenu) { - itemIconPosition: point(20px, 7px); - itemPadding: margins(61px, 9px, 17px, 9px); + itemIconPosition: point(15px, 5px); + itemPadding: margins(56px, 8px, 17px, 8px); } popupMenuWithIcons: PopupMenu(defaultPopupMenu) { scrollPadding: margins(0px, 5px, 0px, 5px); @@ -76,6 +76,23 @@ menuIconFromMainMenu: icon {{ "menu/move_from_menu", menuSubmenuArrowFg }}; menuIconAddAccount: icon {{ "menu/add_account", menuSubmenuArrowFg }}; menuIconMute: icon {{ "menu/mute", menuSubmenuArrowFg }}; menuIconUnmute: icon {{ "menu/unmute", menuSubmenuArrowFg }}; -menuIconSchedule: icon {{ "menu/reschedule", menuSubmenuArrowFg }}; +menuIconSchedule: icon {{ "menu/calendar", menuSubmenuArrowFg }}; +menuIconReschedule: icon {{ "menu/reschedule", menuSubmenuArrowFg }}; menuIconSend: icon {{ "menu/send", menuSubmenuArrowFg }}; -//menuIcon: icon {{ "menu/", menuSubmenuArrowFg }}; +menuIconFlip: icon {{ "menu/flip", menuSubmenuArrowFg }}; +menuIconWhenOnline: icon {{ "menu/send_when_online", menuSubmenuArrowFg }}; +menuIconPalette: icon {{ "menu/palette", menuSubmenuArrowFg }}; +menuIconImportTheme: icon {{ "menu/import_theme", menuSubmenuArrowFg }}; +menuIconExportTheme: icon {{ "menu/export_theme", menuSubmenuArrowFg }}; +menuIconRestore: icon {{ "menu/restore", menuSubmenuArrowFg }}; +menuIconSettings: icon {{ "menu/settings", menuSubmenuArrowFg }}; + +mediaMenuIconStickers: icon {{ "menu/stickers", mediaviewMenuFg }}; +mediaMenuIconCancel: icon {{ "menu/cancel", mediaviewMenuFg }}; +mediaMenuIconShowInChat: icon {{ "menu/show_in_chat", mediaviewMenuFg }}; +mediaMenuIconShowInFolder: icon {{ "menu/show_in_folder", mediaviewMenuFg }}; +mediaMenuIconDownload: icon {{ "menu/download", mediaviewMenuFg }}; +mediaMenuIconCopy: icon {{ "menu/copy", mediaviewMenuFg }}; +mediaMenuIconForward: icon {{ "menu/forward", mediaviewMenuFg }}; +mediaMenuIconDelete: icon {{ "menu/delete", mediaviewMenuFg }}; +mediaMenuIconShowAll: icon {{ "menu/all_media", mediaviewMenuFg }}; diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp index 4531035a6a..a200022a19 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp @@ -37,6 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_dialogs.h" #include "styles/style_layers.h" #include "styles/style_boxes.h" +#include "styles/style_menu_icons.h" namespace Window { namespace Theme { @@ -703,7 +704,9 @@ void Editor::showMenu() { if (_menu) { return; } - _menu = base::make_unique_q(this); + _menu = base::make_unique_q( + this, + st::dropdownMenuWithIcons); _menu->setHiddenCallback([weak = Ui::MakeWeak(this), menu = _menu.get()]{ menu->deleteLater(); if (weak && weak->_menu == menu) { @@ -727,15 +730,15 @@ void Editor::showMenu() { base::call_delayed(st::defaultRippleAnimation.hideDuration, this, [=] { exportTheme(); }); - }); + }, &st::menuIconExportTheme); _menu->addAction(tr::lng_theme_editor_menu_import(tr::now), [=] { base::call_delayed(st::defaultRippleAnimation.hideDuration, this, [=] { importTheme(); }); - }); + }, &st::menuIconImportTheme); _menu->addAction(tr::lng_theme_editor_menu_show(tr::now), [=] { File::ShowInFolder(EditingPalettePath()); - }); + }, &st::menuIconPalette); _menu->moveToRight(st::themesMenuPosition.x(), st::themesMenuPosition.y()); _menu->showAnimated(Ui::PanelAnimation::Origin::TopRight); } diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp index 16c6d43568..457889ffcc 100644 --- a/Telegram/SourceFiles/window/window_main_menu.cpp +++ b/Telegram/SourceFiles/window/window_main_menu.cpp @@ -113,7 +113,9 @@ void ShowCallsBox(not_null window) { const auto menu = std::make_shared(); const auto menuButton = box->addTopButton(st::infoTopBarMenu); menuButton->setClickedCallback([=] { - *menu = base::make_unique_q(menuButton); + *menu = base::make_unique_q( + menuButton, + st::popupMenuWithIcons); const auto showSettings = [=] { window->showSettings( Settings::Type::Calls, @@ -124,11 +126,13 @@ void ShowCallsBox(not_null window) { }); (*menu)->addAction( tr::lng_settings_section_call_settings(tr::now), - showSettings); + showSettings, + &st::menuIconSettings); if (controller->delegate()->peerListFullRowsCount() > 0) { (*menu)->addAction( tr::lng_call_box_clear_all(tr::now), - clearAll); + clearAll, + &st::menuIconDelete); } (*menu)->popup(QCursor::pos()); return true; diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index 6543a214ca..e5985d1498 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -346,7 +346,7 @@ void Filler::addTogglePin() { pinToggle, (history->isPinnedDialog(filterId) ? &st::menuIconUnpin - : &st::menuIconPin)); // #TODO icons dynamic + : &st::menuIconPin)); auto actionText = history->session().changes().historyUpdates( history, @@ -395,7 +395,7 @@ void Filler::addToggleUnreadMark() { } }, (IsUnreadHistory(history) ? &st::menuIconMarkRead - : &st::menuIconMarkUnread)); // #TODO icons dynamic + : &st::menuIconMarkUnread)); auto actionText = history->session().changes().historyUpdates( history, @@ -420,7 +420,7 @@ void Filler::addToggleArchive() { }; const auto archiveAction = _addAction( label(), - toggle, // #TODO icons dynamic + toggle, isArchived() ? &st::menuIconUnarchive : &st::menuIconArchive); auto actionText = history->session().changes().historyUpdates( @@ -453,7 +453,7 @@ void Filler::addBlockUser(not_null user) { user, v::null, v::null)); - } // #TODO icons dynamic + } }, (!user->isBlocked() ? &st::menuIconBlock : user->isBot() @@ -1255,7 +1255,7 @@ void PeerMenuAddMuteAction( } }, (peer->owner().notifyIsMuted(peer) ? &st::menuIconUnmute - : &st::menuIconMute)); // #TODO icons dynamic + : &st::menuIconMute)); auto actionText = Info::Profile::NotificationsEnabledValue( peer