diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index fc544b3d4..e1d9d77f5 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -134,22 +134,25 @@ ComposedBadge::ComposedBadge(
 		}
 	}, lifetime());
 
+	auto textWidth = _text.value() | rpl::map([=] {
+		return button->fullTextWidth();
+	});
 	rpl::combine(
 		_unreadWidth.events_starting_with(_unread ? _unread->width() : 0),
 		_premiumWidth.events_starting_with(_badge.widget()
 			? _badge.widget()->width()
 			: 0),
-		_text.value(),
+		std::move(textWidth),
 		button->sizeValue()
 	) | rpl::start_with_next([=](
 			int unreadWidth,
 			int premiumWidth,
-			const QString &text,
+			int textWidth,
 			const QSize &buttonSize) {
 		const auto &st = button->st();
 		const auto skip = st.style.font->spacew;
 		const auto textRightPosition = st.padding.left()
-			+ st.style.font->width(text)
+			+ textWidth
 			+ skip;
 		const auto minWidth = unreadWidth + premiumWidth + skip;
 		const auto maxTextWidth = buttonSize.width()
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index f450dcf2c..9ab11ccb3 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit f450dcf2c5fa1dfa0ad1fda483421c6548ff4fbb
+Subproject commit 9ab11ccb36b7d03a3a24ebcd18d2f13b03fc3682