diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
index 3642561e4..060f99820 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
@@ -131,9 +131,8 @@ void SetupHeader(
 		) | rpl::start_with_next([animate = std::move(icon.animate)] {
 			animate(anim::repeat::once);
 		}, content->lifetime());
-
-		AddSkip(content);
 	}
+	AddSkip(content);
 
 	content->add(
 		object_ptr<Ui::CenterWrap<>>(
@@ -146,11 +145,14 @@ void SetupHeader(
 
 	{
 		const auto &st = st::settingLocalPasscodeDescription;
-		content->add(
+		const auto wrap = content->add(
 			object_ptr<Ui::CenterWrap<>>(
 				content,
 				object_ptr<Ui::FlatLabel>(content, std::move(about), st)),
 			st::changePhoneDescriptionPadding);
+		wrap->resize(
+			wrap->width(),
+			st::settingLocalPasscodeDescriptionHeight);
 	}
 }
 
@@ -254,7 +256,8 @@ void AddSkipInsteadOfError(not_null<Ui::VerticalLayout*> content) {
 		content,
 		tr::lng_language_name(tr::now),
 		st::settingLocalPasscodeError);
-	AddSkip(content, dummy->height());
+	const auto &padding = st::changePhoneDescriptionPadding;
+	AddSkip(content, dummy->height() + padding.top() + padding.bottom());
 	dummy = nullptr;
 }
 
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
index 298ca23da..49af9c6a1 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
@@ -167,8 +167,8 @@ void Input::setupContent() {
 		{
 			.name = u"cloud_password/password_input"_q,
 			.sizeOverride = {
-				st::changePhoneIconSize,
-				st::changePhoneIconSize
+				st::settingsCloudPasswordIconSize,
+				st::settingsCloudPasswordIconSize
 			},
 		},
 		st::settingLocalPasscodeIconPadding);
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index e507c9191..df137fc42 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -149,6 +149,7 @@ settingLocalPasscodeInputField: InputField(defaultInputField) {
 settingLocalPasscodeDescription: FlatLabel(changePhoneDescription) {
 	minWidth: 256px;
 }
+settingLocalPasscodeDescriptionHeight: 52px;
 settingLocalPasscodeError: FlatLabel(changePhoneError) {
 	minWidth: 256px;
 }