diff --git a/cmake/OmimHelpers.cmake b/cmake/OmimHelpers.cmake
index 4dad95eed6..d4afa851de 100644
--- a/cmake/OmimHelpers.cmake
+++ b/cmake/OmimHelpers.cmake
@@ -4,6 +4,10 @@ include(OmimConfig)
 function(omim_add_executable executable)
   add_executable(${executable} ${ARGN})
 
+  if (PLATFORM_WIN)
+    target_sources(${executable} PRIVATE "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/windows/OrganicMaps.manifest")
+  endif()
+
   # Enable warnings for all our binaries.
   target_compile_options(${executable} PRIVATE ${OMIM_WARNING_FLAGS})
   target_include_directories(${executable} SYSTEM PRIVATE ${3PARTY_INCLUDE_DIRS})
diff --git a/cmake/windows/OrganicMaps.manifest b/cmake/windows/OrganicMaps.manifest
new file mode 100644
index 0000000000..c589bed88e
--- /dev/null
+++ b/cmake/windows/OrganicMaps.manifest
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+  <assemblyIdentity
+    name="org.organicmaps.organicmaps"
+    version="1.0.0.0"
+    processorArchitecture="*"
+    type="win32"
+  />
+
+  <!-- Declare support for various versions of Windows -->
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 and Windows 11 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <!-- Force the current process to use UTF-8 as the process code page -->
+      <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+      <!-- Enable long paths that exceed MAX_PATH in length -->
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+    </windowsSettings>
+  </application>
+</assembly>
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index 2dc9c6eef0..f1fb4c66b4 100644
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -192,6 +192,10 @@ if (PLATFORM_MAC)
   )
 endif()
 
+if (PLATFORM_WIN)
+  target_sources(${PROJECT_NAME} PRIVATE res/windows.rc)
+endif()
+
 if (BUILD_DESIGNER)
   execute_process(
     COMMAND cp -rf ${OMIM_ROOT}/data/resources-mdpi_light/ ${OMIM_ROOT}/data/resources-mdpi_design/
diff --git a/qt/MapsWithMe.manifest b/qt/MapsWithMe.manifest
deleted file mode 100644
index 2f99a7ec86..0000000000
--- a/qt/MapsWithMe.manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
-<dependency>
-<dependentAssembly>
-<assemblyIdentity type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*' />
-</dependentAssembly>
-</dependency>
-</assembly>
\ No newline at end of file
diff --git a/qt/res/windows.ico b/qt/res/windows.ico
index ddb4eabffb..d1838e173c 100644
Binary files a/qt/res/windows.ico and b/qt/res/windows.ico differ