diff --git a/Telegram/Resources/icons/chat/input_gift.png b/Telegram/Resources/icons/chat/input_gift.png
new file mode 100644
index 0000000000..c1f42e5e84
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_gift.png differ
diff --git a/Telegram/Resources/icons/chat/input_gift@2x.png b/Telegram/Resources/icons/chat/input_gift@2x.png
new file mode 100644
index 0000000000..79bacc11a5
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_gift@2x.png differ
diff --git a/Telegram/Resources/icons/chat/input_gift@3x.png b/Telegram/Resources/icons/chat/input_gift@3x.png
new file mode 100644
index 0000000000..83f17c0b99
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_gift@3x.png differ
diff --git a/Telegram/Resources/icons/settings/mini_gift.png b/Telegram/Resources/icons/settings/mini_gift.png
new file mode 100644
index 0000000000..6e1f566065
Binary files /dev/null and b/Telegram/Resources/icons/settings/mini_gift.png differ
diff --git a/Telegram/Resources/icons/settings/mini_gift@2x.png b/Telegram/Resources/icons/settings/mini_gift@2x.png
new file mode 100644
index 0000000000..7a5e301e1a
Binary files /dev/null and b/Telegram/Resources/icons/settings/mini_gift@2x.png differ
diff --git a/Telegram/Resources/icons/settings/mini_gift@3x.png b/Telegram/Resources/icons/settings/mini_gift@3x.png
new file mode 100644
index 0000000000..d34d1b6dea
Binary files /dev/null and b/Telegram/Resources/icons/settings/mini_gift@3x.png differ
diff --git a/Telegram/SourceFiles/api/api_global_privacy.h b/Telegram/SourceFiles/api/api_global_privacy.h
index fe35c7df5c..7346f2ff00 100644
--- a/Telegram/SourceFiles/api/api_global_privacy.h
+++ b/Telegram/SourceFiles/api/api_global_privacy.h
@@ -25,10 +25,10 @@ enum class UnarchiveOnNewMessage {
 };
 
 enum class DisallowedGiftType : uchar {
-	Premium   = 0x01,
+	Limited   = 0x01,
 	Unlimited = 0x02,
-	Limited   = 0x04,
-	Unique    = 0x08,
+	Unique    = 0x04,
+	Premium   = 0x08,
 	SendHide  = 0x10,
 };
 inline constexpr bool is_flag_type(DisallowedGiftType) { return true; }
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 809f2eeace..9c0369d1c8 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -1132,8 +1132,8 @@ historyScheduledToggle: IconButton(historyAttach) {
 	};
 }
 historyGiftToUser: IconButton(historyAttach) {
-	icon: icon {{ "menu/gift_premium", historyComposeIconFg }};
-	iconOver: icon {{ "menu/gift_premium", historyComposeIconFgOver }};
+	icon: icon {{ "chat/input_gift", historyComposeIconFg }};
+	iconOver: icon {{ "chat/input_gift", historyComposeIconFgOver }};
 }
 
 historyAttachEmojiInner: IconButton(historyAttach) {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index da5b538d81..f5d2868148 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -3044,6 +3044,7 @@ void HistoryWidget::refreshSendGiftToggle() {
 		&& !user->isSelf()
 		&& !user->isBot()
 		&& ((disallowed & Type::SendHide)
+			|| (session().user()->disallowedGiftTypes() & Type::SendHide)
 			|| Data::IsBirthdayToday(user->birthday()))
 		&& ((disallowed & all) != all);
 	if (!_giftToUser && has) {
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 22dee0c6f0..3e199f2588 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -686,6 +686,6 @@ settingsChatLinkField: InputField(defaultInputField) {
 settingsQuickDialogActionsTriggerFont: font(11px);
 
 settingsGiftIconEmoji: IconEmoji {
-	icon: icon{{ "menu/gift_premium", windowFg }};
-	padding: margins(0px, 1px, 0px, 0px);
+	icon: icon{{ "settings/mini_gift", windowFg }};
+	padding: margins(1px, 2px, 1px, 0px);
 }
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index 00a09723fb..c64c2c5ccc 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -1734,8 +1734,8 @@ object_ptr<Ui::RpWidget> GiftsAutoSavePrivacyController::setupBelowWidget(
 		content,
 		tr::lng_edit_privacy_gifts_types());
 	const auto types = base::flat_map<Type, rpl::producer<QString>>{
-		{ Type::Unlimited, tr::lng_edit_privacy_gifts_unlimited() },
 		{ Type::Limited, tr::lng_edit_privacy_gifts_limited() },
+		{ Type::Unlimited, tr::lng_edit_privacy_gifts_unlimited() },
 		{ Type::Unique, tr::lng_edit_privacy_gifts_unique() },
 		{ Type::Premium, tr::lng_edit_privacy_gifts_premium() },
 	};