fix addons resources

diff --git a/scripts/install_addon b/scripts/install_addon
index 6072b98b0c..2089b70b14 100755
--- a/scripts/install_addon
+++ b/scripts/install_addon
@@ -42,31 +42,43 @@ if [ -f ${ADDON_INSTALL_DIR}/${PKG_ADDON_ID}-${ADDONVER}.zip ]; then
   fi
 fi

+cd ${ADDON_BUILD}/${PKG_ADDON_ID}
+
+# fix resources
+ADDON_ICON=$(xmlstarlet sel -t -v "//addon/extension/assets/icon"     addon.xml || :)
+ADDON_FANART=$(xmlstarlet sel -t -v "//addon/extension/assets/fanart" addon.xml || :)
+
+if [[ -n ${ADDON_ICON} ]] && [[ ${ADDON_ICON} != resources/* ]]; then
+  rm -f resources/icon.png
+  mv ${ADDON_ICON} resources
+  xmlstarlet ed -L -u "//addon/extension/assets/icon" -v "resources/${ADDON_ICON}" addon.xml
+fi
+
+if [[ -n ${ADDON_FANART} ]] && [[ ${ADDON_FANART} != resources/* ]]; then
+  rm -f resources/fanart.png
+  mv ${ADDON_FANART} resources
+  xmlstarlet ed -L -u "//addon/extension/assets/fanart" -v "resources/${ADDON_FANART}" addon.xml
+fi
+
+# remove distro fanart in case addon has it's own in .jpg format
+[ -f resources/fanart.jpg -a -f resources/fanart.png ] && rm resources/fanart.png
+
 cd ${ADDON_BUILD}
+
 build_msg "CLR_INFO" "*** compressing addon ${PKG_ADDON_ID} ... ***"
 ${TOOLCHAIN}/bin/7za a -mx9 -bsp0 -bso0 -tzip ${PKG_ADDON_ID}-${ADDONVER}.zip ${PKG_ADDON_ID}
 cd - &>/dev/null

 mkdir -p ${ADDON_INSTALL_DIR}
 cp ${ADDON_BUILD}/${PKG_ADDON_ID}-${ADDONVER}.zip ${ADDON_INSTALL_DIR}
+
 if [ -f ${ADDON_BUILD}/${PKG_ADDON_ID}/changelog.txt ]; then
   cp ${ADDON_BUILD}/${PKG_ADDON_ID}/changelog.txt ${ADDON_INSTALL_DIR}/changelog-${ADDONVER}.txt
 fi
-if [ -f ${ADDON_BUILD}/${PKG_ADDON_ID}/resources/icon.png ]; then
-  mkdir -p ${ADDON_INSTALL_DIR}/resources
-  cp ${ADDON_BUILD}/${PKG_ADDON_ID}/resources/icon.png ${ADDON_INSTALL_DIR}/resources/icon.png
-fi

-# workaround for kodi pvr addons
-if [ -f ${ADDON_BUILD}/${PKG_ADDON_ID}/icon.png ]; then
-  cp ${ADDON_BUILD}/${PKG_ADDON_ID}/icon.png ${ADDON_INSTALL_DIR}/icon.png
-fi
-
-if [ -f ${ADDON_BUILD}/${PKG_ADDON_ID}/resources/fanart.png ]; then
-  mkdir -p ${ADDON_INSTALL_DIR}/resources
-  cp ${ADDON_BUILD}/${PKG_ADDON_ID}/resources/fanart.png ${ADDON_INSTALL_DIR}/resources/fanart.png
-fi
-for f in ${ADDON_BUILD}/${PKG_ADDON_ID}/resources/screenshot-*.{jpg,png}; do
+for f in ${ADDON_BUILD}/${PKG_ADDON_ID}/resources/icon.{jpg,png} \
+         ${ADDON_BUILD}/${PKG_ADDON_ID}/resources/fanart.{jpg,png} \
+         ${ADDON_BUILD}/${PKG_ADDON_ID}/resources/screenshot-*.{jpg,png}; do
   if [ -f "${f}" ]; then
     mkdir -p ${ADDON_INSTALL_DIR}/resources
     cp ${f} ${ADDON_INSTALL_DIR}/resources