diff --git a/qad/blockview/blockeditor/CMakeLists.txt b/qad/blockview/blockeditor/CMakeLists.txt
index b003eff..d69d9d8 100644
--- a/qad/blockview/blockeditor/CMakeLists.txt
+++ b/qad/blockview/blockeditor/CMakeLists.txt
@@ -1,8 +1,26 @@
 project(blockeditor)
+import_version(${PROJECT_NAME} QAD)
 find_qt(${QtVersions} Core Gui Widgets)
+if (Qt5_FOUND)
+	import_version(${PROJECT_NAME}5 ${PROJECT_NAME})
+	import_deploy_properties(${PROJECT_NAME}5 ${PROJECT_NAME})
+endif()
+set_deploy_property(${PROJECT_NAME}
+		LABEL 		${PROJECT_NAME}
+		FULLNAME 	"${_QAD_DOMAIN}.${PROJECT_NAME}"
+		COMPANY 	${_QAD_COMPANY}
+		INFO 		"Editor for BlockView Blocks")
+if(APPLE)
+	#set_deploy_property(${PROJECT_NAME} ICON "icons/blockview.icns")
+elseif(WIN32)
+	set_deploy_property(${PROJECT_NAME} ICON "icons/blockview.ico")
+else()
+	set_deploy_property(${PROJECT_NAME} ICON "icons/blockview.png")
+endif()
+make_rc(${PROJECT_NAME} out_RC)
 qt_sources(SRC)
-qt_wrap(${SRC} CPPS out_CPP QMS out_QM)
-qt_add_executable(${PROJECT_NAME} WIN32 out_CPP)
+qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
+qt_add_executable(${PROJECT_NAME} WIN32 out_CPP ${out_RC})
 qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_blockview)
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
@@ -18,5 +36,7 @@ if(LIB)
 	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 else()
 	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-	#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
+endif()
+if (Qt5_FOUND)
+	deploy_target(${PROJECT_NAME}5 VERBOSE DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../release)
 endif()
diff --git a/qad/blockview/blockeditor/icons/blockview.png b/qad/blockview/blockeditor/icons/blockview.png
new file mode 100644
index 0000000..44f65d7
Binary files /dev/null and b/qad/blockview/blockeditor/icons/blockview.png differ
diff --git a/qad/blockview/blockeditor/resource_win_icon.rc b/qad/blockview/blockeditor/resource_win_icon.rc
deleted file mode 100644
index 09b2a10..0000000
--- a/qad/blockview/blockeditor/resource_win_icon.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-# if defined(UNDER_CE)
-#  include <winbase.h>
-# else
-#  include <winver.h>
-# endif
-
-1 ICON icons/blockview.ico
-
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION 1,0,0,0
-PRODUCTVERSION 1,0,0,0
-FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
-FILEFLAGS 0x9L
-#else
-FILEFLAGS 0x8L
-#endif
-FILEOS 0x40004L
-FILETYPE 0x2L
-FILESUBTYPE 0x0L
-BEGIN
-BLOCK "StringFileInfo"
-BEGIN
-BLOCK "040904b0"
-BEGIN
-VALUE "Comments", "\0"
-VALUE "CompanyName", "BMSTU SM5\0"
-VALUE "FileDescription", "Block Editor\0"
-VALUE "FileVersion", "1,0,0,0\0"
-VALUE "InternalName", "Block Editor\0"
-VALUE "LegalTrademarks", "\0"
-VALUE "OriginalFilename", "blockeditor.exe\0"
-VALUE "PrivateBuild", "1\0"
-VALUE "ProductName", "Block Editor\0"
-VALUE "ProductVersion", "1, 0, 0, 0\0"
-VALUE "SpecialBuild", "\0"
-END
-END
-BLOCK "VarFileInfo"
-BEGIN
-VALUE "Translation", 0x409, 1200
-END
-END