diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp
index d2cdda3..9d425f0 100644
--- a/kaffeine/src/input/disc/disc.cpp
+++ b/kaffeine/src/input/disc/disc.cpp
@@ -113,7 +113,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
 	h1->addWidget( ripBtn );
 	vb->addLayout( h1 );
 
-	cdBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("media-optical-cdaudio", TDEIcon::Toolbar) );
+	cdBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("media-optical-cdaudio-unmounted", TDEIcon::Toolbar) );
 	ripBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", TDEIcon::Toolbar) );
 
 	connect( cdBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startCD()) );
@@ -205,13 +205,13 @@ void Disc::getTargets( TQStringList &uiNames, TQStringList &iconNames, TQStringL
 	iconNames.append( "kilogram" );
 	targetNames.append( "DISC_RIP" );
 	uiNames.append( i18n("Play Audio CD") );
-	iconNames.append( "media-optical-cdaudio" );
+	iconNames.append( "media-optical-cdaudio-unmounted" );
 	targetNames.append( "DISC_CDDA" );
 	uiNames.append( i18n("Play DVD") );
-	iconNames.append( "media-optical-dvd" );
+	iconNames.append( "media-optical-dvd-unmounted" );
 	targetNames.append( "DISC_DVD" );
 	uiNames.append( i18n("Play VCD") );
-	iconNames.append( "media-optical-cdrom" );
+	iconNames.append( "media-optical-cdrom-unmounted" );
 	targetNames.append( "DISC_VCD" );
 }
 
@@ -266,9 +266,9 @@ TQWidget* Disc::inputMainWidget()
 
 void Disc::setupActions()
 {
-	new TDEAction(i18n("Open &DVD"), "media-optical-dvd", 0, this, TQT_SLOT(startDVD()), actionCollection(), "file_open_dvd");
-	new TDEAction(i18n("Open &VCD"), "media-optical-cdrom", 0, this, TQT_SLOT(startVCD()), actionCollection(), "file_open_vcd");
-	new TDEAction(i18n("Open &Audio-CD"), "media-optical-cdaudio", 0, this, TQT_SLOT(startCD()), actionCollection(), "file_open_audiocd");
+	new TDEAction(i18n("Open &DVD"), "media-optical-dvd-unmounted", 0, this, TQT_SLOT(startDVD()), actionCollection(), "file_open_dvd");
+	new TDEAction(i18n("Open &VCD"), "media-optical-cdrom-unmounted", 0, this, TQT_SLOT(startVCD()), actionCollection(), "file_open_vcd");
+	new TDEAction(i18n("Open &Audio-CD"), "media-optical-cdaudio-unmounted", 0, this, TQT_SLOT(startCD()), actionCollection(), "file_open_audiocd");
 }
 
 void Disc::playerStopped()
diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp
index b02a6f7..5078e5b 100644
--- a/kaffeine/src/input/dvb/dvbconfig.cpp
+++ b/kaffeine/src/input/dvb/dvbconfig.cpp
@@ -827,7 +827,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 	}
 
 	page = addPage(i18n("Recording"),i18n("DVB Recording Options"),
-		TDEGlobal::instance()->iconLoader()->loadIcon( "drive-harddisk", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
+		TDEGlobal::instance()->iconLoader()->loadIcon( "drive-harddisk-unmounted", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 	vb = new TQVBoxLayout( page, 6, 6 );
 	gb = new TQGroupBox( "", page );
 	grid = new TQGridLayout( gb, 1, 1, 20, 6 );
diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
index 3170675..c0edd72 100644
--- a/kaffeine/src/kaffeine.cpp
+++ b/kaffeine/src/kaffeine.cpp
@@ -193,7 +193,7 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
 	guiFactory()->addClient( m_playlist );
 
 	cddisc = new Disc( stack, TQT_TQOBJECT(this) );
-	inplug->add( cddisc, TDEGlobal::iconLoader()->loadIcon("media-optical-cdrom", TDEIcon::Small), i18n( "Audio CD") );
+	inplug->add( cddisc, TDEGlobal::iconLoader()->loadIcon("media-optical-cdrom-unmounted", TDEIcon::Small), i18n( "Audio CD") );
 	guiFactory()->addClient( cddisc );
 
 	connect(m_playlist, TQT_SIGNAL(signalRequestForDVD(const TQString&)), cddisc, TQT_SLOT(startDVD(const TQString&)));
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
index ba3e195..118d1f7 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
@@ -71,8 +71,8 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
 	layout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
 
 	//Media page
-	frame = addPage(i18n("Media"), i18n("Media Options"), TDEGlobal::iconLoader()->loadIcon("media-optical-cdrom", TDEIcon::Panel,
-	                TDEIcon::SizeMedium));
+	frame = addPage(i18n("Media"), i18n("Media Options"), TDEGlobal::iconLoader()->loadIcon("media-optical-cdrom-unmounted",
+	                TDEIcon::Panel, TDEIcon::SizeMedium));
 	layout = new TQGridLayout(frame, 10, 2);
 	layout->setMargin(10);
 	layout->setSpacing(10);
diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
index ae386da..6ff18c0 100644
--- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp
+++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
@@ -256,13 +256,13 @@ XineConfig::XineConfig(const xine_t* const xine) :
 		else if (*it == "video")
 			icon = "video-x-generic";
 		else if (*it == "vcd")
-			icon = "media-optical-cdrom";
+			icon = "media-optical-cdrom-unmounted";
 		else if (*it == "input")
 			icon = "connect_established";
 		else if (*it == "effects")
 			icon = "wizard";
 		else if (*it == "media")
-			icon = "media-optical-cdrom";
+			icon = "media-optical-cdrom-unmounted";
 		else if (*it == "subtitles")
 			icon = "application-x-font-snf";
 		else if (*it == "osd")