diff --git a/Telegram/Resources/icons/photo_editor/flip.png b/Telegram/Resources/icons/photo_editor/flip.png
new file mode 100644
index 000000000..ec776f6eb
Binary files /dev/null and b/Telegram/Resources/icons/photo_editor/flip.png differ
diff --git a/Telegram/Resources/icons/photo_editor/flip@2x.png b/Telegram/Resources/icons/photo_editor/flip@2x.png
new file mode 100644
index 000000000..5717ef76a
Binary files /dev/null and b/Telegram/Resources/icons/photo_editor/flip@2x.png differ
diff --git a/Telegram/Resources/icons/photo_editor/flip@3x.png b/Telegram/Resources/icons/photo_editor/flip@3x.png
new file mode 100644
index 000000000..79910ffe0
Binary files /dev/null and b/Telegram/Resources/icons/photo_editor/flip@3x.png differ
diff --git a/Telegram/Resources/icons/photo_editor/paint.png b/Telegram/Resources/icons/photo_editor/paint.png
new file mode 100644
index 000000000..cdcd6c705
Binary files /dev/null and b/Telegram/Resources/icons/photo_editor/paint.png differ
diff --git a/Telegram/Resources/icons/photo_editor/paint@2x.png b/Telegram/Resources/icons/photo_editor/paint@2x.png
new file mode 100644
index 000000000..e9a4a33e8
Binary files /dev/null and b/Telegram/Resources/icons/photo_editor/paint@2x.png differ
diff --git a/Telegram/Resources/icons/photo_editor/paint@3x.png b/Telegram/Resources/icons/photo_editor/paint@3x.png
new file mode 100644
index 000000000..316d25d81
Binary files /dev/null and b/Telegram/Resources/icons/photo_editor/paint@3x.png differ
diff --git a/Telegram/Resources/icons/photo_editor/rotate.png b/Telegram/Resources/icons/photo_editor/rotate.png
new file mode 100644
index 000000000..7a92ae0bc
Binary files /dev/null and b/Telegram/Resources/icons/photo_editor/rotate.png differ
diff --git a/Telegram/Resources/icons/photo_editor/rotate@2x.png b/Telegram/Resources/icons/photo_editor/rotate@2x.png
new file mode 100644
index 000000000..478e24fa5
Binary files /dev/null and b/Telegram/Resources/icons/photo_editor/rotate@2x.png differ
diff --git a/Telegram/Resources/icons/photo_editor/rotate@3x.png b/Telegram/Resources/icons/photo_editor/rotate@3x.png
new file mode 100644
index 000000000..892d75649
Binary files /dev/null and b/Telegram/Resources/icons/photo_editor/rotate@3x.png differ
diff --git a/Telegram/Resources/icons/photo_editor/undo.png b/Telegram/Resources/icons/photo_editor/undo.png
new file mode 100644
index 000000000..235b8d8cb
Binary files /dev/null and b/Telegram/Resources/icons/photo_editor/undo.png differ
diff --git a/Telegram/Resources/icons/photo_editor/undo@2x.png b/Telegram/Resources/icons/photo_editor/undo@2x.png
new file mode 100644
index 000000000..0ef97e89e
Binary files /dev/null and b/Telegram/Resources/icons/photo_editor/undo@2x.png differ
diff --git a/Telegram/Resources/icons/photo_editor/undo@3x.png b/Telegram/Resources/icons/photo_editor/undo@3x.png
new file mode 100644
index 000000000..e5ad13262
Binary files /dev/null and b/Telegram/Resources/icons/photo_editor/undo@3x.png differ
diff --git a/Telegram/SourceFiles/editor/editor.style b/Telegram/SourceFiles/editor/editor.style
index 718c7fe98..bfc24dbb2 100644
--- a/Telegram/SourceFiles/editor/editor.style
+++ b/Telegram/SourceFiles/editor/editor.style
@@ -13,11 +13,28 @@ using "ui/chat/chat.style";
 
 photoEditorControlsHeight: 100px;
 
+photoEditorButtonIconFg: historyComposeIconFg;
+photoEditorButtonIconFgOver: historyComposeIconFgOver;
+
+photoEditorButtonIconFgActive: historyComposeIconFgOver;
+
 photoEditorRotateButton: IconButton(historyAttach) {
-	icon: icon {{ "send_control_attach", historyComposeIconFg }};
-	iconOver: icon {{ "send_control_attach", historyComposeIconFgOver }};
+	icon: icon {{ "photo_editor/rotate", photoEditorButtonIconFg }};
+	iconOver: icon {{ "photo_editor/rotate", photoEditorButtonIconFgOver }};
 }
 photoEditorFlipButton: IconButton(historyAttach) {
-	icon: icon {{ "send_control_attach", historyComposeIconFg }};
-	iconOver: icon {{ "send_control_attach", historyComposeIconFgOver }};
+	icon: icon {{ "photo_editor/flip", photoEditorButtonIconFg }};
+	iconOver: icon {{ "photo_editor/flip", photoEditorButtonIconFgOver }};
+}
+photoEditorPaintModeButton: IconButton(historyAttach) {
+	icon: icon {{ "photo_editor/paint", photoEditorButtonIconFg }};
+	iconOver: icon {{ "photo_editor/paint", photoEditorButtonIconFgOver }};
+}
+photoEditorUndoButton: IconButton(historyAttach) {
+	icon: icon {{ "photo_editor/undo", photoEditorButtonIconFg }};
+	iconOver: icon {{ "photo_editor/undo", photoEditorButtonIconFgOver }};
+}
+photoEditorRedoButton: IconButton(historyAttach) {
+	icon: icon {{ "photo_editor/undo-flip_horizontal", photoEditorButtonIconFg }};
+	iconOver: icon {{ "photo_editor/undo-flip_horizontal", photoEditorButtonIconFgOver }};
 }
diff --git a/Telegram/SourceFiles/editor/photo_editor_controls.cpp b/Telegram/SourceFiles/editor/photo_editor_controls.cpp
index 562339aaa..89c7d77e0 100644
--- a/Telegram/SourceFiles/editor/photo_editor_controls.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor_controls.cpp
@@ -52,7 +52,7 @@ PhotoEditorControls::PhotoEditorControls(
 	st::photoEditorFlipButton))
 , _paintModeButton(base::make_unique_q<Ui::IconButton>(
 	_buttonsContainer,
-	st::photoEditorFlipButton)) {
+	st::photoEditorPaintModeButton)) {
 
 	_buttonsContainer->updateChildrenPosition();