diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index c9d14d1045..5ddc7b4293 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1142,8 +1142,6 @@ PRIVATE
     ui/image/image_location_factory.h
     ui/widgets/level_meter.cpp
     ui/widgets/level_meter.h
-    ui/widgets/multi_select.cpp
-    ui/widgets/multi_select.h
     ui/countryinput.cpp
     ui/countryinput.h
     ui/empty_userpic.cpp
diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.cpp b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
index 3cfdcdb5ea..d0b8e48367 100644
--- a/Telegram/SourceFiles/ui/widgets/multi_select.cpp
+++ b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
@@ -365,14 +365,14 @@ void Item::prepareCache() {
 	if (!_cache.isNull()) return;
 
 	Assert(!_visibility.animating());
-	auto cacheWidth = _width * kWideScale * cIntRetinaFactor();
-	auto cacheHeight = _st.height * kWideScale * cIntRetinaFactor();
+	auto cacheWidth = _width * kWideScale * style::DevicePixelRatio();
+	auto cacheHeight = _st.height * kWideScale * style::DevicePixelRatio();
 	auto data = QImage(
 		cacheWidth,
 		cacheHeight,
 		QImage::Format_ARGB32_Premultiplied);
 	data.fill(Qt::transparent);
-	data.setDevicePixelRatio(cRetinaFactor());
+	data.setDevicePixelRatio(style::DevicePixelRatio());
 	{
 		Painter p(&data);
 		paintOnce(
@@ -774,7 +774,9 @@ void MultiSelect::Inner::paintEvent(QPaintEvent *e) {
 	auto paintRect = e->rect();
 	p.fillRect(paintRect, _st.bg);
 
-	auto offset = QPoint(rtl() ? _st.padding.right() : _st.padding.left(), _st.padding.top());
+	auto offset = QPoint(
+		style::RightToLeft() ? _st.padding.right() : _st.padding.left(),
+		_st.padding.top());
 	p.translate(offset);
 	paintRect.translate(-offset);
 
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index d944f629a6..e31ccd77d4 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -221,6 +221,8 @@ PRIVATE
     ui/widgets/continuous_sliders.h
     ui/widgets/discrete_sliders.cpp
     ui/widgets/discrete_sliders.h
+    ui/widgets/multi_select.cpp
+    ui/widgets/multi_select.h
     ui/widgets/sent_code_field.cpp
     ui/widgets/sent_code_field.h
     ui/widgets/separate_panel.cpp