diff --git a/.gitignore b/.gitignore
index 8547c2aa0b..4da55962c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@ stage
 *.*~
 .idea/
 cmake-build-debug/
+*.qsb
 
 # Local configuration files
 settings.local.json
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e762a3cd59..5605619b9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@ project(Telegram
 
 if (APPLE)
     enable_language(OBJC OBJCXX)
+    set(QT_NO_PRIVATE_MODULE_WARNING ON)
 endif()
 
 if (configuration_types_init
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 97d4616625..787e2a9c33 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -569,7 +569,7 @@ OverlayWidget::PipWrap::PipWrap(
 }
 
 OverlayWidget::OverlayWidget()
-: _wrap(std::make_unique<Ui::GL::Window>())
+: _wrap(std::make_unique<Ui::GL::Window>(Ui::GL::Window::Translucent::Yes))
 , _window(_wrap->window())
 , _helper(Platform::CreateOverlayWidgetHelper(_window.get(), [=](bool maximized) {
 	toggleFullScreen(maximized);
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 36c8954c5d..ed8e14eb19 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -452,7 +452,9 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 3128a5b5879c450f686f240cc9602ad7f4a054b4
+    git checkout 4e7cec08c34155d7f38d3bd9a94f19ecadf784e6
+mac:
+    git clone https://github.com/desktop-app/qt6_highsierra_patches.git qt6_highsierra
 """)
 
 stage('msys64', """
@@ -1588,6 +1590,9 @@ else: # qt > '6'
 depends:patches/qtbase_""" + qt + """/*.patch
 mac:
     find $PWD/../patches/qtbase_$QT -type f -print0 | sort -z | xargs -0 git -C qtbase apply -v
+    if [ -d "../patches/qt6_highsierra" ]; then
+        find "$PWD/../patches/qt6_highsierra" -maxdepth 1 -name "*.patch" -print0 | sort -z | xargs -0 git -C qtbase apply -v
+    fi
     sed -i.bak 's/tqtc-//' {qtimageformats,qtsvg}/dependencies.yaml
 
     CONFIGURATIONS=-debug
@@ -1600,6 +1605,7 @@ mac:
         -opensource \
         -confirm-license \
         -static \
+        -no-framework \
         -opengl desktop \
         -no-openssl \
         -securetransport \
@@ -1607,9 +1613,12 @@ mac:
         -I "$USED_PREFIX/include" \
         -no-feature-futimens \
         -no-feature-brotli \
+        -no-feature-cxx17_filesystem \
         -platform macx-clang -- \
         -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
-        -DCMAKE_PREFIX_PATH="$USED_PREFIX"
+        -DCMAKE_PREFIX_PATH="$USED_PREFIX" \
+        -DQT_NO_HANDLE_APPLE_SINGLE_ARCH_CROSS_COMPILING=OFF \
+        -DQT_SYNC_HEADERS_AT_CONFIGURE_TIME=ON
 
     cmake --build .
     cmake --install .
diff --git a/Telegram/build/qt_version.py b/Telegram/build/qt_version.py
index 28a3a859eb..8bac35cd5e 100644
--- a/Telegram/build/qt_version.py
+++ b/Telegram/build/qt_version.py
@@ -2,7 +2,7 @@ import sys, os
 
 def resolve(arch):
     if sys.platform == 'darwin':
-        os.environ['QT'] = '6.2.13'
+        os.environ['QT'] = '6.11.1'
     elif sys.platform == 'win32':
         if arch == 'arm' or 'qt6' in sys.argv:
             print('Choosing Qt 6.')
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index d99a9b31d0..95f030f143 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit d99a9b31d0ca4a6111f8386894c8e51f9c4aa6e2
+Subproject commit 95f030f1437b30bbfd46d9489b86d523e5d05214
diff --git a/cmake b/cmake
index 4088db229d..0e6776d008 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 4088db229d9132e1ff2e6758ad7ae28e5116fea6
+Subproject commit 0e6776d008573330edc953884b2c12325997d35c