diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
index 1e2e29e1add7d8..4ae84ffcc662e8 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -1612,7 +1612,7 @@ void Panel::initLayout() {
 #ifndef Q_OS_MAC
 	_controls->wrap.raise();
 
-	Ui::Platform::TitleControlsLayoutChanged(
+	_controls->controls.layout().changes(
 	) | rpl::start_with_next([=] {
 		// _menuToggle geometry depends on _controls arrangement.
 		crl::on_main(widget(), [=] { updateControlsGeometry(); });
diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
index 94e44cb997832a..159c8795fe81a4 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
@@ -1259,7 +1259,8 @@ void Pip::setupButtons() {
 			rect.y(),
 			volumeToggleWidth,
 			volumeToggleHeight);
-		if (!Ui::Platform::TitleControlsOnLeft()) {
+		using Ui::Platform::TitleControlsLayout;
+		if (!TitleControlsLayout::Create()->current().onLeft()) {
 			_close.area.moveLeft(rect.x()
 				+ rect.width()
 				- (_close.area.x() - rect.x())
diff --git a/Telegram/SourceFiles/platform/platform_overlay_widget.cpp b/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
index 63e1de58890a10..3e07e8b9711b56 100644
--- a/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
+++ b/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
@@ -224,11 +224,9 @@ rpl::producer<> DefaultOverlayWidgetHelper::controlsActivations() {
 }
 
 rpl::producer<bool> DefaultOverlayWidgetHelper::controlsSideRightValue() {
-	using namespace Ui::Platform;
-
-	return TitleControlsLayoutValue(
-	) | rpl::map([=](const TitleControls::Layout &layout) {
-		return !TitleControlsOnLeft(layout);
+	return _controls->controls.layout().value(
+	) | rpl::map([=](const auto &layout) {
+		return !layout.onLeft();
 	}) | rpl::distinct_until_changed();
 }
 
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 81056e33acd7a4..70918d74b40d0e 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 81056e33acd7a44ba2a4537101753b728907c1cd
+Subproject commit 70918d74b40d0ea82c194ca16583cfacc648076b
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 68864f644d7f3c..88c76eccb2a709 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 68864f644d7f3c01d3d6923b51ba0370466e0d84
+Subproject commit 88c76eccb2a709f1d16b2aebbc343fad2a1837e0