Rename most device icons to comply with XDG standards
(cherry picked from commit 7287466fa162d84bf6febb3faeb5b91ba3951112)

diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index aa86393..2a3c384 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -506,7 +506,7 @@
 
 	m_albumNameBox = new KComboBox(true, this, "albumNameBox");
 	m_albumNameBox->setCompletionMode(TDEGlobalSettings::CompletionAuto);
-	addItem(i18n("Album &name:"), m_albumNameBox, leftColumnLayout, "cdrom_unmount");
+	addItem(i18n("Album &name:"), m_albumNameBox, leftColumnLayout, "media-optical-cdrom");
 
         m_genreBox = new KComboBox(true, this, "genreBox");
 	addItem(i18n("&Genre:"), m_genreBox, leftColumnLayout, "knotify");
diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp
index 4fc6f89..d7e9684 100644
--- a/kaudiocreator/kaudiocreator.cpp
+++ b/kaudiocreator/kaudiocreator.cpp
@@ -55,7 +55,7 @@
     janusWidget = new KJanusWidget(this, name, KJanusWidget::Tabbed);
     setCentralWidget(janusWidget);
 
-    TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString(), SmallIcon("cdaudio_unmount", 32));
+    TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString(), SmallIcon("media-optical-cdaudio", 32));
     tracks = new TracksImp(frame, "Tracks");
 
     ripper  = new Ripper ( TQT_TQOBJECT(frame), "Rip" );
@@ -252,7 +252,7 @@
         if (cddb)
         {
             cddb->load();
-            addPage(cddb, i18n("CDDB"), "cdaudio_mount", i18n("CDDB Configuration"), false);
+            addPage(cddb, i18n("CDDB"), "media-optical-cdaudio-mounted", i18n("CDDB Configuration"), false);
             connect(cddb, TQT_SIGNAL(changed(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotCddbChanged(bool)));
         }
     }
diff --git a/kaudiocreator/kaudiocreatorui.rc b/kaudiocreator/kaudiocreatorui.rc
index 597eda1..146816c 100644
--- a/kaudiocreator/kaudiocreatorui.rc
+++ b/kaudiocreator/kaudiocreatorui.rc
@@ -7,7 +7,7 @@
   <Action name="clear_done_jobs" icon="edittrash"/>
   <Action name="eject" icon="player_eject"/>
   <Action name="edit_cd" icon="edit"/>
-  <Action name="cddb_now" icon="cdaudio_mount"/>
+  <Action name="cddb_now" icon="media-optical-cdaudio-mounted"/>
 </ActionProperties>
 
 <MenuBar>
diff --git a/libkcddb/kcmcddb/libkcddb.desktop b/libkcddb/kcmcddb/libkcddb.desktop
index 9527268..35d1408 100644
--- a/libkcddb/kcmcddb/libkcddb.desktop
+++ b/libkcddb/kcmcddb/libkcddb.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=tdecmshell libkcddb
-Icon=cdaudio_unmount
+Icon=media-optical-cdaudio
 Type=Application
 X-TDE-ModuleType=Library
 X-TDE-Library=cddb
diff --git a/tdeioslave/audiocd/audiocd.protocol b/tdeioslave/audiocd/audiocd.protocol
index 425240a..f8aa30f 100644
--- a/tdeioslave/audiocd/audiocd.protocol
+++ b/tdeioslave/audiocd/audiocd.protocol
@@ -10,7 +10,7 @@
 deleting=false
 linking=false
 moving=false
-Icon=cdaudio_unmount
+Icon=media-optical-cdaudio
 X-DocPath=tdeioslave/audiocd/index.html
 Class=:local
 ShowPreviews=false
diff --git a/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop b/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop
index 9bed429..aa00979 100644
--- a/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop
+++ b/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=tdecmshell audiocd
-Icon=cdaudio_unmount
+Icon=media-optical-cdaudio
 Type=Application
 X-DocPath=kcontrol/audiocd/index.html
 X-TDE-ModuleType=Library