diff --git a/icons/ox128-action-voicecall.png b/icons/128-actions-voicecall.png
similarity index 100%
rename from icons/ox128-action-voicecall.png
rename to icons/128-actions-voicecall.png
diff --git a/icons/ox128-action-webcamreceive.png b/icons/128-actions-webcamreceive.png
similarity index 100%
rename from icons/ox128-action-webcamreceive.png
rename to icons/128-actions-webcamreceive.png
diff --git a/icons/ox128-action-webcamsend.png b/icons/128-actions-webcamsend.png
similarity index 100%
rename from icons/ox128-action-webcamsend.png
rename to icons/128-actions-webcamsend.png
diff --git a/icons/ox16-action-account_offline_overlay.png b/icons/16-actions-account_offline_overlay.png
similarity index 100%
rename from icons/ox16-action-account_offline_overlay.png
rename to icons/16-actions-account_offline_overlay.png
diff --git a/icons/ox16-action-contact_away_overlay.png b/icons/16-actions-contact_away_overlay.png
similarity index 100%
rename from icons/ox16-action-contact_away_overlay.png
rename to icons/16-actions-contact_away_overlay.png
diff --git a/icons/ox16-action-contact_busy_overlay.png b/icons/16-actions-contact_busy_overlay.png
similarity index 100%
rename from icons/ox16-action-contact_busy_overlay.png
rename to icons/16-actions-contact_busy_overlay.png
diff --git a/icons/ox16-action-contact_food_overlay.png b/icons/16-actions-contact_food_overlay.png
similarity index 100%
rename from icons/ox16-action-contact_food_overlay.png
rename to icons/16-actions-contact_food_overlay.png
diff --git a/icons/ox16-action-contact_freeforchat_overlay.png b/icons/16-actions-contact_freeforchat_overlay.png
similarity index 100%
rename from icons/ox16-action-contact_freeforchat_overlay.png
rename to icons/16-actions-contact_freeforchat_overlay.png
diff --git a/icons/ox16-action-contact_invisible_overlay.png b/icons/16-actions-contact_invisible_overlay.png
similarity index 100%
rename from icons/ox16-action-contact_invisible_overlay.png
rename to icons/16-actions-contact_invisible_overlay.png
diff --git a/icons/ox16-action-contact_phone_overlay.png b/icons/16-actions-contact_phone_overlay.png
similarity index 100%
rename from icons/ox16-action-contact_phone_overlay.png
rename to icons/16-actions-contact_phone_overlay.png
diff --git a/icons/ox16-action-contact_xa_overlay.png b/icons/16-actions-contact_xa_overlay.png
similarity index 100%
rename from icons/ox16-action-contact_xa_overlay.png
rename to icons/16-actions-contact_xa_overlay.png
diff --git a/icons/ox16-action-emoticon.png b/icons/16-actions-emoticon.png
similarity index 100%
rename from icons/ox16-action-emoticon.png
rename to icons/16-actions-emoticon.png
diff --git a/icons/ox16-action-im-status-message-edit.png b/icons/16-actions-im-status-message-edit.png
similarity index 100%
rename from icons/ox16-action-im-status-message-edit.png
rename to icons/16-actions-im-status-message-edit.png
diff --git a/icons/ox16-action-metacontact_unknown.png b/icons/16-actions-metacontact_unknown.png
similarity index 100%
rename from icons/ox16-action-metacontact_unknown.png
rename to icons/16-actions-metacontact_unknown.png
diff --git a/icons/ox16-action-status_unknown.png b/icons/16-actions-status_unknown.png
similarity index 100%
rename from icons/ox16-action-status_unknown.png
rename to icons/16-actions-status_unknown.png
diff --git a/icons/ox16-action-status_unknown_overlay.png b/icons/16-actions-status_unknown_overlay.png
similarity index 100%
rename from icons/ox16-action-status_unknown_overlay.png
rename to icons/16-actions-status_unknown_overlay.png
diff --git a/icons/ox16-action-view-user-offline-kopete.png b/icons/16-actions-view-user-offline-kopete.png
similarity index 100%
rename from icons/ox16-action-view-user-offline-kopete.png
rename to icons/16-actions-view-user-offline-kopete.png
diff --git a/icons/ox16-action-voicecall.png b/icons/16-actions-voicecall.png
similarity index 100%
rename from icons/ox16-action-voicecall.png
rename to icons/16-actions-voicecall.png
diff --git a/icons/ox16-action-webcamreceive.png b/icons/16-actions-webcamreceive.png
similarity index 100%
rename from icons/ox16-action-webcamreceive.png
rename to icons/16-actions-webcamreceive.png
diff --git a/icons/ox16-action-webcamsend.png b/icons/16-actions-webcamsend.png
similarity index 100%
rename from icons/ox16-action-webcamsend.png
rename to icons/16-actions-webcamsend.png
diff --git a/icons/ox22-action-account_offline_overlay.png b/icons/22-actions-account_offline_overlay.png
similarity index 100%
rename from icons/ox22-action-account_offline_overlay.png
rename to icons/22-actions-account_offline_overlay.png
diff --git a/icons/ox22-action-im-status-message-edit.png b/icons/22-actions-im-status-message-edit.png
similarity index 100%
rename from icons/ox22-action-im-status-message-edit.png
rename to icons/22-actions-im-status-message-edit.png
diff --git a/icons/ox22-action-view-user-offline-kopete.png b/icons/22-actions-view-user-offline-kopete.png
similarity index 100%
rename from icons/ox22-action-view-user-offline-kopete.png
rename to icons/22-actions-view-user-offline-kopete.png
diff --git a/icons/ox22-action-voicecall.png b/icons/22-actions-voicecall.png
similarity index 100%
rename from icons/ox22-action-voicecall.png
rename to icons/22-actions-voicecall.png
diff --git a/icons/ox22-action-webcamreceive.png b/icons/22-actions-webcamreceive.png
similarity index 100%
rename from icons/ox22-action-webcamreceive.png
rename to icons/22-actions-webcamreceive.png
diff --git a/icons/ox22-action-webcamsend.png b/icons/22-actions-webcamsend.png
similarity index 100%
rename from icons/ox22-action-webcamsend.png
rename to icons/22-actions-webcamsend.png
diff --git a/icons/ox32-action-account_offline_overlay.png b/icons/32-actions-account_offline_overlay.png
similarity index 100%
rename from icons/ox32-action-account_offline_overlay.png
rename to icons/32-actions-account_offline_overlay.png
diff --git a/icons/ox32-action-im-status-message-edit.png b/icons/32-actions-im-status-message-edit.png
similarity index 100%
rename from icons/ox32-action-im-status-message-edit.png
rename to icons/32-actions-im-status-message-edit.png
diff --git a/icons/ox32-action-metacontact_unknown.png b/icons/32-actions-metacontact_unknown.png
similarity index 100%
rename from icons/ox32-action-metacontact_unknown.png
rename to icons/32-actions-metacontact_unknown.png
diff --git a/icons/ox32-action-newmessage.mng b/icons/32-actions-newmessage.mng
similarity index 100%
rename from icons/ox32-action-newmessage.mng
rename to icons/32-actions-newmessage.mng
diff --git a/icons/ox32-action-view-user-offline-kopete.png b/icons/32-actions-view-user-offline-kopete.png
similarity index 100%
rename from icons/ox32-action-view-user-offline-kopete.png
rename to icons/32-actions-view-user-offline-kopete.png
diff --git a/icons/ox32-action-voicecall.png b/icons/32-actions-voicecall.png
similarity index 100%
rename from icons/ox32-action-voicecall.png
rename to icons/32-actions-voicecall.png
diff --git a/icons/ox32-action-webcamreceive.png b/icons/32-actions-webcamreceive.png
similarity index 100%
rename from icons/ox32-action-webcamreceive.png
rename to icons/32-actions-webcamreceive.png
diff --git a/icons/ox32-action-webcamsend.png b/icons/32-actions-webcamsend.png
similarity index 100%
rename from icons/ox32-action-webcamsend.png
rename to icons/32-actions-webcamsend.png
diff --git a/icons/ox48-action-im-status-message-edit.png b/icons/48-actions-im-status-message-edit.png
similarity index 100%
rename from icons/ox48-action-im-status-message-edit.png
rename to icons/48-actions-im-status-message-edit.png
diff --git a/icons/ox48-action-view-user-offline-kopete.png b/icons/48-actions-view-user-offline-kopete.png
similarity index 100%
rename from icons/ox48-action-view-user-offline-kopete.png
rename to icons/48-actions-view-user-offline-kopete.png
diff --git a/icons/ox48-action-voicecall.png b/icons/48-actions-voicecall.png
similarity index 100%
rename from icons/ox48-action-voicecall.png
rename to icons/48-actions-voicecall.png
diff --git a/icons/ox48-action-webcamreceive.png b/icons/48-actions-webcamreceive.png
similarity index 100%
rename from icons/ox48-action-webcamreceive.png
rename to icons/48-actions-webcamreceive.png
diff --git a/icons/ox48-action-webcamsend.png b/icons/48-actions-webcamsend.png
similarity index 100%
rename from icons/ox48-action-webcamsend.png
rename to icons/48-actions-webcamsend.png
diff --git a/icons/ox64-action-voicecall.png b/icons/64-actions-voicecall.png
similarity index 100%
rename from icons/ox64-action-voicecall.png
rename to icons/64-actions-voicecall.png
diff --git a/icons/ox64-action-webcamreceive.png b/icons/64-actions-webcamreceive.png
similarity index 100%
rename from icons/ox64-action-webcamreceive.png
rename to icons/64-actions-webcamreceive.png
diff --git a/icons/ox64-action-webcamsend.png b/icons/64-actions-webcamsend.png
similarity index 100%
rename from icons/ox64-action-webcamsend.png
rename to icons/64-actions-webcamsend.png
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 946c2d9b9..1999f3335 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,6 +1,5 @@
 file(GLOB icons_png "*.png")
-file(GLOB icons_svg "*.svg")
+file(GLOB icons_svg "*.svgz")
 
 set(all_icons ${icons_png} ${icons_svg})
 ecm_install_icons(ICONS ${all_icons} DESTINATION ${KDE_INSTALL_ICONDIR} THEME oxygen)
-ecm_install_icons(${KDE_INSTALL_ICONDIR})
diff --git a/icons/oxsc-action-account_offline_overlay.svgz b/icons/sc-actions-account_offline_overlay.svgz
similarity index 100%
rename from icons/oxsc-action-account_offline_overlay.svgz
rename to icons/sc-actions-account_offline_overlay.svgz
diff --git a/icons/oxsc-action-im-status-message-edit.svgz b/icons/sc-actions-im-status-message-edit.svgz
similarity index 100%
rename from icons/oxsc-action-im-status-message-edit.svgz
rename to icons/sc-actions-im-status-message-edit.svgz
diff --git a/icons/oxsc-action-view-user-offline-kopete.svgz b/icons/sc-actions-view-user-offline-kopete.svgz
similarity index 100%
rename from icons/oxsc-action-view-user-offline-kopete.svgz
rename to icons/sc-actions-view-user-offline-kopete.svgz
diff --git a/icons/oxsc-action-voicecall.svgz b/icons/sc-actions-voicecall.svgz
similarity index 100%
rename from icons/oxsc-action-voicecall.svgz
rename to icons/sc-actions-voicecall.svgz
diff --git a/icons/oxsc-action-webcamreceive.svgz b/icons/sc-actions-webcamreceive.svgz
similarity index 100%
rename from icons/oxsc-action-webcamreceive.svgz
rename to icons/sc-actions-webcamreceive.svgz
diff --git a/icons/oxsc-action-webcamsend.svgz b/icons/sc-actions-webcamsend.svgz
similarity index 100%
rename from icons/oxsc-action-webcamsend.svgz
rename to icons/sc-actions-webcamsend.svgz
diff --git a/kopete/hi128-apps-kopete-offline.png b/kopete/128-apps-kopete-offline.png
similarity index 100%
rename from kopete/hi128-apps-kopete-offline.png
rename to kopete/128-apps-kopete-offline.png
diff --git a/kopete/hi128-apps-kopete.png b/kopete/128-apps-kopete.png
similarity index 100%
rename from kopete/hi128-apps-kopete.png
rename to kopete/128-apps-kopete.png
diff --git a/kopete/hi16-apps-kopete-offline.png b/kopete/16-apps-kopete-offline.png
similarity index 100%
rename from kopete/hi16-apps-kopete-offline.png
rename to kopete/16-apps-kopete-offline.png
diff --git a/kopete/hi16-apps-kopete.png b/kopete/16-apps-kopete.png
similarity index 100%
rename from kopete/hi16-apps-kopete.png
rename to kopete/16-apps-kopete.png
diff --git a/kopete/hi22-apps-kopete-offline.png b/kopete/22-apps-kopete-offline.png
similarity index 100%
rename from kopete/hi22-apps-kopete-offline.png
rename to kopete/22-apps-kopete-offline.png
diff --git a/kopete/hi22-apps-kopete.png b/kopete/22-apps-kopete.png
similarity index 100%
rename from kopete/hi22-apps-kopete.png
rename to kopete/22-apps-kopete.png
diff --git a/kopete/hi32-apps-kopete-offline.png b/kopete/32-apps-kopete-offline.png
similarity index 100%
rename from kopete/hi32-apps-kopete-offline.png
rename to kopete/32-apps-kopete-offline.png
diff --git a/kopete/hi32-apps-kopete.png b/kopete/32-apps-kopete.png
similarity index 100%
rename from kopete/hi32-apps-kopete.png
rename to kopete/32-apps-kopete.png
diff --git a/kopete/hi48-apps-kopete-offline.png b/kopete/48-apps-kopete-offline.png
similarity index 100%
rename from kopete/hi48-apps-kopete-offline.png
rename to kopete/48-apps-kopete-offline.png
diff --git a/kopete/hi48-apps-kopete.png b/kopete/48-apps-kopete.png
similarity index 100%
rename from kopete/hi48-apps-kopete.png
rename to kopete/48-apps-kopete.png
diff --git a/kopete/hi64-apps-kopete-offline.png b/kopete/64-apps-kopete-offline.png
similarity index 100%
rename from kopete/hi64-apps-kopete-offline.png
rename to kopete/64-apps-kopete-offline.png
diff --git a/kopete/hi64-apps-kopete.png b/kopete/64-apps-kopete.png
similarity index 100%
rename from kopete/hi64-apps-kopete.png
rename to kopete/64-apps-kopete.png
diff --git a/kopete/CMakeLists.txt b/kopete/CMakeLists.txt
index 942541ed9..9ee410f55 100644
--- a/kopete/CMakeLists.txt
+++ b/kopete/CMakeLists.txt
@@ -1,90 +1,91 @@
 
 add_subdirectory( addaccountwizard )
 add_subdirectory( statusmenu )
 add_subdirectory( identity )
 add_subdirectory( contactlist )
 add_subdirectory( config )
 add_subdirectory( chatwindow )
 add_subdirectory( kconf_update ) 
 
 include_directories( 
     ${KOPETE_INCLUDES}
     ${CMAKE_CURRENT_SOURCE_DIR}/addaccountwizard
     ${CMAKE_CURRENT_BINARY_DIR}/addaccountwizard
     ${CMAKE_CURRENT_SOURCE_DIR}/statusmenu/
     ${CMAKE_CURRENT_BINARY_DIR}/statusmenu/
     ${CMAKE_CURRENT_SOURCE_DIR}/identity
     ${CMAKE_CURRENT_BINARY_DIR}/identity
     ${CMAKE_CURRENT_SOURCE_DIR}/contactlist/
     ${CMAKE_CURRENT_BINARY_DIR}/contactlist/
     ${CMAKE_CURRENT_SOURCE_DIR}/config/plugins/
     ${QIMAGEBLITZ_INCLUDES}
     )
 
 link_directories( 
     ${KOPETE_BINARY_DIR}/libkopete
     ${CMAKE_CURRENT_BINARY_DIR}/addaccountwizard
     ${CMAKE_CURRENT_BINARY_DIR}/identity
     ${CMAKE_CURRENT_BINARY_DIR}/contactlist
     )
 
 ########### next target ###############
 
 # Contact List
 
 set(kopete_SRCS 
     ${kopetecontactlist_SRCS}
     main.cpp
     kopeteapplication.cpp
     systemtray.cpp
     kopetewindow.cpp
     kopeteidentitystatusbaricon.cpp
     kopeteaccountstatusbaricon.cpp
     kopetedbusinterface.cpp
     kopetedbusinterface_p.cpp
     infoeventwidget.cpp
     )
 
 qt5_add_dbus_adaptor(kopete_SRCS org.kde.Kopete.xml kopetedbusinterface.h KopeteDBusInterface)
 ecm_qt_declare_logging_category(kopete_SRCS HEADER kopete_debug.h IDENTIFIER KOPETE_LOG CATEGORY_NAME org.kde.kopete.kopete)
 
 ki18n_wrap_ui(kopete_SRCS groupkabcselectorwidget.ui infoeventbase.ui )
 
-file(GLOB ICONS_SRCS "hi*-apps-kopete.png")
+file(GLOB ICONS_SRCS "*-apps-kopete.png")
 ecm_add_app_icon(kopete_SRCS ICONS ${ICONS_SRCS})
 
 add_executable(kopete_bin ${kopete_SRCS})
 set_target_properties(kopete_bin PROPERTIES RUNTIME_OUTPUT_NAME kopete)
 
 target_link_libraries(kopete_bin
     KF5::Contacts
     KF5::TextEditor
     KF5::NotifyConfig
     KF5::Crash
     KF5::DBusAddons
     ${QIMAGEBLITZ_LIBRARIES}
     kopete
     kopeteaddaccountwizard
     kopetestatusmenu
     kopetecontactlist
     kopeteidentity
     )
 
 install(TARGETS kopete_bin  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### install files ###############
 
 install( PROGRAMS org.kde.kopete.desktop  DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES
     kopeteui.rc
     DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/kopete)
 
 install( FILES kopete.notifyrc  DESTINATION ${KDE_INSTALL_DATADIR}/kopete)
 install( FILES kopeterc DESTINATION ${KDE_INSTALL_CONFDIR} )
 install( FILES org.kde.Kopete.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} )
 install(FILES org.kde.kopete.appdata.xml DESTINATION ${CMAKE_INSTALL_METAINFODIR})
 
 file(GLOB icons_png "*.png")
-ecm_install_icons(ICONS ${icons_png}  DESTINATION ${KDE_INSTALL_ICONDIR} THEME oxygen)
+file(GLOB icons_svg "*.svgz")
+ecm_install_icons(ICONS ${icons_png} ${icons_svg} DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor)
 
diff --git a/kopete/config/avdevice/ox128-app-kopete_avdevice.png b/kopete/config/avdevice/128-apps-kopete_avdevice.png
similarity index 100%
rename from kopete/config/avdevice/ox128-app-kopete_avdevice.png
rename to kopete/config/avdevice/128-apps-kopete_avdevice.png
diff --git a/kopete/config/avdevice/ox22-app-kopete_avdevice.png b/kopete/config/avdevice/22-apps-kopete_avdevice.png
similarity index 100%
rename from kopete/config/avdevice/ox22-app-kopete_avdevice.png
rename to kopete/config/avdevice/22-apps-kopete_avdevice.png
diff --git a/kopete/config/avdevice/ox32-app-kopete_avdevice.png b/kopete/config/avdevice/32-apps-kopete_avdevice.png
similarity index 100%
rename from kopete/config/avdevice/ox32-app-kopete_avdevice.png
rename to kopete/config/avdevice/32-apps-kopete_avdevice.png
diff --git a/kopete/config/avdevice/ox64-app-kopete_avdevice.png b/kopete/config/avdevice/64-apps-kopete_avdevice.png
similarity index 100%
rename from kopete/config/avdevice/ox64-app-kopete_avdevice.png
rename to kopete/config/avdevice/64-apps-kopete_avdevice.png
diff --git a/kopete/config/avdevice/CMakeLists.txt b/kopete/config/avdevice/CMakeLists.txt
index 7f5ced233..20eaa630d 100644
--- a/kopete/config/avdevice/CMakeLists.txt
+++ b/kopete/config/avdevice/CMakeLists.txt
@@ -1,28 +1,29 @@
 
 include_directories(
     ${KOPETE_INCLUDES}
 
     )
 
 ########### next target ###############
 
 set(kcm_kopete_avdeviceconfig_PART_SRCS
     avdeviceconfig.cpp IdGuiElements.cpp )
 # avdeviceconfig_videodevicec.cpp )
 
 ki18n_wrap_ui(kcm_kopete_avdeviceconfig_PART_SRCS avdeviceconfig_videodevice.ui )
 
 add_library(kcm_kopete_avdeviceconfig MODULE ${kcm_kopete_avdeviceconfig_PART_SRCS})
 
 
 target_link_libraries(kcm_kopete_avdeviceconfig   kopete kopete_videodevice)
 
 install(TARGETS kcm_kopete_avdeviceconfig  DESTINATION ${KDE_INSTALL_PLUGINDIR})
 
 
 ########### install files ###############
 
 install( FILES kopete_avdeviceconfig.desktop  DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
+file(GLOB icons_png "*.png")
+ecm_install_icons(ICONS ${icons_png} DESTINATION ${KDE_INSTALL_ICONDIR} THEME oxygen)
 #ecm_install_icons( ${KDE_INSTALL_DATADIR}/kopete/icons  )
-ecm_install_icons(${KDE_INSTALL_ICONDIR})
diff --git a/kopete/org.kde.kopete.desktop b/kopete/org.kde.kopete.desktop
index e011f043b..684399a70 100755
--- a/kopete/org.kde.kopete.desktop
+++ b/kopete/org.kde.kopete.desktop
@@ -1,239 +1,238 @@
 [Desktop Entry]
 MimeType=application/x-kopete-emoticons;application/x-icq;
 Name=Kopete
 Name[ar]=Kopete
 Name[ast]=Kopete
 Name[bg]=Kopete
 Name[bn]=কপেট
 Name[br]=Kopete
 Name[bs]=Kopete
 Name[ca]=Kopete
 Name[ca@valencia]=Kopete
 Name[cs]=Kopete
 Name[cy]=Kopete
 Name[da]=Kopete
 Name[de]=Kopete
 Name[el]=Kopete
 Name[en_GB]=Kopete
 Name[eo]=Kopete
 Name[es]=Kopete
 Name[et]=Kopete
 Name[eu]=Kopete
 Name[fi]=Kopete
 Name[fr]=Kopete
 Name[ga]=Kopete
 Name[gl]=Kopete
 Name[he]=Kopete
 Name[hi]=के-ऑप्टी
 Name[hne]=के-ओप्टी
 Name[hr]=Kopete
 Name[hu]=Kopete
 Name[ia]=Kopete
 Name[is]=Kopete
 Name[it]=Kopete
 Name[ja]=Kopete
 Name[kk]=Kopete
 Name[km]=Kopete
 Name[ko]=Kopete
 Name[lt]=Kopete
 Name[lv]=Kopete
 Name[mk]=Kopete
 Name[ml]=കോപീറ്റ്
 Name[nb]=Kopete
 Name[nds]=Kopete
 Name[ne]=कोपेट
 Name[nl]=Kopete
 Name[nn]=Kopete
 Name[pa]=ਕੋਪੀਟੀ
 Name[pl]=Kopete
 Name[pt]=Kopete
 Name[pt_BR]=Kopete
 Name[ro]=Kopete
 Name[ru]=Kopete
 Name[se]=Kopete
 Name[si]=Kopete
 Name[sk]=Kopete
 Name[sl]=Kopete
 Name[sq]=Kopete
 Name[sr]=Копете
 Name[sr@ijekavian]=Копете
 Name[sr@ijekavianlatin]=Kopete
 Name[sr@latin]=Kopete
 Name[sv]=Kopete
 Name[ta]=Kopete
 Name[tg]=Kopete
 Name[th]=Kopete
 Name[tr]=Kopete
 Name[ug]=Kopete
 Name[uk]=Kopete
 Name[uz]=Kopete
 Name[uz@cyrillic]=Kopete
 Name[vi]=Kopete
 Name[wa]=Kopete
 Name[xh]=Kopete
 Name[x-test]=xxKopetexx
 Name[zh_CN]=Kopete
 Name[zh_HK]=Kopete
 Name[zh_TW]=即時通訊_Kopete
 GenericName=Instant Messenger
 GenericName[ar]=مراسل فوري
 GenericName[ast]=Mensaxería nel intre
 GenericName[bg]=Моментни съобщения
 GenericName[bn]=তাত্ক্ষণিক বার্তাবাহক
 GenericName[br]=Posteler a-benn-kaer
 GenericName[bs]=Brze poruke
 GenericName[ca]=Missatger a l'instant
 GenericName[ca@valencia]=Missatger a l'instant
 GenericName[cs]=Komunikátor
 GenericName[cy]=Negesydd Chwim
 GenericName[da]=Instant messenger
 GenericName[de]=Instant Messenger
 GenericName[el]=Στιγμιαίος αποστολέας μηνυμάτων
 GenericName[en_GB]=Instant Messenger
 GenericName[eo]=Tujmesaĝilo
 GenericName[es]=Mensajería instantánea
 GenericName[et]=Kiirsuhtlemisrakendus
 GenericName[eu]=Berehalako mezularitza
 GenericName[fa]=پیام‌رسان فوری
 GenericName[fi]=Pikaviestiohjelma
 GenericName[fr]=Messagerie instantanée
 GenericName[ga]=Clár teachtaireachtaí meandaracha
 GenericName[gl]=Mensaxería instantánea
 GenericName[he]=תוכנת מסרים מידיים
 GenericName[hi]=इंसटैंट मैसेंजर
 GenericName[hne]=इंसटैंट मैसेंजर
 GenericName[hr]=Aplikacija za čavrljanje
 GenericName[hsb]=Instant Messenger
 GenericName[hu]=Internetes csevegő
 GenericName[ia]=Messagero Instantanee
 GenericName[is]=Spjallforrit
 GenericName[it]=Messaggistica istantanea
 GenericName[ja]=インスタントメッセンジャー
 GenericName[kk]=Лезде хабарласу
 GenericName[km]=កម្មវិធី​ផ្ញើ​សារ​បន្ទាន់
 GenericName[ko]=인스턴트 메신저
 GenericName[lt]=Momentinių žinučių klientas
 GenericName[lv]=Tūlītējā ziņojumapmaiņa
 GenericName[mai]=इंसटैंट मैसेंजर
 GenericName[mk]=Инстант гласник
 GenericName[ml]=അതിവേഗ ദൂതന്‍
 GenericName[nb]=Hurtigmelding
 GenericName[nds]=Kortnarichtenprogramm
 GenericName[ne]=इन्स्ट्यान्ट मेेसेन्जर
 GenericName[nl]=Instant-messenger
 GenericName[nn]=Lynmeldingsprogram
 GenericName[pa]=ਤੁਰੰਤ ਮੈਸੈਂਜਰ
 GenericName[pl]=Komunikator internetowy
 GenericName[pt]=Mensageiro Instantâneo
 GenericName[pt_BR]=Mensageiro Instantâneo
 GenericName[ro]=Mesagerie instantanee
 GenericName[ru]=Обмен мгновенными сообщениями
 GenericName[se]=Šleađgadiehtoprográmma
 GenericName[si]=ක්‍ෂණික පණිවුඩකරු
 GenericName[sk]=Instant Messenger
 GenericName[sl]=Hipni sporočilnik
 GenericName[sq]=Instant Messenger
 GenericName[sr]=Брзи гласник
 GenericName[sr@ijekavian]=Брзи гласник
 GenericName[sr@ijekavianlatin]=Brzi glasnik
 GenericName[sr@latin]=Brzi glasnik
 GenericName[sv]=Direktmeddelandeklient
 GenericName[ta]=உடனடி தூதர்
 GenericName[tg]=Пайёмбари Фаврӣ
 GenericName[th]=ข้อความด่วนทันใจ
 GenericName[tr]=Anında Haberleşme Hizmeti
 GenericName[ug]=مۇڭداشقۇ
 GenericName[uk]=Програма для миттєвого зв'язку
 GenericName[uz]=Xabar almashish vositasi
 GenericName[uz@cyrillic]=Хабар алмашиш воситаси
 GenericName[vi]=Tin nhắn tức khắc
 GenericName[wa]=Messaedjî sol moumint
 GenericName[x-test]=xxInstant Messengerxx
 GenericName[zh_CN]=即时通讯
 GenericName[zh_HK]=即時通訊程式
 GenericName[zh_TW]=即時訊息客戶端程式
 Comment=Instant Messenger
 Comment[ar]=مراسل فوري
 Comment[ast]=Mensaxería nel intre
 Comment[bg]=Моментни съобщения
 Comment[bn]=তাত্ক্ষণিক বার্তাবাহক
 Comment[br]=Posteler a-benn-kaer
 Comment[bs]=Brze poruke
 Comment[ca]=Missatger a l'instant
 Comment[ca@valencia]=Missatger a l'instant
 Comment[cs]=Komunikátor
 Comment[cy]=Negesydd Chwim
 Comment[da]=Instant messenger
 Comment[de]=Instant Messenger
 Comment[el]=Στιγμιαίος αποστολέας μηνυμάτων
 Comment[en_GB]=Instant Messenger
 Comment[eo]=Tujmesaĝilo
 Comment[es]=Mensajería instantánea
 Comment[et]=Kiirsuhtlusrakendus
 Comment[eu]=Berehalako mezularitza
 Comment[fa]=پیام‌رسان فوری
 Comment[fi]=Pikaviestinohjelma
 Comment[fr]=Messagerie instantanée
 Comment[ga]=Instant Messenger
 Comment[gl]=Mensaxería instantánea
 Comment[he]=תוכנת מסרים מידיים
 Comment[hi]=इंसटैंट मैसेंजर
 Comment[hne]=इंसटैंट मैसेंजर
 Comment[hr]=Aplikacija za čavrljanje
 Comment[hu]=Azonnali üzenetküldő
 Comment[ia]=Messagero Instantanee
 Comment[is]=Spjallforrit
 Comment[it]=Messaggistica istantanea
 Comment[ja]=インスタントメッセンジャー
 Comment[kk]=Жедел хабарласу бағдарламасы
 Comment[km]=កម្មវិធី​ផ្ញើ​សារ​បន្ទាន់
 Comment[ko]=인스턴트 메신저
 Comment[lt]=Momentinių žinučių klientas
 Comment[lv]=Tūlītējas ziņojumapmaiņas programma
 Comment[mai]=इंसटैंट मैसेंजर
 Comment[mk]=Инстант гласник
 Comment[ml]=അതിവേഗ ദൂതന്‍
 Comment[nb]=Lynmeldingssystem
 Comment[nds]=Kortnarichtenprogramm
 Comment[ne]=इन्स्ट्यान्ट मेसेन्जर
 Comment[nl]=Instant-messenger
 Comment[nn]=Lynmeldingsprogram
 Comment[pa]=ਤੁਰੰਤ ਮੈਸੈਂਜਰ
 Comment[pl]=Komunikator
 Comment[pt]=Mensageiro Instantâneo
 Comment[pt_BR]=Mensageiro Instantâneo
 Comment[ro]=Mesagerie instantanee
 Comment[ru]=Программа обмена мгновенными сообщениями
 Comment[se]=Instant Messenger-klienta
 Comment[si]=ක්‍ෂණික පණිවුඩකරු
 Comment[sk]=Instant Messenger
 Comment[sl]=Hipni sporočilnik
 Comment[sq]=Instant Messenger
 Comment[sr]=Брзи гласник
 Comment[sr@ijekavian]=Брзи гласник
 Comment[sr@ijekavianlatin]=Brzi glasnik
 Comment[sr@latin]=Brzi glasnik
 Comment[sv]=Direktmeddelandeklient
 Comment[ta]=உடனடி தூதர்
 Comment[tg]=Пайёмбари Фаврӣ
 Comment[th]=ข้อความด่วนทันใจ
 Comment[tr]=Anında Haberleşme Hizmeti
 Comment[ug]=مۇڭداشقۇ
 Comment[uk]=Програма для миттєвого зв'язку
 Comment[uz]=Xabar almashish vositasi
 Comment[uz@cyrillic]=Хабар алмашиш воситаси
 Comment[vi]=Tin nhắn tức khắc
 Comment[x-test]=xxInstant Messengerxx
 Comment[zh_CN]=即时通讯
 Comment[zh_HK]=即時通訊程式
 Comment[zh_TW]=即時訊息客戶端程式
 Exec=kopete -qwindowtitle %c %u
 Type=Application
 X-DocPath=kopete/index.html
 Terminal=false
 Icon=kopete
 Categories=Qt;KDE;Network;InstantMessaging;
 X-DBUS-StartupType=Unique
 X-KDE-ServiceTypes=DBUS/InstantMessenger
-X-DBUS-StartupType=Unique
 X-DBUS-ServiceName=org.kde.kopete
diff --git a/kopete/hisc-apps-kopete-offline.svgz b/kopete/sc-apps-kopete-offline.svgz
similarity index 100%
rename from kopete/hisc-apps-kopete-offline.svgz
rename to kopete/sc-apps-kopete-offline.svgz
diff --git a/kopete/hisc-apps-kopete.svgz b/kopete/sc-apps-kopete.svgz
similarity index 100%
rename from kopete/hisc-apps-kopete.svgz
rename to kopete/sc-apps-kopete.svgz
diff --git a/plugins/autoreplace/icons/ox32-app-preferences-text-autocorrection-kopete.png b/plugins/autoreplace/icons/32-apps-preferences-text-autocorrection-kopete.png
similarity index 100%
rename from plugins/autoreplace/icons/ox32-app-preferences-text-autocorrection-kopete.png
rename to plugins/autoreplace/icons/32-apps-preferences-text-autocorrection-kopete.png
diff --git a/plugins/autoreplace/icons/CMakeLists.txt b/plugins/autoreplace/icons/CMakeLists.txt
index 242629de0..2d952c764 100644
--- a/plugins/autoreplace/icons/CMakeLists.txt
+++ b/plugins/autoreplace/icons/CMakeLists.txt
@@ -1,9 +1,5 @@
-
-########### install files ###############
-file(GLOB icons_png "*.png")
-file(GLOB icons_svg "*.svg")
-set(all_icons ${icons_png} ${icons_svg})
-ecm_install_icons(ICONS ${all_icons}  DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME oxygen)
-
-
-
+file(GLOB icons_png "[0-9]*.png")
+file(GLOB icons_svg "[0-9]*.svg")
+file(GLOB icons_mng "[0-9]*.mng")
+set(all_icons ${icons_png} ${icons_svg} ${icons_mng})
+ecm_install_icons(ICONS ${all_icons} DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME hicolor)
diff --git a/plugins/highlight/icons/ox32-app-preferences-text-highlighting-kopete.png b/plugins/highlight/icons/32-apps-preferences-text-highlighting-kopete.png
similarity index 100%
rename from plugins/highlight/icons/ox32-app-preferences-text-highlighting-kopete.png
rename to plugins/highlight/icons/32-apps-preferences-text-highlighting-kopete.png
diff --git a/plugins/highlight/icons/CMakeLists.txt b/plugins/highlight/icons/CMakeLists.txt
index effd0facf..2d952c764 100644
--- a/plugins/highlight/icons/CMakeLists.txt
+++ b/plugins/highlight/icons/CMakeLists.txt
@@ -1,5 +1,5 @@
-
-file(GLOB icons_png "*.png")
-file(GLOB icons_svg "*.svg")
-set(all_icons ${icons_png} ${icons_svg})
-ecm_install_icons(ICONS ${all_icons}  DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME oxygen)
+file(GLOB icons_png "[0-9]*.png")
+file(GLOB icons_svg "[0-9]*.svg")
+file(GLOB icons_mng "[0-9]*.mng")
+set(all_icons ${icons_png} ${icons_svg} ${icons_mng})
+ecm_install_icons(ICONS ${all_icons} DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME hicolor)
diff --git a/plugins/otr/icons/ox22-status-object-locked-finished.png b/plugins/otr/icons/22-status-object-locked-finished.png
similarity index 100%
rename from plugins/otr/icons/ox22-status-object-locked-finished.png
rename to plugins/otr/icons/22-status-object-locked-finished.png
diff --git a/plugins/otr/icons/ox22-status-object-locked-unverified.png b/plugins/otr/icons/22-status-object-locked-unverified.png
similarity index 100%
rename from plugins/otr/icons/ox22-status-object-locked-unverified.png
rename to plugins/otr/icons/22-status-object-locked-unverified.png
diff --git a/plugins/otr/icons/ox22-status-object-locked-verified.png b/plugins/otr/icons/22-status-object-locked-verified.png
similarity index 100%
rename from plugins/otr/icons/ox22-status-object-locked-verified.png
rename to plugins/otr/icons/22-status-object-locked-verified.png
diff --git a/plugins/otr/icons/ox48-action-mail-encrypt.png b/plugins/otr/icons/48-actions-mail-encrypt.png
similarity index 100%
rename from plugins/otr/icons/ox48-action-mail-encrypt.png
rename to plugins/otr/icons/48-actions-mail-encrypt.png
diff --git a/plugins/otr/icons/CMakeLists.txt b/plugins/otr/icons/CMakeLists.txt
index 195a9b069..051a9d4c4 100644
--- a/plugins/otr/icons/CMakeLists.txt
+++ b/plugins/otr/icons/CMakeLists.txt
@@ -1 +1,5 @@
-ecm_install_icons( ${KDE_INSTALL_ICONDIR} )
+file(GLOB icons_png "[0-9]*.png")
+file(GLOB icons_svg "[0-9]*.svgz")
+file(GLOB icons_mng "[0-9]*.mng")
+set(all_icons ${icons_png} ${icons_svg} ${icons_mng})
+ecm_install_icons(ICONS ${all_icons} DESTINATION ${ICON_INSTALL_DIR} THEME oxygen)
diff --git a/plugins/otr/icons/oxsc-action-mail-encrypt.svgz b/plugins/otr/icons/sc-actions-mail-encrypt.svgz
similarity index 100%
rename from plugins/otr/icons/oxsc-action-mail-encrypt.svgz
rename to plugins/otr/icons/sc-actions-mail-encrypt.svgz
diff --git a/plugins/otr/icons/oxsc-status-object-locked-finished.svgz b/plugins/otr/icons/sc-status-object-locked-finished.svgz
similarity index 100%
rename from plugins/otr/icons/oxsc-status-object-locked-finished.svgz
rename to plugins/otr/icons/sc-status-object-locked-finished.svgz
diff --git a/plugins/otr/icons/oxsc-status-object-locked-unverified.svgz b/plugins/otr/icons/sc-status-object-locked-unverified.svgz
similarity index 100%
rename from plugins/otr/icons/oxsc-status-object-locked-unverified.svgz
rename to plugins/otr/icons/sc-status-object-locked-unverified.svgz
diff --git a/plugins/otr/icons/oxsc-status-object-locked-verified.svgz b/plugins/otr/icons/sc-status-object-locked-verified.svgz
similarity index 100%
rename from plugins/otr/icons/oxsc-status-object-locked-verified.svgz
rename to plugins/otr/icons/sc-status-object-locked-verified.svgz
diff --git a/plugins/texteffect/icons/ox32-app-preferences-plugin-text-effect-kopete.png b/plugins/texteffect/icons/32-apps-preferences-plugin-text-effect-kopete.png
similarity index 100%
rename from plugins/texteffect/icons/ox32-app-preferences-plugin-text-effect-kopete.png
rename to plugins/texteffect/icons/32-apps-preferences-plugin-text-effect-kopete.png
diff --git a/plugins/texteffect/icons/CMakeLists.txt b/plugins/texteffect/icons/CMakeLists.txt
index 0a447b335..2d952c764 100644
--- a/plugins/texteffect/icons/CMakeLists.txt
+++ b/plugins/texteffect/icons/CMakeLists.txt
@@ -1,10 +1,5 @@
-
-########### install files ###############
-
-file(GLOB icons_png "*.png")
-file(GLOB icons_svg "*.svg")
-set(all_icons ${icons_png} ${icons_svg})
-ecm_install_icons(ICONS ${all_icons}  DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME oxygen)
-
-
-
+file(GLOB icons_png "[0-9]*.png")
+file(GLOB icons_svg "[0-9]*.svg")
+file(GLOB icons_mng "[0-9]*.mng")
+set(all_icons ${icons_png} ${icons_svg} ${icons_mng})
+ecm_install_icons(ICONS ${all_icons} DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME hicolor)
diff --git a/protocols/bonjour/icons/ox128-app-bonjour_protocol.png b/protocols/bonjour/icons/128-apps-bonjour_protocol.png
similarity index 100%
rename from protocols/bonjour/icons/ox128-app-bonjour_protocol.png
rename to protocols/bonjour/icons/128-apps-bonjour_protocol.png
diff --git a/protocols/bonjour/icons/ox16-app-bonjour_protocol.png b/protocols/bonjour/icons/16-apps-bonjour_protocol.png
similarity index 100%
rename from protocols/bonjour/icons/ox16-app-bonjour_protocol.png
rename to protocols/bonjour/icons/16-apps-bonjour_protocol.png
diff --git a/protocols/bonjour/icons/ox22-app-bonjour_protocol.png b/protocols/bonjour/icons/22-apps-bonjour_protocol.png
similarity index 100%
rename from protocols/bonjour/icons/ox22-app-bonjour_protocol.png
rename to protocols/bonjour/icons/22-apps-bonjour_protocol.png
diff --git a/protocols/bonjour/icons/ox32-app-bonjour_protocol.png b/protocols/bonjour/icons/32-apps-bonjour_protocol.png
similarity index 100%
rename from protocols/bonjour/icons/ox32-app-bonjour_protocol.png
rename to protocols/bonjour/icons/32-apps-bonjour_protocol.png
diff --git a/protocols/bonjour/icons/ox48-app-bonjour_protocol.png b/protocols/bonjour/icons/48-apps-bonjour_protocol.png
similarity index 100%
rename from protocols/bonjour/icons/ox48-app-bonjour_protocol.png
rename to protocols/bonjour/icons/48-apps-bonjour_protocol.png
diff --git a/protocols/bonjour/icons/ox64-app-bonjour_protocol.png b/protocols/bonjour/icons/64-apps-bonjour_protocol.png
similarity index 100%
rename from protocols/bonjour/icons/ox64-app-bonjour_protocol.png
rename to protocols/bonjour/icons/64-apps-bonjour_protocol.png
diff --git a/protocols/bonjour/icons/CMakeLists.txt b/protocols/bonjour/icons/CMakeLists.txt
index 3e831aca7..2d952c764 100644
--- a/protocols/bonjour/icons/CMakeLists.txt
+++ b/protocols/bonjour/icons/CMakeLists.txt
@@ -1,6 +1,5 @@
-
-########### install files ###############
-
-#ecm_install_icons( ${KDE_INSTALL_DATADIR}/kopete/icons  )
-ecm_install_icons(${KDE_INSTALL_ICONDIR})
-
+file(GLOB icons_png "[0-9]*.png")
+file(GLOB icons_svg "[0-9]*.svg")
+file(GLOB icons_mng "[0-9]*.mng")
+set(all_icons ${icons_png} ${icons_svg} ${icons_mng})
+ecm_install_icons(ICONS ${all_icons} DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME hicolor)
diff --git a/protocols/gadu/icons/ox16-action-gg_away.png b/protocols/gadu/icons/16-actions-gg_away.png
similarity index 100%
rename from protocols/gadu/icons/ox16-action-gg_away.png
rename to protocols/gadu/icons/16-actions-gg_away.png
diff --git a/protocols/gadu/icons/ox16-action-gg_busy.png b/protocols/gadu/icons/16-actions-gg_busy.png
similarity index 100%
rename from protocols/gadu/icons/ox16-action-gg_busy.png
rename to protocols/gadu/icons/16-actions-gg_busy.png
diff --git a/protocols/gadu/icons/ox16-action-gg_busy_d.png b/protocols/gadu/icons/16-actions-gg_busy_d.png
similarity index 100%
rename from protocols/gadu/icons/ox16-action-gg_busy_d.png
rename to protocols/gadu/icons/16-actions-gg_busy_d.png
diff --git a/protocols/gadu/icons/cr16-action-gg_con.mng b/protocols/gadu/icons/16-actions-gg_con.mng
similarity index 100%
rename from protocols/gadu/icons/cr16-action-gg_con.mng
rename to protocols/gadu/icons/16-actions-gg_con.mng
diff --git a/protocols/gadu/icons/ox16-action-gg_connecting.png b/protocols/gadu/icons/16-actions-gg_connecting.png
similarity index 100%
rename from protocols/gadu/icons/ox16-action-gg_connecting.png
rename to protocols/gadu/icons/16-actions-gg_connecting.png
diff --git a/protocols/gadu/icons/ox16-action-gg_description_overlay.png b/protocols/gadu/icons/16-actions-gg_description_overlay.png
similarity index 100%
rename from protocols/gadu/icons/ox16-action-gg_description_overlay.png
rename to protocols/gadu/icons/16-actions-gg_description_overlay.png
diff --git a/protocols/gadu/icons/ox16-action-gg_ignored.png b/protocols/gadu/icons/16-actions-gg_ignored.png
similarity index 100%
rename from protocols/gadu/icons/ox16-action-gg_ignored.png
rename to protocols/gadu/icons/16-actions-gg_ignored.png
diff --git a/protocols/gadu/icons/ox16-action-gg_invi.png b/protocols/gadu/icons/16-actions-gg_invi.png
similarity index 100%
rename from protocols/gadu/icons/ox16-action-gg_invi.png
rename to protocols/gadu/icons/16-actions-gg_invi.png
diff --git a/protocols/gadu/icons/ox16-action-gg_invi_d.png b/protocols/gadu/icons/16-actions-gg_invi_d.png
similarity index 100%
rename from protocols/gadu/icons/ox16-action-gg_invi_d.png
rename to protocols/gadu/icons/16-actions-gg_invi_d.png
diff --git a/protocols/gadu/icons/ox16-action-gg_offline.png b/protocols/gadu/icons/16-actions-gg_offline.png
similarity index 100%
rename from protocols/gadu/icons/ox16-action-gg_offline.png
rename to protocols/gadu/icons/16-actions-gg_offline.png
diff --git a/protocols/gadu/icons/ox16-action-gg_offline_d.png b/protocols/gadu/icons/16-actions-gg_offline_d.png
similarity index 100%
rename from protocols/gadu/icons/ox16-action-gg_offline_d.png
rename to protocols/gadu/icons/16-actions-gg_offline_d.png
diff --git a/protocols/gadu/icons/ox16-action-gg_online.png b/protocols/gadu/icons/16-actions-gg_online.png
similarity index 100%
rename from protocols/gadu/icons/ox16-action-gg_online.png
rename to protocols/gadu/icons/16-actions-gg_online.png
diff --git a/protocols/gadu/icons/ox16-action-gg_online_d.png b/protocols/gadu/icons/16-actions-gg_online_d.png
similarity index 100%
rename from protocols/gadu/icons/ox16-action-gg_online_d.png
rename to protocols/gadu/icons/16-actions-gg_online_d.png
diff --git a/protocols/gadu/icons/ox16-app-gadu_protocol.png b/protocols/gadu/icons/16-apps-gadu_protocol.png
similarity index 100%
rename from protocols/gadu/icons/ox16-app-gadu_protocol.png
rename to protocols/gadu/icons/16-apps-gadu_protocol.png
diff --git a/protocols/gadu/icons/ox32-app-gadu_protocol.png b/protocols/gadu/icons/32-apps-gadu_protocol.png
similarity index 100%
rename from protocols/gadu/icons/ox32-app-gadu_protocol.png
rename to protocols/gadu/icons/32-apps-gadu_protocol.png
diff --git a/protocols/gadu/icons/CMakeLists.txt b/protocols/gadu/icons/CMakeLists.txt
index e276a4299..2d952c764 100644
--- a/protocols/gadu/icons/CMakeLists.txt
+++ b/protocols/gadu/icons/CMakeLists.txt
@@ -1 +1,5 @@
-ecm_install_icons( ${KDE_INSTALL_DATADIR}/kopete/icons  )
+file(GLOB icons_png "[0-9]*.png")
+file(GLOB icons_svg "[0-9]*.svg")
+file(GLOB icons_mng "[0-9]*.mng")
+set(all_icons ${icons_png} ${icons_svg} ${icons_mng})
+ecm_install_icons(ICONS ${all_icons} DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME hicolor)
diff --git a/protocols/groupwise/icons/ox16-action-groupwise_away.png b/protocols/groupwise/icons/16-actions-groupwise_away.png
similarity index 100%
rename from protocols/groupwise/icons/ox16-action-groupwise_away.png
rename to protocols/groupwise/icons/16-actions-groupwise_away.png
diff --git a/protocols/groupwise/icons/ox16-action-groupwise_busy.png b/protocols/groupwise/icons/16-actions-groupwise_busy.png
similarity index 100%
rename from protocols/groupwise/icons/ox16-action-groupwise_busy.png
rename to protocols/groupwise/icons/16-actions-groupwise_busy.png
diff --git a/protocols/groupwise/icons/cr16-action-groupwise_connecting.mng b/protocols/groupwise/icons/16-actions-groupwise_connecting.mng
similarity index 100%
rename from protocols/groupwise/icons/cr16-action-groupwise_connecting.mng
rename to protocols/groupwise/icons/16-actions-groupwise_connecting.mng
diff --git a/protocols/groupwise/icons/ox16-action-groupwise_invisible.png b/protocols/groupwise/icons/16-actions-groupwise_invisible.png
similarity index 100%
rename from protocols/groupwise/icons/ox16-action-groupwise_invisible.png
rename to protocols/groupwise/icons/16-actions-groupwise_invisible.png
diff --git a/protocols/groupwise/icons/ox16-action-groupwise_online.png b/protocols/groupwise/icons/16-actions-groupwise_online.png
similarity index 100%
rename from protocols/groupwise/icons/ox16-action-groupwise_online.png
rename to protocols/groupwise/icons/16-actions-groupwise_online.png
diff --git a/protocols/groupwise/icons/ox16-action-logging.png b/protocols/groupwise/icons/16-actions-logging.png
similarity index 100%
rename from protocols/groupwise/icons/ox16-action-logging.png
rename to protocols/groupwise/icons/16-actions-logging.png
diff --git a/protocols/groupwise/icons/ox16-app-groupwise_protocol.png b/protocols/groupwise/icons/16-apps-groupwise_protocol.png
similarity index 100%
rename from protocols/groupwise/icons/ox16-app-groupwise_protocol.png
rename to protocols/groupwise/icons/16-apps-groupwise_protocol.png
diff --git a/protocols/groupwise/icons/ox22-action-logging.png b/protocols/groupwise/icons/22-actions-logging.png
similarity index 100%
rename from protocols/groupwise/icons/ox22-action-logging.png
rename to protocols/groupwise/icons/22-actions-logging.png
diff --git a/protocols/groupwise/icons/ox22-app-groupwise_protocol.png b/protocols/groupwise/icons/22-apps-groupwise_protocol.png
similarity index 100%
rename from protocols/groupwise/icons/ox22-app-groupwise_protocol.png
rename to protocols/groupwise/icons/22-apps-groupwise_protocol.png
diff --git a/protocols/groupwise/icons/ox32-action-logging.png b/protocols/groupwise/icons/32-actions-logging.png
similarity index 100%
rename from protocols/groupwise/icons/ox32-action-logging.png
rename to protocols/groupwise/icons/32-actions-logging.png
diff --git a/protocols/groupwise/icons/ox32-app-groupwise_protocol.png b/protocols/groupwise/icons/32-apps-groupwise_protocol.png
similarity index 100%
rename from protocols/groupwise/icons/ox32-app-groupwise_protocol.png
rename to protocols/groupwise/icons/32-apps-groupwise_protocol.png
diff --git a/protocols/groupwise/icons/ox48-action-logging.png b/protocols/groupwise/icons/48-actions-logging.png
similarity index 100%
rename from protocols/groupwise/icons/ox48-action-logging.png
rename to protocols/groupwise/icons/48-actions-logging.png
diff --git a/protocols/groupwise/icons/ox48-app-groupwise_protocol.png b/protocols/groupwise/icons/48-apps-groupwise_protocol.png
similarity index 100%
rename from protocols/groupwise/icons/ox48-app-groupwise_protocol.png
rename to protocols/groupwise/icons/48-apps-groupwise_protocol.png
diff --git a/protocols/groupwise/icons/ox64-action-logging.png b/protocols/groupwise/icons/64-actions-logging.png
similarity index 100%
rename from protocols/groupwise/icons/ox64-action-logging.png
rename to protocols/groupwise/icons/64-actions-logging.png
diff --git a/protocols/groupwise/icons/ox64-app-groupwise_protocol.png b/protocols/groupwise/icons/64-apps-groupwise_protocol.png
similarity index 100%
rename from protocols/groupwise/icons/ox64-app-groupwise_protocol.png
rename to protocols/groupwise/icons/64-apps-groupwise_protocol.png
diff --git a/protocols/groupwise/icons/CMakeLists.txt b/protocols/groupwise/icons/CMakeLists.txt
index df4f27926..2d952c764 100644
--- a/protocols/groupwise/icons/CMakeLists.txt
+++ b/protocols/groupwise/icons/CMakeLists.txt
@@ -1,4 +1,5 @@
-file(GLOB icons_png "*.png")
-file(GLOB icons_svg "*.svg")
-set(all_icons ${icons_png} ${icons_svg})
-ecm_install_icons(ICONS ${all_icons}  DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME oxygen)
+file(GLOB icons_png "[0-9]*.png")
+file(GLOB icons_svg "[0-9]*.svg")
+file(GLOB icons_mng "[0-9]*.mng")
+set(all_icons ${icons_png} ${icons_svg} ${icons_mng})
+ecm_install_icons(ICONS ${all_icons} DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME hicolor)
diff --git a/protocols/jabber/icons/ox128-app-jabber_protocol.png b/protocols/jabber/icons/128-apps-jabber_protocol.png
similarity index 100%
rename from protocols/jabber/icons/ox128-app-jabber_protocol.png
rename to protocols/jabber/icons/128-apps-jabber_protocol.png
diff --git a/protocols/jabber/icons/ox16-action-jabber_away.png b/protocols/jabber/icons/16-actions-jabber_away.png
similarity index 100%
rename from protocols/jabber/icons/ox16-action-jabber_away.png
rename to protocols/jabber/icons/16-actions-jabber_away.png
diff --git a/protocols/jabber/icons/ox16-action-jabber_chatty.png b/protocols/jabber/icons/16-actions-jabber_chatty.png
similarity index 100%
rename from protocols/jabber/icons/ox16-action-jabber_chatty.png
rename to protocols/jabber/icons/16-actions-jabber_chatty.png
diff --git a/protocols/jabber/icons/hi16-action-jabber_connecting.mng b/protocols/jabber/icons/16-actions-jabber_connecting.mng
similarity index 100%
rename from protocols/jabber/icons/hi16-action-jabber_connecting.mng
rename to protocols/jabber/icons/16-actions-jabber_connecting.mng
diff --git a/protocols/jabber/icons/ox16-action-jabber_group.png b/protocols/jabber/icons/16-actions-jabber_group.png
similarity index 100%
rename from protocols/jabber/icons/ox16-action-jabber_group.png
rename to protocols/jabber/icons/16-actions-jabber_group.png
diff --git a/protocols/jabber/icons/ox16-action-jabber_invisible.png b/protocols/jabber/icons/16-actions-jabber_invisible.png
similarity index 100%
rename from protocols/jabber/icons/ox16-action-jabber_invisible.png
rename to protocols/jabber/icons/16-actions-jabber_invisible.png
diff --git a/protocols/jabber/icons/ox16-action-jabber_na.png b/protocols/jabber/icons/16-actions-jabber_na.png
similarity index 100%
rename from protocols/jabber/icons/ox16-action-jabber_na.png
rename to protocols/jabber/icons/16-actions-jabber_na.png
diff --git a/protocols/jabber/icons/ox16-action-jabber_offline.png b/protocols/jabber/icons/16-actions-jabber_offline.png
similarity index 100%
rename from protocols/jabber/icons/ox16-action-jabber_offline.png
rename to protocols/jabber/icons/16-actions-jabber_offline.png
diff --git a/protocols/jabber/icons/ox16-action-jabber_online.png b/protocols/jabber/icons/16-actions-jabber_online.png
similarity index 100%
rename from protocols/jabber/icons/ox16-action-jabber_online.png
rename to protocols/jabber/icons/16-actions-jabber_online.png
diff --git a/protocols/jabber/icons/ox16-action-jabber_original.png b/protocols/jabber/icons/16-actions-jabber_original.png
similarity index 100%
rename from protocols/jabber/icons/ox16-action-jabber_original.png
rename to protocols/jabber/icons/16-actions-jabber_original.png
diff --git a/protocols/jabber/icons/ox16-action-jabber_raw.png b/protocols/jabber/icons/16-actions-jabber_raw.png
similarity index 100%
rename from protocols/jabber/icons/ox16-action-jabber_raw.png
rename to protocols/jabber/icons/16-actions-jabber_raw.png
diff --git a/protocols/jabber/icons/ox16-action-jabber_serv_off.png b/protocols/jabber/icons/16-actions-jabber_serv_off.png
similarity index 100%
rename from protocols/jabber/icons/ox16-action-jabber_serv_off.png
rename to protocols/jabber/icons/16-actions-jabber_serv_off.png
diff --git a/protocols/jabber/icons/ox16-action-jabber_serv_on.png b/protocols/jabber/icons/16-actions-jabber_serv_on.png
similarity index 100%
rename from protocols/jabber/icons/ox16-action-jabber_serv_on.png
rename to protocols/jabber/icons/16-actions-jabber_serv_on.png
diff --git a/protocols/jabber/icons/ox16-action-jabber_xa.png b/protocols/jabber/icons/16-actions-jabber_xa.png
similarity index 100%
rename from protocols/jabber/icons/ox16-action-jabber_xa.png
rename to protocols/jabber/icons/16-actions-jabber_xa.png
diff --git a/protocols/jabber/icons/ox16-app-jabber_gateway_aim.png b/protocols/jabber/icons/16-apps-jabber_gateway_aim.png
similarity index 100%
rename from protocols/jabber/icons/ox16-app-jabber_gateway_aim.png
rename to protocols/jabber/icons/16-apps-jabber_gateway_aim.png
diff --git a/protocols/jabber/icons/ox16-app-jabber_gateway_gadu.png b/protocols/jabber/icons/16-apps-jabber_gateway_gadu.png
similarity index 100%
rename from protocols/jabber/icons/ox16-app-jabber_gateway_gadu.png
rename to protocols/jabber/icons/16-apps-jabber_gateway_gadu.png
diff --git a/protocols/jabber/icons/ox16-app-jabber_gateway_http-ws.png b/protocols/jabber/icons/16-apps-jabber_gateway_http-ws.png
similarity index 100%
rename from protocols/jabber/icons/ox16-app-jabber_gateway_http-ws.png
rename to protocols/jabber/icons/16-apps-jabber_gateway_http-ws.png
diff --git a/protocols/jabber/icons/ox16-app-jabber_gateway_icq.png b/protocols/jabber/icons/16-apps-jabber_gateway_icq.png
similarity index 100%
rename from protocols/jabber/icons/ox16-app-jabber_gateway_icq.png
rename to protocols/jabber/icons/16-apps-jabber_gateway_icq.png
diff --git a/protocols/jabber/icons/ox16-app-jabber_gateway_irc.png b/protocols/jabber/icons/16-apps-jabber_gateway_irc.png
similarity index 100%
rename from protocols/jabber/icons/ox16-app-jabber_gateway_irc.png
rename to protocols/jabber/icons/16-apps-jabber_gateway_irc.png
diff --git a/protocols/jabber/icons/ox16-app-jabber_gateway_msn.png b/protocols/jabber/icons/16-apps-jabber_gateway_msn.png
similarity index 100%
rename from protocols/jabber/icons/ox16-app-jabber_gateway_msn.png
rename to protocols/jabber/icons/16-apps-jabber_gateway_msn.png
diff --git a/protocols/jabber/icons/ox16-app-jabber_gateway_qq.png b/protocols/jabber/icons/16-apps-jabber_gateway_qq.png
similarity index 100%
rename from protocols/jabber/icons/ox16-app-jabber_gateway_qq.png
rename to protocols/jabber/icons/16-apps-jabber_gateway_qq.png
diff --git a/protocols/jabber/icons/ox16-app-jabber_gateway_sms.png b/protocols/jabber/icons/16-apps-jabber_gateway_sms.png
similarity index 100%
rename from protocols/jabber/icons/ox16-app-jabber_gateway_sms.png
rename to protocols/jabber/icons/16-apps-jabber_gateway_sms.png
diff --git a/protocols/jabber/icons/ox16-app-jabber_gateway_smtp.png b/protocols/jabber/icons/16-apps-jabber_gateway_smtp.png
similarity index 100%
rename from protocols/jabber/icons/ox16-app-jabber_gateway_smtp.png
rename to protocols/jabber/icons/16-apps-jabber_gateway_smtp.png
diff --git a/protocols/jabber/icons/ox16-app-jabber_gateway_tlen.png b/protocols/jabber/icons/16-apps-jabber_gateway_tlen.png
similarity index 100%
rename from protocols/jabber/icons/ox16-app-jabber_gateway_tlen.png
rename to protocols/jabber/icons/16-apps-jabber_gateway_tlen.png
diff --git a/protocols/jabber/icons/ox16-app-jabber_gateway_yahoo.png b/protocols/jabber/icons/16-apps-jabber_gateway_yahoo.png
similarity index 100%
rename from protocols/jabber/icons/ox16-app-jabber_gateway_yahoo.png
rename to protocols/jabber/icons/16-apps-jabber_gateway_yahoo.png
diff --git a/protocols/jabber/icons/ox16-app-jabber_protocol.png b/protocols/jabber/icons/16-apps-jabber_protocol.png
similarity index 100%
rename from protocols/jabber/icons/ox16-app-jabber_protocol.png
rename to protocols/jabber/icons/16-apps-jabber_protocol.png
diff --git a/protocols/jabber/icons/ox22-app-jabber_protocol.png b/protocols/jabber/icons/22-apps-jabber_protocol.png
similarity index 100%
rename from protocols/jabber/icons/ox22-app-jabber_protocol.png
rename to protocols/jabber/icons/22-apps-jabber_protocol.png
diff --git a/protocols/jabber/icons/ox32-app-jabber_protocol.png b/protocols/jabber/icons/32-apps-jabber_protocol.png
similarity index 100%
rename from protocols/jabber/icons/ox32-app-jabber_protocol.png
rename to protocols/jabber/icons/32-apps-jabber_protocol.png
diff --git a/protocols/jabber/icons/ox48-app-jabber_protocol.png b/protocols/jabber/icons/48-apps-jabber_protocol.png
similarity index 100%
rename from protocols/jabber/icons/ox48-app-jabber_protocol.png
rename to protocols/jabber/icons/48-apps-jabber_protocol.png
diff --git a/protocols/jabber/icons/ox64-app-jabber_protocol.png b/protocols/jabber/icons/64-apps-jabber_protocol.png
similarity index 100%
rename from protocols/jabber/icons/ox64-app-jabber_protocol.png
rename to protocols/jabber/icons/64-apps-jabber_protocol.png
diff --git a/protocols/jabber/icons/CMakeLists.txt b/protocols/jabber/icons/CMakeLists.txt
index a27ea7145..2d952c764 100644
--- a/protocols/jabber/icons/CMakeLists.txt
+++ b/protocols/jabber/icons/CMakeLists.txt
@@ -1,6 +1,5 @@
-
-file(GLOB icons_png "*.png")
-file(GLOB icons_svg "*.svg")
-set(all_icons ${icons_png} ${icons_svg})
-ecm_install_icons(ICONS ${all_icons}  DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME oxygen)
-
+file(GLOB icons_png "[0-9]*.png")
+file(GLOB icons_svg "[0-9]*.svg")
+file(GLOB icons_mng "[0-9]*.mng")
+set(all_icons ${icons_png} ${icons_svg} ${icons_mng})
+ecm_install_icons(ICONS ${all_icons} DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME hicolor)
diff --git a/protocols/oscar/icons/hi16-action-aim_away.png b/protocols/oscar/icons/16-actions-aim_away.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-aim_away.png
rename to protocols/oscar/icons/16-actions-aim_away.png
diff --git a/protocols/oscar/icons/hi16-action-aim_connecting.mng b/protocols/oscar/icons/16-actions-aim_connecting.mng
similarity index 100%
rename from protocols/oscar/icons/hi16-action-aim_connecting.mng
rename to protocols/oscar/icons/16-actions-aim_connecting.mng
diff --git a/protocols/oscar/icons/hi16-action-aim_offline.png b/protocols/oscar/icons/16-actions-aim_offline.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-aim_offline.png
rename to protocols/oscar/icons/16-actions-aim_offline.png
diff --git a/protocols/oscar/icons/hi16-action-aim_online.png b/protocols/oscar/icons/16-actions-aim_online.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-aim_online.png
rename to protocols/oscar/icons/16-actions-aim_online.png
diff --git a/protocols/oscar/icons/hi16-action-icq_away.png b/protocols/oscar/icons/16-actions-icq_away.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_away.png
rename to protocols/oscar/icons/16-actions-icq_away.png
diff --git a/protocols/oscar/icons/hi16-action-icq_connecting.mng b/protocols/oscar/icons/16-actions-icq_connecting.mng
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_connecting.mng
rename to protocols/oscar/icons/16-actions-icq_connecting.mng
diff --git a/protocols/oscar/icons/hi16-action-icq_dnd.png b/protocols/oscar/icons/16-actions-icq_dnd.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_dnd.png
rename to protocols/oscar/icons/16-actions-icq_dnd.png
diff --git a/protocols/oscar/icons/hi16-action-icq_ffc.png b/protocols/oscar/icons/16-actions-icq_ffc.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_ffc.png
rename to protocols/oscar/icons/16-actions-icq_ffc.png
diff --git a/protocols/oscar/icons/hi16-action-icq_invisible.png b/protocols/oscar/icons/16-actions-icq_invisible.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_invisible.png
rename to protocols/oscar/icons/16-actions-icq_invisible.png
diff --git a/protocols/oscar/icons/hi16-action-icq_na.png b/protocols/oscar/icons/16-actions-icq_na.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_na.png
rename to protocols/oscar/icons/16-actions-icq_na.png
diff --git a/protocols/oscar/icons/hi16-action-icq_occupied.png b/protocols/oscar/icons/16-actions-icq_occupied.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_occupied.png
rename to protocols/oscar/icons/16-actions-icq_occupied.png
diff --git a/protocols/oscar/icons/hi16-action-icq_offline.png b/protocols/oscar/icons/16-actions-icq_offline.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_offline.png
rename to protocols/oscar/icons/16-actions-icq_offline.png
diff --git a/protocols/oscar/icons/hi16-action-icq_online.png b/protocols/oscar/icons/16-actions-icq_online.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_online.png
rename to protocols/oscar/icons/16-actions-icq_online.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus0.png b/protocols/oscar/icons/16-actions-icq_xstatus0.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus0.png
rename to protocols/oscar/icons/16-actions-icq_xstatus0.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus1.png b/protocols/oscar/icons/16-actions-icq_xstatus1.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus1.png
rename to protocols/oscar/icons/16-actions-icq_xstatus1.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus10.png b/protocols/oscar/icons/16-actions-icq_xstatus10.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus10.png
rename to protocols/oscar/icons/16-actions-icq_xstatus10.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus11.png b/protocols/oscar/icons/16-actions-icq_xstatus11.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus11.png
rename to protocols/oscar/icons/16-actions-icq_xstatus11.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus12.png b/protocols/oscar/icons/16-actions-icq_xstatus12.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus12.png
rename to protocols/oscar/icons/16-actions-icq_xstatus12.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus13.png b/protocols/oscar/icons/16-actions-icq_xstatus13.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus13.png
rename to protocols/oscar/icons/16-actions-icq_xstatus13.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus14.png b/protocols/oscar/icons/16-actions-icq_xstatus14.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus14.png
rename to protocols/oscar/icons/16-actions-icq_xstatus14.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus15.png b/protocols/oscar/icons/16-actions-icq_xstatus15.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus15.png
rename to protocols/oscar/icons/16-actions-icq_xstatus15.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus16.png b/protocols/oscar/icons/16-actions-icq_xstatus16.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus16.png
rename to protocols/oscar/icons/16-actions-icq_xstatus16.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus17.png b/protocols/oscar/icons/16-actions-icq_xstatus17.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus17.png
rename to protocols/oscar/icons/16-actions-icq_xstatus17.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus18.png b/protocols/oscar/icons/16-actions-icq_xstatus18.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus18.png
rename to protocols/oscar/icons/16-actions-icq_xstatus18.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus19.png b/protocols/oscar/icons/16-actions-icq_xstatus19.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus19.png
rename to protocols/oscar/icons/16-actions-icq_xstatus19.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus2.png b/protocols/oscar/icons/16-actions-icq_xstatus2.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus2.png
rename to protocols/oscar/icons/16-actions-icq_xstatus2.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus20.png b/protocols/oscar/icons/16-actions-icq_xstatus20.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus20.png
rename to protocols/oscar/icons/16-actions-icq_xstatus20.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus21.png b/protocols/oscar/icons/16-actions-icq_xstatus21.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus21.png
rename to protocols/oscar/icons/16-actions-icq_xstatus21.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus22.png b/protocols/oscar/icons/16-actions-icq_xstatus22.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus22.png
rename to protocols/oscar/icons/16-actions-icq_xstatus22.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus23.png b/protocols/oscar/icons/16-actions-icq_xstatus23.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus23.png
rename to protocols/oscar/icons/16-actions-icq_xstatus23.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus24.png b/protocols/oscar/icons/16-actions-icq_xstatus24.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus24.png
rename to protocols/oscar/icons/16-actions-icq_xstatus24.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus25.png b/protocols/oscar/icons/16-actions-icq_xstatus25.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus25.png
rename to protocols/oscar/icons/16-actions-icq_xstatus25.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus26.png b/protocols/oscar/icons/16-actions-icq_xstatus26.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus26.png
rename to protocols/oscar/icons/16-actions-icq_xstatus26.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus27.png b/protocols/oscar/icons/16-actions-icq_xstatus27.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus27.png
rename to protocols/oscar/icons/16-actions-icq_xstatus27.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus28.png b/protocols/oscar/icons/16-actions-icq_xstatus28.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus28.png
rename to protocols/oscar/icons/16-actions-icq_xstatus28.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus29.png b/protocols/oscar/icons/16-actions-icq_xstatus29.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus29.png
rename to protocols/oscar/icons/16-actions-icq_xstatus29.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus3.png b/protocols/oscar/icons/16-actions-icq_xstatus3.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus3.png
rename to protocols/oscar/icons/16-actions-icq_xstatus3.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus30.png b/protocols/oscar/icons/16-actions-icq_xstatus30.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus30.png
rename to protocols/oscar/icons/16-actions-icq_xstatus30.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus31.png b/protocols/oscar/icons/16-actions-icq_xstatus31.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus31.png
rename to protocols/oscar/icons/16-actions-icq_xstatus31.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus4.png b/protocols/oscar/icons/16-actions-icq_xstatus4.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus4.png
rename to protocols/oscar/icons/16-actions-icq_xstatus4.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus5.png b/protocols/oscar/icons/16-actions-icq_xstatus5.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus5.png
rename to protocols/oscar/icons/16-actions-icq_xstatus5.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus6.png b/protocols/oscar/icons/16-actions-icq_xstatus6.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus6.png
rename to protocols/oscar/icons/16-actions-icq_xstatus6.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus7.png b/protocols/oscar/icons/16-actions-icq_xstatus7.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus7.png
rename to protocols/oscar/icons/16-actions-icq_xstatus7.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus8.png b/protocols/oscar/icons/16-actions-icq_xstatus8.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus8.png
rename to protocols/oscar/icons/16-actions-icq_xstatus8.png
diff --git a/protocols/oscar/icons/hi16-action-icq_xstatus9.png b/protocols/oscar/icons/16-actions-icq_xstatus9.png
similarity index 100%
rename from protocols/oscar/icons/hi16-action-icq_xstatus9.png
rename to protocols/oscar/icons/16-actions-icq_xstatus9.png
diff --git a/protocols/oscar/icons/hi16-app-aim_protocol.png b/protocols/oscar/icons/16-apps-aim_protocol.png
similarity index 100%
rename from protocols/oscar/icons/hi16-app-aim_protocol.png
rename to protocols/oscar/icons/16-apps-aim_protocol.png
diff --git a/protocols/oscar/icons/hi16-app-icq_protocol.png b/protocols/oscar/icons/16-apps-icq_protocol.png
similarity index 100%
rename from protocols/oscar/icons/hi16-app-icq_protocol.png
rename to protocols/oscar/icons/16-apps-icq_protocol.png
diff --git a/protocols/oscar/icons/hi32-app-aim_protocol.png b/protocols/oscar/icons/32-apps-aim_protocol.png
similarity index 100%
rename from protocols/oscar/icons/hi32-app-aim_protocol.png
rename to protocols/oscar/icons/32-apps-aim_protocol.png
diff --git a/protocols/oscar/icons/hi32-app-icq_protocol.png b/protocols/oscar/icons/32-apps-icq_protocol.png
similarity index 100%
rename from protocols/oscar/icons/hi32-app-icq_protocol.png
rename to protocols/oscar/icons/32-apps-icq_protocol.png
diff --git a/protocols/oscar/icons/CMakeLists.txt b/protocols/oscar/icons/CMakeLists.txt
index df4f27926..2d952c764 100644
--- a/protocols/oscar/icons/CMakeLists.txt
+++ b/protocols/oscar/icons/CMakeLists.txt
@@ -1,4 +1,5 @@
-file(GLOB icons_png "*.png")
-file(GLOB icons_svg "*.svg")
-set(all_icons ${icons_png} ${icons_svg})
-ecm_install_icons(ICONS ${all_icons}  DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME oxygen)
+file(GLOB icons_png "[0-9]*.png")
+file(GLOB icons_svg "[0-9]*.svg")
+file(GLOB icons_mng "[0-9]*.mng")
+set(all_icons ${icons_png} ${icons_svg} ${icons_mng})
+ecm_install_icons(ICONS ${all_icons} DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME hicolor)
diff --git a/protocols/qq/icons/ox128-app-qq_protocol.png b/protocols/qq/icons/128-apps-qq_protocol.png
similarity index 100%
rename from protocols/qq/icons/ox128-app-qq_protocol.png
rename to protocols/qq/icons/128-apps-qq_protocol.png
diff --git a/protocols/qq/icons/cr16-action-qq_connecting.mng b/protocols/qq/icons/16-actions-qq_connecting.mng
similarity index 100%
rename from protocols/qq/icons/cr16-action-qq_connecting.mng
rename to protocols/qq/icons/16-actions-qq_connecting.mng
diff --git a/protocols/qq/icons/ox16-app-qq_protocol.png b/protocols/qq/icons/16-apps-qq_protocol.png
similarity index 100%
rename from protocols/qq/icons/ox16-app-qq_protocol.png
rename to protocols/qq/icons/16-apps-qq_protocol.png
diff --git a/protocols/qq/icons/cr22-action-qq_connecting.mng b/protocols/qq/icons/22-actions-qq_connecting.mng
similarity index 100%
rename from protocols/qq/icons/cr22-action-qq_connecting.mng
rename to protocols/qq/icons/22-actions-qq_connecting.mng
diff --git a/protocols/qq/icons/ox22-app-qq_protocol.png b/protocols/qq/icons/22-apps-qq_protocol.png
similarity index 100%
rename from protocols/qq/icons/ox22-app-qq_protocol.png
rename to protocols/qq/icons/22-apps-qq_protocol.png
diff --git a/protocols/qq/icons/cr32-action-qq_connecting.mng b/protocols/qq/icons/32-actions-qq_connecting.mng
similarity index 100%
rename from protocols/qq/icons/cr32-action-qq_connecting.mng
rename to protocols/qq/icons/32-actions-qq_connecting.mng
diff --git a/protocols/qq/icons/ox32-app-qq_protocol.png b/protocols/qq/icons/32-apps-qq_protocol.png
similarity index 100%
rename from protocols/qq/icons/ox32-app-qq_protocol.png
rename to protocols/qq/icons/32-apps-qq_protocol.png
diff --git a/protocols/qq/icons/cr48-action-qq_connecting.mng b/protocols/qq/icons/48-actions-qq_connecting.mng
similarity index 100%
rename from protocols/qq/icons/cr48-action-qq_connecting.mng
rename to protocols/qq/icons/48-actions-qq_connecting.mng
diff --git a/protocols/qq/icons/ox48-app-qq_protocol.png b/protocols/qq/icons/48-apps-qq_protocol.png
similarity index 100%
rename from protocols/qq/icons/ox48-app-qq_protocol.png
rename to protocols/qq/icons/48-apps-qq_protocol.png
diff --git a/protocols/qq/icons/cr64-action-qq_connecting.mng b/protocols/qq/icons/64-actions-qq_connecting.mng
similarity index 100%
rename from protocols/qq/icons/cr64-action-qq_connecting.mng
rename to protocols/qq/icons/64-actions-qq_connecting.mng
diff --git a/protocols/qq/icons/ox64-app-qq_protocol.png b/protocols/qq/icons/64-apps-qq_protocol.png
similarity index 100%
rename from protocols/qq/icons/ox64-app-qq_protocol.png
rename to protocols/qq/icons/64-apps-qq_protocol.png
diff --git a/protocols/qq/icons/CMakeLists.txt b/protocols/qq/icons/CMakeLists.txt
index a16720247..2d952c764 100644
--- a/protocols/qq/icons/CMakeLists.txt
+++ b/protocols/qq/icons/CMakeLists.txt
@@ -1,5 +1,5 @@
-file(GLOB icons_png "*.png")
-file(GLOB icons_svg "*.svg")
-set(all_icons ${icons_png} ${icons_svg})
-ecm_install_icons(ICONS ${all_icons}  DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME oxygen)
-
+file(GLOB icons_png "[0-9]*.png")
+file(GLOB icons_svg "[0-9]*.svg")
+file(GLOB icons_mng "[0-9]*.mng")
+set(all_icons ${icons_png} ${icons_svg} ${icons_mng})
+ecm_install_icons(ICONS ${all_icons} DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME hicolor)
diff --git a/protocols/testbed/icons/ox128-app-testbed_protocol.png b/protocols/testbed/icons/128-apps-testbed_protocol.png
similarity index 100%
rename from protocols/testbed/icons/ox128-app-testbed_protocol.png
rename to protocols/testbed/icons/128-apps-testbed_protocol.png
diff --git a/protocols/testbed/icons/ox16-app-testbed_protocol.png b/protocols/testbed/icons/16-apps-testbed_protocol.png
similarity index 100%
rename from protocols/testbed/icons/ox16-app-testbed_protocol.png
rename to protocols/testbed/icons/16-apps-testbed_protocol.png
diff --git a/protocols/testbed/icons/ox32-app-testbed_protocol.png b/protocols/testbed/icons/32-apps-testbed_protocol.png
similarity index 100%
rename from protocols/testbed/icons/ox32-app-testbed_protocol.png
rename to protocols/testbed/icons/32-apps-testbed_protocol.png
diff --git a/protocols/testbed/icons/ox48-app-testbed_protocol.png b/protocols/testbed/icons/48-apps-testbed_protocol.png
similarity index 100%
rename from protocols/testbed/icons/ox48-app-testbed_protocol.png
rename to protocols/testbed/icons/48-apps-testbed_protocol.png
diff --git a/protocols/testbed/icons/ox64-app-testbed_protocol.png b/protocols/testbed/icons/64-apps-testbed_protocol.png
similarity index 100%
rename from protocols/testbed/icons/ox64-app-testbed_protocol.png
rename to protocols/testbed/icons/64-apps-testbed_protocol.png
diff --git a/protocols/testbed/icons/CMakeLists.txt b/protocols/testbed/icons/CMakeLists.txt
index a85dd15bc..2d952c764 100644
--- a/protocols/testbed/icons/CMakeLists.txt
+++ b/protocols/testbed/icons/CMakeLists.txt
@@ -1,12 +1,5 @@
-
-
-
-
-########### install files ###############
-
-#ecm_install_icons( ${KDE_INSTALL_DATADIR}/kopete/icons  )
-ecm_install_icons(${KDE_INSTALL_ICONDIR})
-
-
-
-
+file(GLOB icons_png "[0-9]*.png")
+file(GLOB icons_svg "[0-9]*.svg")
+file(GLOB icons_mng "[0-9]*.mng")
+set(all_icons ${icons_png} ${icons_svg} ${icons_mng})
+ecm_install_icons(ICONS ${all_icons} DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME hicolor)
diff --git a/protocols/winpopup/icons/ox128-app-wp_protocol.png b/protocols/winpopup/icons/128-apps-wp_protocol.png
similarity index 100%
rename from protocols/winpopup/icons/ox128-app-wp_protocol.png
rename to protocols/winpopup/icons/128-apps-wp_protocol.png
diff --git a/protocols/winpopup/icons/ox16-action-wp_away.png b/protocols/winpopup/icons/16-actions-wp_away.png
similarity index 100%
rename from protocols/winpopup/icons/ox16-action-wp_away.png
rename to protocols/winpopup/icons/16-actions-wp_away.png
diff --git a/protocols/winpopup/icons/ox16-app-wp_protocol.png b/protocols/winpopup/icons/16-apps-wp_protocol.png
similarity index 100%
rename from protocols/winpopup/icons/ox16-app-wp_protocol.png
rename to protocols/winpopup/icons/16-apps-wp_protocol.png
diff --git a/protocols/winpopup/icons/ox32-app-wp_protocol.png b/protocols/winpopup/icons/32-apps-wp_protocol.png
similarity index 100%
rename from protocols/winpopup/icons/ox32-app-wp_protocol.png
rename to protocols/winpopup/icons/32-apps-wp_protocol.png
diff --git a/protocols/winpopup/icons/ox48-app-wp_protocol.png b/protocols/winpopup/icons/48-apps-wp_protocol.png
similarity index 100%
rename from protocols/winpopup/icons/ox48-app-wp_protocol.png
rename to protocols/winpopup/icons/48-apps-wp_protocol.png
diff --git a/protocols/winpopup/icons/ox64-app-wp_protocol.png b/protocols/winpopup/icons/64-apps-wp_protocol.png
similarity index 100%
rename from protocols/winpopup/icons/ox64-app-wp_protocol.png
rename to protocols/winpopup/icons/64-apps-wp_protocol.png
diff --git a/protocols/winpopup/icons/CMakeLists.txt b/protocols/winpopup/icons/CMakeLists.txt
index a16720247..2d952c764 100644
--- a/protocols/winpopup/icons/CMakeLists.txt
+++ b/protocols/winpopup/icons/CMakeLists.txt
@@ -1,5 +1,5 @@
-file(GLOB icons_png "*.png")
-file(GLOB icons_svg "*.svg")
-set(all_icons ${icons_png} ${icons_svg})
-ecm_install_icons(ICONS ${all_icons}  DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME oxygen)
-
+file(GLOB icons_png "[0-9]*.png")
+file(GLOB icons_svg "[0-9]*.svg")
+file(GLOB icons_mng "[0-9]*.mng")
+set(all_icons ${icons_png} ${icons_svg} ${icons_mng})
+ecm_install_icons(ICONS ${all_icons} DESTINATION ${KDE_INSTALL_DATADIR}/kopete/icons THEME hicolor)