diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index d29dc9b87..211753337 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1281,9 +1281,20 @@ elseif (APPLE)
         target_link_libraries(Telegram PRIVATE desktop-app::external_iconv)
     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})
+    set(appicon_path ${CMAKE_CURRENT_SOURCE_DIR}/Telegram/Images.xcassets/Icon.iconset)
+
+    add_custom_command(
+        OUTPUT AppIcon.icns
+        COMMAND iconutil
+        ARGS
+            --convert icns
+            --output AppIcon.icns
+            ${appicon_path}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+
+    set_source_files_properties(AppIcon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+    target_sources(Telegram PRIVATE AppIcon.icns)
 
     set(lang_packs
         en
diff --git a/Telegram/Telegram.plist.in b/Telegram/Telegram.plist.in
index f9ed6212a..5e67416b7 100644
--- a/Telegram/Telegram.plist.in
+++ b/Telegram/Telegram.plist.in
@@ -6,6 +6,10 @@
 	<string>@output_name@</string>
 	<key>CFBundleGetInfoString</key>
 	<string>Telegram Desktop messaging app</string>
+	<key>CFBundleIconFile</key>
+	<string>AppIcon</string>
+	<key>CFBundleIconName</key>
+	<string>AppIcon</string>
 	<key>CFBundleIdentifier</key>
 	<string>@bundle_identifier@</string>
 	<key>CFBundlePackageType</key>
@@ -20,7 +24,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>CFBundleURLIconFile</key>
-			<string>Icon.icns</string>
+			<string>AppIcon</string>
 			<key>CFBundleURLName</key>
 			<string>@bundle_identifier@</string>
 			<key>CFBundleURLSchemes</key>