diff --git a/Telegram/SourceFiles/data/data_shared_media.cpp b/Telegram/SourceFiles/data/data_shared_media.cpp
index 038ac55f4..a824a86e2 100644
--- a/Telegram/SourceFiles/data/data_shared_media.cpp
+++ b/Telegram/SourceFiles/data/data_shared_media.cpp
@@ -37,7 +37,7 @@ std::optional<Storage::SharedMediaType> SharedMediaOverviewType(
 	case Type::Video:
 	case Type::MusicFile:
 	case Type::File:
-	case Type::VoiceFile:
+	case Type::RoundVoiceFile:
 	case Type::Link: return type;
 	}
 	return std::nullopt;
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index 952ab34eb..2308ac6a9 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -488,8 +488,7 @@ Ui::StringWithNumbers TopBar::generateSelectedText() const {
 		case Type::File: return lng_media_selected_file__generic<Data>;
 		case Type::MusicFile: return lng_media_selected_song__generic<Data>;
 		case Type::Link: return lng_media_selected_link__generic<Data>;
-		case Type::VoiceFile: return lng_media_selected_audio__generic<Data>;
-//		case Type::RoundFile: return lng_media_selected_round__generic<Data>;
+		case Type::RoundVoiceFile: return lng_media_selected_audio__generic<Data>;
 		}
 		Unexpected("Type in TopBar::generateSelectedText()");
 	}();
@@ -580,7 +579,7 @@ rpl::producer<QString> TitleValue(
 				return lng_media_type_songs;
 			case Section::MediaType::File:
 				return lng_media_type_files;
-			case Section::MediaType::VoiceFile:
+			case Section::MediaType::RoundVoiceFile:
 				return lng_media_type_audios;
 			case Section::MediaType::Link:
 				return lng_media_type_links;
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h
index 7b98f4e5e..812fae260 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.h
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.h
@@ -32,8 +32,7 @@ inline auto MediaTextPhrase(Type type) {
 	case Type::File: return lng_profile_files;
 	case Type::MusicFile: return lng_profile_songs;
 	case Type::Link: return lng_profile_shared_links;
-	case Type::VoiceFile: return lng_profile_audios;
-//	case Type::RoundFile: return lng_profile_rounds;
+	case Type::RoundVoiceFile: return lng_profile_audios;
 	}
 	Unexpected("Type in MediaTextPhrase()");
 };
diff --git a/Telegram/SourceFiles/info/media/info_media_empty_widget.cpp b/Telegram/SourceFiles/info/media/info_media_empty_widget.cpp
index 8137bf6c9..9867c5b34 100644
--- a/Telegram/SourceFiles/info/media/info_media_empty_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_empty_widget.cpp
@@ -41,7 +41,7 @@ void EmptyWidget::setType(Type type) {
 		case Type::MusicFile: return &st::infoEmptyAudio;
 		case Type::File: return &st::infoEmptyFile;
 		case Type::Link: return &st::infoEmptyLink;
-		case Type::VoiceFile: return &st::infoEmptyVoice;
+		case Type::RoundVoiceFile: return &st::infoEmptyVoice;
 		}
 		Unexpected("Bad type in EmptyWidget::setType()");
 	}();
@@ -67,7 +67,7 @@ void EmptyWidget::setSearchQuery(const QString &query) {
 			return query.isEmpty()
 				? lng_media_link_empty
 				: lng_media_link_empty_search;
-		case Type::VoiceFile:
+		case Type::RoundVoiceFile:
 			return lng_media_audio_empty;
 		}
 		Unexpected("Bad type in EmptyWidget::setSearchQuery()");
diff --git a/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp b/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp
index a9f55539b..daf1c1a9b 100644
--- a/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp
@@ -126,8 +126,7 @@ void InnerWidget::createTypeButtons() {
 	if (auto user = _controller->key().peer()->asUser()) {
 //		addCommonGroupsButton(user, st::infoIconMediaGroup);
 	}
-	addMediaButton(Type::VoiceFile, st::infoIconMediaVoice);
-//	addMediaButton(Type::RoundFile, st::infoIconMediaRound);
+	addMediaButton(Type::RoundVoiceFile, st::infoIconMediaVoice);
 
 	content->add(object_ptr<Ui::FixedHeightWidget>(
 		content,
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 37c5f8e4b..edff973f2 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -199,7 +199,7 @@ void ListWidget::Section::setHeader(not_null<BaseLayout*> item) {
 		case Type::Photo:
 		case Type::Video:
 		case Type::RoundFile:
-		case Type::VoiceFile:
+		case Type::RoundVoiceFile:
 		case Type::File:
 			return langMonthFull(date);
 
@@ -225,7 +225,7 @@ bool ListWidget::Section::belongsHere(
 	case Type::Photo:
 	case Type::Video:
 	case Type::RoundFile:
-	case Type::VoiceFile:
+	case Type::RoundVoiceFile:
 	case Type::File:
 		return date.year() == myDate.year()
 			&& date.month() == myDate.month();
@@ -455,7 +455,7 @@ void ListWidget::Section::resizeToWidth(int newWidth) {
 		}
 	} break;
 
-	case Type::VoiceFile:
+	case Type::RoundVoiceFile:
 	case Type::MusicFile:
 		resizeOneColumn(0, newWidth);
 		break;
@@ -482,7 +482,7 @@ int ListWidget::Section::MinItemHeight(Type type, int width) {
 		return (st::infoMediaMinGridSize + st::infoMediaSkip) / itemsInRow;
 	} break;
 
-	case Type::VoiceFile:
+	case Type::RoundVoiceFile:
 		return songSt.songPadding.top() + songSt.songThumbSize + songSt.songPadding.bottom() + st::lineWidth;
 	case Type::File:
 		return songSt.filePadding.top() + songSt.fileThumbSize + songSt.filePadding.bottom() + st::lineWidth;
@@ -519,7 +519,7 @@ int ListWidget::Section::recountHeight() const {
 		}
 	} break;
 
-	case Type::VoiceFile:
+	case Type::RoundVoiceFile:
 	case Type::File:
 	case Type::MusicFile:
 	case Type::Link:
@@ -857,27 +857,27 @@ std::unique_ptr<BaseLayout> ListWidget::createLayout(
 	using namespace Layout;
 	switch (type) {
 	case Type::Photo:
-		if (auto photo = getPhoto()) {
+		if (const auto photo = getPhoto()) {
 			return std::make_unique<Photo>(item, photo);
 		}
 		return nullptr;
 	case Type::Video:
-		if (auto file = getFile()) {
+		if (const auto file = getFile()) {
 			return std::make_unique<Video>(item, file);
 		}
 		return nullptr;
 	case Type::File:
-		if (auto file = getFile()) {
+		if (const auto file = getFile()) {
 			return std::make_unique<Document>(item, file, songSt);
 		}
 		return nullptr;
 	case Type::MusicFile:
-		if (auto file = getFile()) {
+		if (const auto file = getFile()) {
 			return std::make_unique<Document>(item, file, songSt);
 		}
 		return nullptr;
-	case Type::VoiceFile:
-		if (auto file = getFile()) {
+	case Type::RoundVoiceFile:
+		if (const auto file = getFile()) {
 			return std::make_unique<Voice>(item, file, songSt);
 		}
 		return nullptr;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
index 16fc05c85..6e8c6444d 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
@@ -172,8 +172,7 @@ object_ptr<Ui::RpWidget> InnerWidget::setupSharedMedia(
 	if (auto user = _peer->asUser()) {
 		addCommonGroupsButton(user, st::infoIconMediaGroup);
 	}
-	addMediaButton(MediaType::VoiceFile, st::infoIconMediaVoice);
-//	addMediaButton(MediaType::RoundFile, st::infoIconMediaRound);
+	addMediaButton(MediaType::RoundVoiceFile, st::infoIconMediaVoice);
 
 	auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 		parent,
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index d481e2189..debba6b52 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -189,7 +189,11 @@ void RadialProgressItem::setDocumentLinks(
 		not_null<DocumentData*> document) {
 	const auto context = parent()->fullId();
 	const auto createSaveHandler = [&]() -> ClickHandlerPtr {
-		if (document->isVoiceMessage()) {
+		if (document->isVideoMessage()) {
+			return std::make_shared<GifOpenClickHandler>(
+				document,
+				context);
+		} else if (document->isVoiceMessage()) {
 			return std::make_shared<DocumentOpenClickHandler>(
 				document,
 				context);
@@ -199,9 +203,13 @@ void RadialProgressItem::setDocumentLinks(
 			context);
 	};
 	setLinks(
-		std::make_shared<DocumentOpenClickHandler>(
-			document,
-			context),
+		(document->isVideoMessage()
+			? std::make_shared<GifOpenClickHandler>(
+				document,
+				context)
+			: std::make_shared<DocumentOpenClickHandler>(
+				document,
+				context)),
 		createSaveHandler(),
 		std::make_shared<DocumentCancelClickHandler>(
 			document,
@@ -567,13 +575,14 @@ Voice::Voice(
 	const style::OverviewFileLayout &st)
 : RadialProgressItem(parent)
 , _data(voice)
-, _namel(std::make_shared<DocumentOpenClickHandler>(_data, parent->fullId()))
+, _namel(_data->isVideoMessage()
+	? std::make_shared<GifOpenClickHandler>(_data, parent->fullId())
+	: std::make_shared<DocumentOpenClickHandler>(_data, parent->fullId()))
 , _st(st) {
 	AddComponents(Info::Bit());
 
-	Assert(_data->isVoiceMessage());
-
 	setDocumentLinks(_data);
+	_data->thumb->load(parent->fullId());
 
 	updateName();
 	const auto dateText = textcmdLink(
@@ -587,7 +596,7 @@ Voice::Voice(
 			lt_date,
 			dateText,
 			lt_duration,
-			formatDurationText(_data->voice()->duration)),
+			formatDurationText(duration())),
 		opts);
 	_details.setLink(1, goToMessageClickHandler(parent));
 }
@@ -632,13 +641,28 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 		_width);
 	if (clip.intersects(inner)) {
 		p.setPen(Qt::NoPen);
+		const auto drawThumb = !_data->thumb->isNull()
+			&& _data->thumb->loaded();
+		if (drawThumb) {
+			const auto thumb = _data->thumb->pixCircled(
+				parent()->fullId(),
+				inner.width(),
+				inner.height());
+			p.drawPixmap(inner.topLeft(), thumb);
+		} else if (!_data->thumb->isNull()) {
+			PainterHighQualityEnabler hq(p);
+			p.setBrush(st::imageBg);
+			p.drawEllipse(inner);
+		}
 		if (selected) {
-			p.setBrush(st::msgFileInBgSelected);
+			p.setBrush(drawThumb ? st::msgDateImgBgSelected : st::msgFileInBgSelected);
+		} else if (!_data->thumb->isNull()) {
+			auto over = ClickHandler::showAsActive(loaded ? _openl : (_data->loading() ? _cancell : _openl));
+			p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, _a_iconOver.current(context->ms, over ? 1. : 0.)));
 		} else {
 			auto over = ClickHandler::showAsActive(loaded ? _openl : (_data->loading() ? _cancell : _openl));
 			p.setBrush(anim::brush(st::msgFileInBg, st::msgFileInBgOver, _a_iconOver.current(context->ms, over ? 1. : 0.)));
 		}
-
 		{
 			PainterHighQualityEnabler hq(p);
 			p.drawEllipse(inner);
@@ -650,7 +674,7 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			_radial->draw(p, rinner, st::msgFileRadialLine, bg);
 		}
 
-		auto icon = ([showPause, this, selected] {
+		auto icon = [&] {
 			if (showPause) {
 				return &(selected ? _st.songPauseSelected : _st.songPause);
 			} else if (_status.size() < 0 || _status.size() == FileStatusSizeLoaded) {
@@ -659,7 +683,7 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 				return &(selected ? _st.songCancelSelected : _st.songCancel);
 			}
 			return &(selected ? _st.songDownloadSelected : _st.songDownload);
-		})();
+		}();
 		icon->paintInCenter(p, inner);
 	}
 
@@ -794,6 +818,12 @@ void Voice::updateName() {
 	_nameVersion = version;
 }
 
+int Voice::duration() const {
+	return _data->voice()
+		? _data->voice()->duration
+		: std::max(_data->duration(), 0);
+}
+
 bool Voice::updateStatusText() {
 	bool showPause = false;
 	int32 statusSize = 0, realDuration = 0;
@@ -803,7 +833,7 @@ bool Voice::updateStatusText() {
 		statusSize = FileStatusSizeLoaded;
 		using State = Media::Player::State;
 		auto state = Media::Player::mixer()->currentState(AudioMsgId::Type::Voice);
-		if (state.id == AudioMsgId(_data, parent()->fullId()) && !Media::Player::IsStoppedOrStopping(state.state)) {
+		if (state.id == AudioMsgId(_data, parent()->fullId(), state.id.playId()) && !Media::Player::IsStoppedOrStopping(state.state)) {
 			statusSize = -1 - (state.position / state.frequency);
 			realDuration = (state.length / state.frequency);
 			showPause = (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
@@ -812,7 +842,7 @@ bool Voice::updateStatusText() {
 		statusSize = FileStatusSizeReady;
 	}
 	if (statusSize != _status.size()) {
-		_status.update(statusSize, _data->size, _data->voice()->duration, realDuration);
+		_status.update(statusSize, _data->size, duration(), realDuration);
 	}
 	return showPause;
 }
@@ -911,7 +941,7 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 				_radial->draw(p, rinner, st::msgFileRadialLine, bg);
 			}
 
-			auto icon = ([showPause, loaded, this, selected] {
+			auto icon = [&] {
 				if (showPause) {
 					return &(selected ? _st.songPauseSelected : _st.songPause);
 				} else if (loaded) {
@@ -920,7 +950,7 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 					return &(selected ? _st.songCancelSelected : _st.songCancel);
 				}
 				return &(selected ? _st.songDownloadSelected : _st.songDownload);
-			})();
+			}();
 			icon->paintInCenter(p, inner);
 		}
 	} else {
diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h
index 4444e0a1d..78faa93bc 100644
--- a/Telegram/SourceFiles/overview/overview_layout.h
+++ b/Telegram/SourceFiles/overview/overview_layout.h
@@ -268,6 +268,8 @@ protected:
 	const style::RoundCheckbox &checkboxStyle() const override;
 
 private:
+	int duration() const;
+
 	not_null<DocumentData*> _data;
 	StatusText _status;
 	ClickHandlerPtr _namel;