diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 90344288b1..ae204cc77c 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -891,7 +891,7 @@ pollResultsShowMore: SettingsButton(defaultSettingsButton) {
 	textBg: windowBg;
 	textBgOver: windowBgOver;
 
-	font: semiboldFont;
+	style: semiboldTextStyle;
 
 	height: 20px;
 	padding: margins(71px, 10px, 8px, 8px);
@@ -905,7 +905,11 @@ inviteViaLinkButton: SettingsButton(defaultSettingsButton) {
 	textBg: windowBg;
 	textBgOver: windowBgOver;
 
-	font: font(14px semibold);
+	style: TextStyle(defaultTextStyle) {
+		font: font(14px semibold);
+		linkFont: font(14px semibold);
+		linkFontOver: font(14px semibold underline);
+	}
 
 	height: 20px;
 	padding: margins(74px, 8px, 8px, 9px);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 5586689f3a..198b49f9cd 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -1694,8 +1694,8 @@ object_ptr<Ui::SettingsButton> EditPeerInfoBox::CreateButton(
 	) | rpl::map([&st](const QString &text, const QString &count, int width) {
 		const auto available = width
 			- st.button.padding.left()
-			- (st.button.font->spacew * 2)
-			- st.button.font->width(text)
+			- (st.button.style.font->spacew * 2)
+			- st.button.style.font->width(text)
 			- st.labelPosition.x();
 		const auto required = st.label.style.font->width(count);
 		return (required > available)
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 32e23d3013..8722d69c5b 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -750,7 +750,7 @@ groupCallAddMember: SettingsButton(defaultSettingsButton) {
 	textBg: groupCallMembersBg;
 	textBgOver: groupCallMembersBgOver;
 
-	font: semiboldFont;
+	style: semiboldTextStyle;
 
 	height: 22px;
 	padding: margins(63px, 17px, 22px, 11px);
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index b382b88d31..b1829c48d8 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -379,7 +379,7 @@ infoProfileToggleOver: Toggle(infoProfileToggle) {
 	untoggledFg: menuIconFgOver;
 }
 infoProfileButton: SettingsButton(defaultSettingsButton) {
-	font: normalFont;
+	style: defaultTextStyle;
 
 	padding: margins(79px, 10px, 8px, 8px);
 	iconLeft: 22px;
@@ -394,7 +394,7 @@ infoNotificationsButton: SettingsButton(infoProfileButton) {
 infoMainButton: SettingsButton(infoProfileButton) {
 	textFg: lightButtonFg;
 	textFgOver: lightButtonFgOver;
-	font: semiboldFont;
+	style: semiboldTextStyle;
 }
 infoSharedMediaCoverHeight: 62px;
 infoSharedMediaButton: infoProfileButton;
@@ -843,7 +843,7 @@ inviteLinkCreate: SettingsButton(defaultSettingsButton) {
 	textBg: windowBg;
 	textBgOver: windowBgOver;
 
-	font: semiboldFont;
+	style: semiboldTextStyle;
 
 	height: 20px;
 	padding: margins(60px, 7px, 12px, 5px);
diff --git a/Telegram/SourceFiles/passport/passport.style b/Telegram/SourceFiles/passport/passport.style
index a0d422282f..a652fe8bc0 100644
--- a/Telegram/SourceFiles/passport/passport.style
+++ b/Telegram/SourceFiles/passport/passport.style
@@ -126,7 +126,7 @@ passportUploadButton: SettingsButton(defaultSettingsButton) {
 	textBg: windowBg;
 	textBgOver: windowBgOver;
 
-	font: semiboldFont;
+	style: semiboldTextStyle;
 
 	height: 18px;
 	padding: margins(22px, 14px, 22px, 12px);
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 15edee1584..58558bf48a 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -11,7 +11,7 @@ using "info/info.style";
 using "boxes/boxes.style";
 
 settingsButton: SettingsButton(infoProfileButton) {
-	font: boxTextFont;
+	style: boxTextStyle;
 	padding: margins(60px, 10px, 22px, 10px);
 	iconLeft: 20px;
 }
@@ -267,7 +267,11 @@ settingsDeviceName: InputField(defaultInputField) {
 }
 
 dictionariesSectionButton: SettingsButton(settingsUpdateToggle) {
-	font: font(14px semibold);
+	style: TextStyle(defaultTextStyle) {
+		font: font(14px semibold);
+		linkFont: font(14px semibold);
+		linkFontOver: font(14px semibold underline);
+	}
 }
 
 sessionsScroll: boxScroll;
diff --git a/Telegram/SourceFiles/settings/settings_common.cpp b/Telegram/SourceFiles/settings/settings_common.cpp
index 8dfc2f8317..7904a97972 100644
--- a/Telegram/SourceFiles/settings/settings_common.cpp
+++ b/Telegram/SourceFiles/settings/settings_common.cpp
@@ -216,7 +216,7 @@ void CreateRightLabel(
 		const auto available = width
 			- st.padding.left()
 			- st.padding.right()
-			- st.font->width(button)
+			- st.style.font->width(button)
 			- st::settingsButtonRightSkip;
 		name->setText(text);
 		name->resizeToNaturalWidth(available);
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 35a5114b4a..6c59db50db 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -133,7 +133,7 @@ mainMenu: Menu(defaultMenu) {
 	itemToggleShift: 11px;
 }
 mainMenuButton: SettingsButton(defaultSettingsButton) {
-	font: semiboldFont;
+	style: semiboldTextStyle;
 	padding: margins(61px, 11px, 20px, 9px);
 	toggleSkip: 19px;
 	iconLeft: 21px;
@@ -230,7 +230,7 @@ createThemeImportButton: SettingsButton(defaultSettingsButton) {
 	textBg: windowBg;
 	textBgOver: windowBgOver;
 
-	font: semiboldFont;
+	style: semiboldTextStyle;
 
 	height: 20px;
 	padding: margins(22px, 10px, 22px, 8px);
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index fd1a033b60..5fcd670939 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -197,8 +197,9 @@ void AddUnreadBadge(
 				padding.right(),
 				(outer.height() - inner.height()) / 2,
 				outer.width());
-			padding.setRight(
-				padding.right() + inner.width() + button->st().font->spacew);
+			padding.setRight(padding.right()
+				+ inner.width()
+				+ button->st().style.font->spacew);
 		}
 		button->setPaddingOverride(padding);
 	}, state->widget.lifetime());
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 1ba9270234..8415f7058c 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 1ba9270234db8cbe8badbe6f6fbaea0a5869e28d
+Subproject commit 8415f7058c83178d19150a76a7a865a3d1da5916