diff --git a/CMakeLists.txt b/CMakeLists.txt
index f54eae1366..15fda19810 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,7 @@ include(cmake/init_target.cmake)
 include(cmake/generate_target.cmake)
 include(cmake/nuget.cmake)
 include(cmake/validate_d3d_compiler.cmake)
+include(cmake/target_prepare_qrc.cmake)
 
 include(cmake/options.cmake)
 
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 7e3a0c64c1..2c805bd45b 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -50,7 +50,8 @@ if (WIN32)
     nuget_add_winrt(Telegram)
 endif()
 
-set_target_properties(Telegram PROPERTIES AUTOMOC ON AUTORCC ON)
+set_target_properties(Telegram PROPERTIES AUTOMOC ON)
+target_prepare_qrc(Telegram)
 
 target_link_libraries(Telegram
 PRIVATE
@@ -1249,8 +1250,7 @@ elseif (APPLE)
     endif()
 
     set(icons_path ${CMAKE_CURRENT_SOURCE_DIR}/Telegram/Images.xcassets)
-    set_target_properties(Telegram PROPERTIES RESOURCE ${icons_path})
-    target_sources(Telegram PRIVATE ${icons_path})
+    target_add_resource(Telegram ${icons_path})
 
     set(lang_packs
         en
@@ -1276,6 +1276,8 @@ elseif (APPLE)
         PRE_LINK
             COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Frameworks
             COMMAND cp $<TARGET_FILE:Updater> $<TARGET_FILE_DIR:Telegram>/../Frameworks/
+            COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Resources
+            COMMAND cp ${CMAKE_BINARY_DIR}/lib_ui.rcc $<TARGET_FILE_DIR:Telegram>/../Resources
         )
         if (NOT DESKTOP_APP_DISABLE_CRASH_REPORTS)
             add_custom_command(TARGET Telegram
diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 1a4316cd6e..ac6409a418 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/sandbox.h"
 
 #include "base/platform/base_platform_info.h"
+#include "base/base_file_utilities.h"
 #include "platform/platform_specific.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
@@ -93,6 +94,8 @@ Sandbox::Sandbox(
 }
 
 int Sandbox::start() {
+	base::RegisterBundledResources(u"Telegram.rcc"_q);
+
 	if (!Core::UpdaterDisabled()) {
 		_updateChecker = std::make_unique<Core::UpdateChecker>();
 	}
diff --git a/Telegram/lib_base b/Telegram/lib_base
index e7c6100ad8..60ec2972a8 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit e7c6100ad8cfee911bdc850b5a5ccb19fb8a9122
+Subproject commit 60ec2972a808225458946d044900559556218ca6
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index efdb990d96..f51ff6b513 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit efdb990d96b7cb5d962a5aa76bccd4e41aa145b0
+Subproject commit f51ff6b5131b64b31ad9f84e359517687a35a3f3
diff --git a/cmake b/cmake
index 16224afddd..faf815fee0 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 16224afddd0fef0cd226a531582f5dda108aa9d4
+Subproject commit faf815fee0da46e8df09cd81cbfaa7bc30f842aa