diff --git a/Telegram/Resources/style.txt b/Telegram/Resources/style.txt
index ef0d68e5b..859f3d1f5 100644
--- a/Telegram/Resources/style.txt
+++ b/Telegram/Resources/style.txt
@@ -915,6 +915,8 @@ mediaDocOutImg: sprite(6px, 146px, 48px, 48px);
 mediaDocInImg: sprite(56px, 146px, 48px, 48px);
 mediaAudioOutImg: sprite(106px, 146px, 48px, 48px);
 mediaAudioInImg: sprite(156px, 146px, 48px, 48px);
+mediaMusicOutImg: sprite(322px, 345px, 48px, 48px);
+mediaMusicInImg: sprite(322px, 395px, 48px, 48px);
 mediaPlayOutImg: sprite(122px, 341px, 48px, 48px);
 mediaPlayInImg: sprite(172px, 341px, 48px, 48px);
 mediaPauseOutImg: sprite(222px, 341px, 48px, 48px);
@@ -987,9 +989,9 @@ btnAttachPhoto: iconedButton(btnAttachDocument) {
 }
 btnAttachEmoji: iconedButton(btnAttachDocument) {
 	overBgColor: white;
-	icon: sprite(363px, 344px, 21px, 22px);
+	icon: sprite(374px, 344px, 21px, 22px);
 	iconPos: point(6px, 12px);
-	downIcon: sprite(363px, 344px, 21px, 22px);
+	downIcon: sprite(374px, 344px, 21px, 22px);
 	downIconPos: point(6px, 12px);
 
 	width: 33px;
@@ -1012,7 +1014,7 @@ btnBotKbHide: iconedButton(btnAttachEmoji) {
 	downIcon: sprite(373px, 95px, 23px, 14px);
 	downIconPos: point(5px, 17px);
 }
-btnRecordAudio: sprite(363px, 366px, 16px, 24px);
+btnRecordAudio: sprite(379px, 390px, 16px, 24px);
 btnRecordAudioActive: sprite(379px, 366px, 16px, 24px);
 recordSignalColor: #f17077;
 recordSignalMin: 5px;
@@ -1535,30 +1537,22 @@ stickersScroll: flatScroll(newScroll) {
 emojiScroll: flatScroll(newScroll) {
 	deltat: 48px;
 }
-emojiRecent: sprite(0px, 196px, 21px, 22px);
-emojiRecentOver: sprite(287px, 220px, 21px, 22px);
-emojiRecentActive: sprite(287px, 242px, 21px, 22px);
-emojiPeople: sprite(21px, 196px, 21px, 22px);
-emojiPeopleOver: sprite(308px, 220px, 21px, 22px);
-emojiPeopleActive: sprite(308px, 242px, 21px, 22px);
-emojiNature: sprite(42px, 196px, 21px, 22px);
-emojiNatureOver: sprite(245px, 264px, 21px, 22px);
+emojiRecentOver: sprite(0px, 196px, 21px, 22px);
+emojiRecentActive: sprite(245px, 264px, 21px, 22px);
+emojiPeopleOver: sprite(21px, 196px, 21px, 22px);
+emojiPeopleActive: sprite(266px, 264px, 21px, 22px);
+emojiNatureOver: sprite(42px, 196px, 21px, 22px);
 emojiNatureActive: sprite(245px, 286px, 21px, 22px);
-emojiFood: sprite(63px, 196px, 21px, 22px);
-emojiFoodOver: sprite(266px, 264px, 21px, 22px);
+emojiFoodOver: sprite(63px, 196px, 21px, 22px);
 emojiFoodActive: sprite(266px, 286px, 21px, 22px);
-emojiCelebration: sprite(84px, 196px, 21px, 22px);
-emojiCelebrationOver: sprite(287px, 264px, 21px, 22px);
+emojiCelebrationOver: sprite(84px, 196px, 21px, 22px);
 emojiCelebrationActive: sprite(287px, 286px, 21px, 22px);
-emojiActivity: sprite(126px, 196px, 21px, 22px);
-emojiActivityOver: sprite(321px, 344px, 21px, 22px);
-emojiActivityActive: sprite(321px, 366px, 21px, 22px);
-emojiTravel: sprite(105px, 196px, 21px, 22px);
-emojiTravelOver: sprite(308px, 264px, 21px, 22px);
+emojiActivityOver: sprite(126px, 196px, 21px, 22px);
+emojiActivityActive: sprite(287px, 264px, 21px, 22px);
+emojiTravelOver: sprite(105px, 196px, 21px, 22px);
 emojiTravelActive: sprite(308px, 286px, 21px, 22px);
-emojiObjects: sprite(147px, 196px, 21px, 22px);
-emojiObjectsOver: sprite(342px, 344px, 21px, 22px);
-emojiObjectsActive: sprite(342px, 366px, 21px, 22px);
+emojiObjectsOver: sprite(147px, 196px, 21px, 22px);
+emojiObjectsActive: sprite(308px, 264px, 21px, 22px);
 
 emojiPanCategories: #f7f7f7;
 
@@ -1727,11 +1721,11 @@ mvControlMargin: 0px;
 mvControlSize: 90px;
 mvIconSize: size(60px, 56px);
 
-mvLeft: sprite(320px, 400px, 12px, 22px);
-mvRight: sprite(332px, 400px, 12px, 22px);
-mvClose: sprite(344px, 400px, 18px, 18px);
-mvSave: sprite(362px, 400px, 14px, 19px);
-mvMore: sprite(376px, 400px, 5px, 21px);
+mvLeft: sprite(320px, 445px, 12px, 22px);
+mvRight: sprite(332px, 445px, 12px, 22px);
+mvClose: sprite(344px, 445px, 18px, 18px);
+mvSave: sprite(362px, 445px, 14px, 19px);
+mvMore: sprite(376px, 445px, 5px, 21px);
 
 mvDropdown: dropdown(dropdownDef) {
 	shadow: sprite(0px, 0px, 0px, 0px);
diff --git a/Telegram/SourceFiles/art/sprite.png b/Telegram/SourceFiles/art/sprite.png
index d52ac2e85..fe2c98bc2 100644
Binary files a/Telegram/SourceFiles/art/sprite.png and b/Telegram/SourceFiles/art/sprite.png differ
diff --git a/Telegram/SourceFiles/art/sprite_200x.png b/Telegram/SourceFiles/art/sprite_200x.png
index 84138ee01..63b51ff0b 100644
Binary files a/Telegram/SourceFiles/art/sprite_200x.png and b/Telegram/SourceFiles/art/sprite_200x.png differ
diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp
index 0c3ef3821..8b5a23d89 100644
--- a/Telegram/SourceFiles/history.cpp
+++ b/Telegram/SourceFiles/history.cpp
@@ -2849,10 +2849,12 @@ void HistoryDocument::initDimensions(const HistoryItem *parent) {
 		if (const HistoryReply *reply = toHistoryReply(parent)) {
 			_minh += st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom();
 		} else if (const HistoryForwarded *fwd = toHistoryForwarded(parent)) {
-			if (parent->out() || !parent->history()->peer->chat) {
-				_minh += st::msgPadding.top();
+			if (!data->song()) {
+				if (parent->out() || !parent->history()->peer->chat) {
+					_minh += st::msgPadding.top();
+				}
+				_minh += st::msgServiceNameFont->height;
 			}
-			_minh += st::msgServiceNameFont->height;
 		}
 	}
 	_height = _minh;
@@ -2881,7 +2883,7 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected
 	}
 
 	const HistoryReply *reply = toHistoryReply(parent);
-	const HistoryForwarded *fwd = reply ? 0 : toHistoryForwarded(parent);
+	const HistoryForwarded *fwd = (reply || data->song()) ? 0 : toHistoryForwarded(parent);
 	int skipy = 0, replyFrom = 0, fwdFrom = 0;
 	if (reply) {
 		skipy = st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom();
@@ -2949,14 +2951,14 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected
 		QRect img;
 		if (data->status == FileFailed) {
 			statusText = lang(lng_attach_failed);
-			img = out ? st::mediaAudioOutImg : st::mediaAudioInImg;
+			img = out ? st::mediaMusicOutImg : st::mediaMusicInImg;
 		} else if (data->status == FileUploading) {
 			if (_uplTextCache.isEmpty() || _uplDone != data->uploadOffset) {
 				_uplDone = data->uploadOffset;
 				_uplTextCache = formatDownloadText(_uplDone, data->size);
 			}
 			statusText = _uplTextCache;
-			img = out ? st::mediaAudioOutImg : st::mediaAudioInImg;
+			img = out ? st::mediaMusicOutImg : st::mediaMusicInImg;
 		} else if (already || hasdata) {
 			bool showPause = false;
 			if (playing.msgId == parent->id && !(playingState & AudioPlayerStoppedMask) && playingState != AudioPlayerFinishing) {
@@ -2978,7 +2980,7 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected
 			} else {
 				statusText = _size;
 			}
-			img = out ? st::mediaAudioOutImg : st::mediaAudioInImg;
+			img = out ? st::mediaMusicOutImg : st::mediaMusicInImg;
 		}
 
 		p.drawPixmap(QPoint(st::mediaPadding.left(), skipy + st::mediaPadding.top()), App::sprite(), img);
@@ -3073,14 +3075,14 @@ void HistoryDocument::drawInPlaylist(QPainter &p, const HistoryItem *parent, boo
 		QRect img;
 		if (data->status == FileFailed) {
 			statusText = lang(lng_attach_failed);
-			img = st::mediaAudioInImg;
+			img = st::mediaMusicInImg;
 		} else if (data->status == FileUploading) {
 			if (_uplTextCache.isEmpty() || _uplDone != data->uploadOffset) {
 				_uplDone = data->uploadOffset;
 				_uplTextCache = formatDownloadText(_uplDone, data->size);
 			}
 			statusText = _uplTextCache;
-			img = st::mediaAudioInImg;
+			img = st::mediaMusicInImg;
 		} else if (already || hasdata) {
 			bool isPlaying = (playing.msgId == parent->id);
 			bool showPause = false;
@@ -3103,7 +3105,7 @@ void HistoryDocument::drawInPlaylist(QPainter &p, const HistoryItem *parent, boo
 			} else {
 				statusText = _size;
 			}
-			img = st::mediaAudioInImg;
+			img = st::mediaMusicInImg;
 		}
 
 		p.drawPixmap(QPoint(st::mediaPadding.left(), st::mediaPadding.top()), App::sprite(), img);
@@ -3244,7 +3246,7 @@ void HistoryDocument::getState(TextLinkPtr &lnk, HistoryCursorState &state, int3
 	}
 
 	const HistoryReply *reply = toHistoryReply(parent);
-	const HistoryForwarded *fwd = reply ? 0 : toHistoryForwarded(parent);
+	const HistoryForwarded *fwd = (reply || data->song()) ? 0 : toHistoryForwarded(parent);
 	int skipy = 0, replyFrom = 0, fwdFrom = 0;
 	if (reply) {
 		skipy = st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom();