diff --git a/qad/QADDeploy.cmake b/qad/QADDeploy.cmake
index 8e6039b..1d05faf 100644
--- a/qad/QADDeploy.cmake
+++ b/qad/QADDeploy.cmake
@@ -208,12 +208,12 @@ macro(deploy_target _T)
 			COMMAND mkdir -p ${_AGD}/DEBIAN
 			COMMAND mkdir -p ${_AGD}/usr/bin
 			COMMAND mkdir -p ${_AGD}/usr/lib
-			COMMAND mkdir -p ${_AGD}/usr/share/SHS
+			COMMAND mkdir -p ${_AGD}/usr/share/${${_T}_COMPANY}
 			COMMAND mkdir -p ${_AGD}/usr/share/pixmaps
 			COMMAND mkdir -p ${_AGD}/usr/share/applications
 			COMMAND cp -f ${_DEPLOY_DIR}/${_T} ${_AGD}/usr/bin
 			COMMAND cp -f ${_DEP_LIBS} ${_AGD}/usr/lib
-			COMMAND cp -r ${_DEPLOY_DIR}/lang ${_AGD}/usr/share/SHS
+			COMMAND cp -r ${_DEPLOY_DIR}/lang ${_AGD}/usr/share/${${_T}_COMPANY}
 			COMMAND cp -f ${_ICON_FN} ${_AGD}/usr/share/pixmaps
 
 			COMMAND echo "Package: ${_DEBNAME}" ${_C_echof}
@@ -234,7 +234,7 @@ macro(deploy_target _T)
 			COMMAND echo "GenericName=${${_T}_LABEL}" ${_D_echo}
 			COMMAND echo "Comment=${${_T}_INFO}" ${_D_echo}
 			COMMAND echo "Exec=/usr/bin/${_T}" ${_D_echo}
-			COMMAND echo "Icon=${_ICON_FN}" ${_D_echo}
+			COMMAND echo "Icon=/usr/share/pixmaps/${_ICON_NAME}" ${_D_echo}
 			COMMAND echo "Terminal=false" ${_D_echo}
 			COMMAND echo "StartupNotify=true" ${_D_echo}
 			#COMMAND echo "X-KDE-StartupNotify=true" ${_D_echo}
@@ -303,7 +303,7 @@ macro(deploy_target _T)
 			COMMAND mkdir -p ${_DEPLOY_DIR}/lang
 			COMMAND mkdir -p ${_DESTINATION}
 			COMMAND cp ${_ICON_FN} ${_AGD}/Contents/Resources
-			COMMAND cp -r ${_DEPLOY_DIR}/lang ${_AGD}/Contents/MacOS
+			COMMAND cp -r ${_DEPLOY_DIR}/lang ${_AGD}/Contents/Resources
 			COMMAND deploy_tool -M "${CMAKE_OTOOL}" -P cocoa -S mac -q ${Qt5_ROOT} -s "\"${CMAKE_PREFIX_PATH}/lib;${DEPLOY_ADD_LIBPATH}${_DEP_LIBPATH}\"" -o ${_AGD}/Contents/Frameworks -p ${_AGD}/Contents/PlugIns ${_AGD}/Contents/MacOS/${_T}
 			# prepare dmg dir
 			COMMAND rm -rf ${_DMG}