diff --git a/Telegram/SourceFiles/editor/color_picker.cpp b/Telegram/SourceFiles/editor/color_picker.cpp
index 2bc123b735..a11a227956 100644
--- a/Telegram/SourceFiles/editor/color_picker.cpp
+++ b/Telegram/SourceFiles/editor/color_picker.cpp
@@ -181,6 +181,7 @@ ColorPicker::ColorPicker(
 , _paletteWrap(std::in_place, parent)
 , _sizeControlHoverArea(std::in_place, parent)
 , _sizeControl(std::in_place, parent)
+, _toolSelection(std::in_place, parent)
 , _brush(Brush{
 	.sizeRatio = (savedBrush.sizeRatio
 		? savedBrush.sizeRatio
@@ -196,6 +197,28 @@ ColorPicker::ColorPicker(
 	_colorButton->setSelectionCutout(true);
 	_colorButton->setForceCircle(true);
 
+	_toolSelection->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_toolSelection->setAttribute(Qt::WA_TranslucentBackground, true);
+	_toolSelection->setVisible(false);
+	_toolSelection->paintOn([=](QPainter &p) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setOpacity(st::photoEditorToolButtonSelectedOpacity);
+		auto pen = QPen(
+			st::photoEditorToolButtonSelectedFg,
+			st::photoEditorToolButtonSelectedWidth);
+		pen.setCapStyle(Qt::RoundCap);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::photoEditorToolButtonSelectedFg);
+		const auto padding = st::photoEditorToolButtonSelectedPadding;
+		const auto half = pen.widthF() / 2.;
+		const auto rect = QRectF(_toolSelection->rect()).adjusted(
+			padding + half,
+			padding + half,
+			-padding - half,
+			-padding - half);
+		p.drawEllipse(rect);
+	});
+
 	_toolButtons.push_back(base::make_unique_q<ToolLottieButton>(
 		parent,
 		u":/animations/photo_editor_pen.tgs"_q));
@@ -219,6 +242,7 @@ ColorPicker::ColorPicker(
 			return;
 		}
 		_brush.tool = tool;
+		updateToolSelection(true);
 		_saveBrushRequests.fire_copy(_brush);
 	};
 	if (_toolButtons.size() >= 4) {
@@ -235,6 +259,7 @@ ColorPicker::ColorPicker(
 			setTool(Brush::Tool::Eraser);
 		});
 	}
+	updateToolSelection(false);
 	_paletteWrap->setVisible(false);
 	_sizeControl->resize(
 		st::photoEditorBrushSizeControlHitPadding * 2
@@ -344,6 +369,7 @@ void ColorPicker::moveLine(const QPoint &position) {
 	const auto top = position.y() - colorHeight / 2;
 	_colorButton->move(left, top);
 	updateToolButtonsGeometry();
+	updateToolSelection(false);
 	updatePaletteGeometry();
 }
 
@@ -354,17 +380,64 @@ void ColorPicker::setCanvasRect(const QRect &rect) {
 
 void ColorPicker::updateToolButtonsGeometry() {
 	const auto size = st::photoEditorToolButtonSize;
+	const auto extra = st::photoEditorToolButtonSelectedExtra;
+	const auto hit = size + extra * 2;
 	const auto gap = st::photoEditorToolButtonGap;
 	auto x = _colorButton->x() + _colorButton->width() + gap;
 	const auto y = _colorButton->y()
 		+ (_colorButton->height() - size) / 2;
 	for (const auto &button : _toolButtons) {
-		button->resize(size, size);
-		button->move(x, y);
+		button->resize(hit, hit);
+		button->move(x - extra, y - extra);
 		x += size + gap;
 	}
 }
 
+void ColorPicker::updateToolSelection(bool animated) {
+	if (_toolButtons.size() < 4) {
+		return;
+	}
+	const auto index = [&] {
+		switch (_brush.tool) {
+		case Brush::Tool::Pen: return 0;
+		case Brush::Tool::Arrow: return 1;
+		case Brush::Tool::Marker: return 2;
+		case Brush::Tool::Eraser: return 3;
+		}
+		return 0;
+	}();
+	if (index < 0 || index >= int(_toolButtons.size())) {
+		return;
+	}
+	const auto &button = _toolButtons[index];
+	const auto target = button->pos();
+	_toolSelection->resize(button->size());
+	_toolSelection->raise();
+	if (!animated || !_toolSelection->isVisible()) {
+		_toolSelectionAnimation.stop();
+		_toolSelection->move(target);
+		_toolSelection->update();
+		return;
+	}
+	_toolSelectionFrom = _toolSelection->pos();
+	_toolSelectionTo = target;
+	_toolSelectionAnimation.stop();
+	_toolSelectionAnimation.start([=] {
+		const auto progress = _toolSelectionAnimation.value(1.);
+		_toolSelection->move(
+			anim::interpolate(
+				_toolSelectionFrom.x(),
+				_toolSelectionTo.x(),
+				progress),
+			anim::interpolate(
+				_toolSelectionFrom.y(),
+				_toolSelectionTo.y(),
+				progress));
+		_toolSelection->update();
+	}, 0., 1., crl::time(st::photoEditorToolButtonSelectDuration),
+		anim::easeOutCirc);
+}
+
 void ColorPicker::paintSizeControl(QPainter &p) {
 	auto hq = PainterHighQualityEnabler(p);
 
@@ -390,14 +463,19 @@ void ColorPicker::setVisible(bool visible) {
 		_sizeControlHovered = false;
 		_sizeControlExpanded = false;
 		_sizeControlAnimation.stop();
+		_toolSelectionAnimation.stop();
 	}
 	_colorButton->setVisible(visible && !_paletteVisible);
 	_paletteWrap->setVisible(visible && _paletteVisible);
 	_sizeControlHoverArea->setVisible(visible);
 	_sizeControl->setVisible(visible);
+	_toolSelection->setVisible(visible && !_paletteVisible);
 	for (const auto &button : _toolButtons) {
 		button->setVisible(visible && !_paletteVisible);
 	}
+	if (visible && !_paletteVisible) {
+		updateToolSelection(false);
+	}
 }
 
 rpl::producer<Brush> ColorPicker::saveBrushRequests() const {
@@ -523,11 +601,14 @@ void ColorPicker::setPaletteVisible(bool visible) {
 	_paletteVisible = visible;
 	_paletteWrap->setVisible(visible);
 	_colorButton->setVisible(!visible);
+	_toolSelection->setVisible(!visible);
 	for (const auto &button : _toolButtons) {
 		button->setVisible(!visible);
 	}
 	if (visible) {
 		rebuildPalette();
+	} else {
+		updateToolSelection(false);
 	}
 }
 
diff --git a/Telegram/SourceFiles/editor/color_picker.h b/Telegram/SourceFiles/editor/color_picker.h
index 8540563d8c..472c6668de 100644
--- a/Telegram/SourceFiles/editor/color_picker.h
+++ b/Telegram/SourceFiles/editor/color_picker.h
@@ -37,6 +37,7 @@ private:
 	void paintSizeControl(QPainter &p);
 	void rebuildPalette();
 	void updateToolButtonsGeometry();
+	void updateToolSelection(bool animated);
 	void updatePaletteGeometry();
 	void setPaletteVisible(bool visible);
 	void moveSizeControl(const QSize &size);
@@ -62,6 +63,7 @@ private:
 	const base::unique_qptr<Ui::RpWidget> _paletteWrap;
 	const base::unique_qptr<Ui::RpWidget> _sizeControlHoverArea;
 	const base::unique_qptr<Ui::RpWidget> _sizeControl;
+	const base::unique_qptr<Ui::RpWidget> _toolSelection;
 	std::vector<base::unique_qptr<Ui::AbstractButton>> _toolButtons;
 
 	struct {
@@ -77,11 +79,14 @@ private:
 	Brush _brush;
 
 	Ui::Animations::Simple _sizeControlAnimation;
+	Ui::Animations::Simple _toolSelectionAnimation;
 
 	rpl::event_stream<Brush> _saveBrushRequests;
 
 	std::vector<base::unique_qptr<Ui::ColorSample>> _paletteButtons;
 	base::unique_qptr<Ui::AbstractButton> _palettePlus;
+	QPoint _toolSelectionFrom;
+	QPoint _toolSelectionTo;
 
 };
 
diff --git a/Telegram/SourceFiles/editor/editor.style b/Telegram/SourceFiles/editor/editor.style
index 354564324f..80e9f7f1a6 100644
--- a/Telegram/SourceFiles/editor/editor.style
+++ b/Telegram/SourceFiles/editor/editor.style
@@ -102,8 +102,14 @@ photoEditorColorPalettePlusFg: mediaviewCaptionFg;
 
 photoEditorToolButtonSize: 20px;
 photoEditorToolButtonIconSize: 20px;
-photoEditorToolButtonGap: 6px;
+photoEditorToolButtonGap: 18px;
 photoEditorToolButtonHoverDuration: 350;
+photoEditorToolButtonSelectDuration: 120;
+photoEditorToolButtonSelectedFg: mediaviewCaptionFg;
+photoEditorToolButtonSelectedWidth: 2px;
+photoEditorToolButtonSelectedPadding: 2px;
+photoEditorToolButtonSelectedOpacity: 0.35;
+photoEditorToolButtonSelectedExtra: 8px;
 
 photoEditorMarkerOpacity: 0.35;
 photoEditorMarkerSizeMultiplier: 2.5;