diff --git a/Telegram/Resources/icons/menu/photo_set.png b/Telegram/Resources/icons/menu/photo_set.png
new file mode 100644
index 000000000..d96cdb0ec
Binary files /dev/null and b/Telegram/Resources/icons/menu/photo_set.png differ
diff --git a/Telegram/Resources/icons/menu/photo_set@2x.png b/Telegram/Resources/icons/menu/photo_set@2x.png
new file mode 100644
index 000000000..dd6989d16
Binary files /dev/null and b/Telegram/Resources/icons/menu/photo_set@2x.png differ
diff --git a/Telegram/Resources/icons/menu/photo_set@3x.png b/Telegram/Resources/icons/menu/photo_set@3x.png
new file mode 100644
index 000000000..46dd9aa59
Binary files /dev/null and b/Telegram/Resources/icons/menu/photo_set@3x.png differ
diff --git a/Telegram/Resources/icons/menu/photo_suggest.png b/Telegram/Resources/icons/menu/photo_suggest.png
new file mode 100644
index 000000000..a62bbd802
Binary files /dev/null and b/Telegram/Resources/icons/menu/photo_suggest.png differ
diff --git a/Telegram/Resources/icons/menu/photo_suggest@2x.png b/Telegram/Resources/icons/menu/photo_suggest@2x.png
new file mode 100644
index 000000000..e18e19cc0
Binary files /dev/null and b/Telegram/Resources/icons/menu/photo_suggest@2x.png differ
diff --git a/Telegram/Resources/icons/menu/photo_suggest@3x.png b/Telegram/Resources/icons/menu/photo_suggest@3x.png
new file mode 100644
index 000000000..3fed79585
Binary files /dev/null and b/Telegram/Resources/icons/menu/photo_suggest@3x.png differ
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 373f59886..b160ba888 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -96,6 +96,8 @@ menuIconTranslate: icon {{ "menu/translate", menuIconColor }};
 menuIconReportAntiSpam: icon {{ "menu/false_positive", menuIconColor }};
 menuIconSpoiler: icon {{ "menu/spoiler", menuIconColor }};
 menuIconDisable: icon {{ "menu/disable", menuIconColor }};
+menuIconPhotoSet: icon {{ "menu/photo_set", menuIconColor }};
+menuIconPhotoSuggest: icon {{ "menu/photo_suggest", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);
diff --git a/Telegram/SourceFiles/ui/special_buttons.cpp b/Telegram/SourceFiles/ui/special_buttons.cpp
index 181dc651f..c739d0f82 100644
--- a/Telegram/SourceFiles/ui/special_buttons.cpp
+++ b/Telegram/SourceFiles/ui/special_buttons.cpp
@@ -46,6 +46,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_peer_photo.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
+#include "styles/style_menu_icons.h"
 
 namespace Ui {
 namespace {
@@ -305,7 +306,9 @@ void UserpicButton::choosePhotoLocally() {
 	if (!IsCameraAvailable()) {
 		chooseFile();
 	} else {
-		_menu = base::make_unique_q<Ui::PopupMenu>(this);
+		_menu = base::make_unique_q<Ui::PopupMenu>(
+			this,
+			st::popupMenuWithIcons);
 		const auto user = _peer ? _peer->asUser() : nullptr;
 		if (user && !user->isSelf()) {
 			const auto name = user->firstName.isEmpty()
@@ -313,27 +316,30 @@ void UserpicButton::choosePhotoLocally() {
 				: user->firstName;
 			_menu->addAction(
 				tr::lng_profile_set_photo_for(tr::now, lt_user, name),
-				[=] { chooseFile(); });
+				[=] { chooseFile(); },
+				&st::menuIconPhotoSet);
 			_menu->addAction(
 				tr::lng_profile_suggest_photo(tr::now, lt_user, name),
-				[=] { chooseFile(ChosenType::Suggest); });
+				[=] { chooseFile(ChosenType::Suggest); },
+				&st::menuIconPhotoSuggest);
 			if (user->hasPersonalPhoto()) {
 				_menu->addAction(
 					tr::lng_profile_photo_reset(tr::now),
 					[=] { user->session().api().peerPhoto().clearPersonal(
-						user); _userpicCustom = false; });
+						user); _userpicCustom = false; },
+					&st::menuIconRemove);
 			}
 		} else {
 			_menu->addAction(tr::lng_attach_file(tr::now), [=] {
 				chooseFile();
-			});
+			}, &st::menuIconPhoto);
 			_menu->addAction(tr::lng_attach_camera(tr::now), [=] {
 				_window->show(Box(
 					CameraBox,
 					_window,
 					_peer,
 					callback(ChosenType::Set)));
-			});
+			}, &st::menuIconPhotoSet);
 		}
 		_menu->popup(QCursor::pos());
 	}