diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index 30d052b8a..d99705f21 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -225,7 +225,7 @@ void BadgeView::move(int left, int top, int bottom) {
 	const auto badgeLeft = left + skip;
 	const auto badgeTop = top
 		+ (star
-			? st::infoVerifiedCheckPosition.y()
+			? _st.position.y()
 			: (bottom - top - _view->height()) / 2);
 	_view->moveToLeft(badgeLeft, badgeTop);
 }
@@ -236,11 +236,11 @@ void EmojiStatusPanel::show(
 	if (!_panel) {
 		create(controller);
 
-		using namespace rpl::mappers;
+		const auto weak = Ui::MakeWeak(button.get());
 		_panel->shownValue(
-		) | rpl::filter(
-			!_1
-		) | rpl::start_with_next([=] {
+		) | rpl::filter([=](bool shown) {
+			return !shown && weak;
+		}) | rpl::start_with_next([=] {
 			button->removeEventFilter(_panel.get());
 		}, _panel->lifetime());
 	}
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 5f82bc462..8b7c8f4f6 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -185,7 +185,7 @@ settingsInfoPhotoSkip: 7px;
 settingsInfoNameSkip: -1px;
 settingsInfoUploadLeft: 6px;
 settingsInfoPeerBadge: InfoPeerBadge {
-	verified: icon {{ "dialogs/dialogs_premium", dialogsVerifiedIconBg }};
+	premium: icon {{ "dialogs/dialogs_premium", dialogsVerifiedIconBg }};
 	sizeTag: 0; // Normal
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index b8307e3db..387050202 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -156,7 +156,10 @@ ComposedBadge::ComposedBadge(
 			buttonSize.width() - st.padding.right() - finalTextRight,
 			buttonSize.height());
 
-		_badge.move(0, 0, buttonSize.height());
+		_badge.move(
+			0,
+			st.padding.top(),
+			buttonSize.height() - st.padding.top());
 		if (_unread) {
 			_unread->moveToRight(
 				0,