diff --git a/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp b/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp
index e91734b817..af11e45a23 100644
--- a/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp
@@ -1193,7 +1193,7 @@ void AuctionGotGiftsBox(
 		).append(' ').append(
 			helper.paletteDependent(
 				Text::CustomEmojiTextBadge(
-					'#' + QString::number(entry.position),
+					'#' + Lang::FormatCountDecimal(entry.position),
 					st::defaultTableSmallButton)));
 		AddTableRow(
 			table,
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index cb6b6b67e9..faeb4cee4a 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -3337,7 +3337,7 @@ void AddUpgradeGiftCover(
 	auto numberText = state->upgraded.value(
 	) | rpl::map([](const std::shared_ptr<Data::GiftUpgradeResult> &v) {
 		return (v && v->info.unique && v->info.unique->number > 0)
-			? u"#"_q + QString::number(v->info.unique->number)
+			? u"#"_q + Lang::FormatCountDecimal(v->info.unique->number)
 			: QString();
 	});
 	AddUniqueGiftCover(container, std::move(gifts), {
diff --git a/Telegram/SourceFiles/boxes/star_gift_craft_box.cpp b/Telegram/SourceFiles/boxes/star_gift_craft_box.cpp
index 6fca4eeb83..e99aac74cb 100644
--- a/Telegram/SourceFiles/boxes/star_gift_craft_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_craft_box.cpp
@@ -1337,7 +1337,7 @@ void MakeCraftContent(
 		for (const auto &gift : gifts) {
 			if (gift.unique) {
 				cs->lostGifts.push_back({
-					.number = u"#%1"_q.arg(gift.unique->number),
+					.number = u"#"_q + Lang::FormatCountDecimal(gift.unique->number),
 				});
 			}
 		}
diff --git a/Telegram/SourceFiles/data/data_star_gift.cpp b/Telegram/SourceFiles/data/data_star_gift.cpp
index 4732d8c014..0c38b2d461 100644
--- a/Telegram/SourceFiles/data/data_star_gift.cpp
+++ b/Telegram/SourceFiles/data/data_star_gift.cpp
@@ -65,7 +65,7 @@ QString UniqueGiftName(const UniqueGift &gift) {
 }
 
 QString UniqueGiftName(const QString &title, int number) {
-	return title + u" #"_q + QString::number(number);
+	return title + u" #"_q + Lang::FormatCountDecimal(number);
 }
 
 QString UniqueGiftRarityText(UniqueGiftRarity type) {
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index 550aba6ccf..22ef7fe615 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -897,7 +897,7 @@ void GiftButton::paint(QPainter &p, float64 craftProgress) {
 				.text = (onsale
 					? tr::lng_gift_stars_on_sale(tr::now)
 					: (unique && (data.resale || pinned))
-					? ('#' + QString::number(unique->number))
+					? ('#' + Lang::FormatCountDecimal(unique->number))
 					: data.resale
 					? tr::lng_gift_stars_resale(tr::now)
 					: soldOut
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 37dfc6fa48..ab04d9b938 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -888,7 +888,7 @@ void CreditsRow::init() {
 		: _entry.postsSearch
 		? tr::lng_credits_box_history_entry_posts_search(tr::now)
 		: (_entry.giftUpgraded && _entry.uniqueGift && !isSpecial)
-		? u"%1 #%2"_q.arg(_entry.uniqueGift->title).arg(_entry.uniqueGift->number)
+		? u"%1 #%2"_q.arg(_entry.uniqueGift->title).arg(Lang::FormatCountDecimal(_entry.uniqueGift->number))
 		: ((!_entry.subscriptionUntil.isNull() && !isSpecial)
 			|| (_entry.giftResale && !isSpecial)
 			|| _entry.title.isEmpty())
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 59a6b3d614..aa8870a86b 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -1357,7 +1357,7 @@ void GenericCreditsEntryCover(
 			: Fn<void()>();
 		AddUniqueGiftCover(content, rpl::single(cover), {
 			.numberText = (uniqueGift->number > 0)
-				? rpl::single(u"#"_q + QString::number(uniqueGift->number))
+				? rpl::single(u"#"_q + Lang::FormatCountDecimal(uniqueGift->number))
 				: rpl::producer<QString>(),
 			.resalePrice = UniqueGiftResalePrice(e.uniqueGift, forceTon),
 			.resaleClick = resaleClick,