diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 0d236abb26..301d5b384e 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -189,6 +189,7 @@ infoLayerTopBarBack: IconButton(infoTopBarBack) {
 	rippleAreaPosition: point(6px, 8px);
 }
 infoLayerTopBarMediaCancel: IconButton(infoLayerTopBarBack) {
+	width: 48px;
 	icon: icon {{ "info/info_close", boxTitleCloseFg }};
 	iconOver: icon {{ "info/info_close", boxTitleCloseFgOver }};
 }
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 38c6ae5896..45c88b180b 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -183,6 +183,7 @@ settingsBioCountdown: FlatLabel(defaultFlatLabel) {
 }
 
 settingsCoverName: FlatLabel(defaultFlatLabel) {
+	maxHeight: 24px;
 	style: TextStyle(defaultTextStyle) {
 		font: font(17px semibold);
 		linkFont: font(17px semibold);
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index 644d376ac8..092194dcf5 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -190,12 +190,12 @@ void SetupPhoto(
 	rpl::combine(
 		wrap->widthValue(),
 		photo->widthValue(),
-		name->widthValue(),
+		Info::Profile::NameValue(self),
 		status->widthValue()
 	) | rpl::start_with_next([=](
 			int max,
 			int photoWidth,
-			int nameWidth,
+			const TextWithEntities&,
 			int statusWidth) {
 		photo->moveToLeft(
 			(max - photoWidth) / 2,
@@ -206,8 +206,10 @@ void SetupPhoto(
 				- upload->width()
 				+ st::settingsInfoUploadLeft),
 			photo->y() + photo->height() - upload->height());
+		const auto skip = st::settingsButton.iconLeft;
+		name->resizeToNaturalWidth(max - 2 * skip);
 		name->moveToLeft(
-			(max - nameWidth) / 2,
+			(max - name->width()) / 2,
 			(photo->y() + photo->height() + st::settingsInfoPhotoSkip));
 		status->moveToLeft(
 			(max - statusWidth) / 2,