Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance

diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index eaab1e5..11cb218 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -56,8 +56,8 @@
 	(void) new TDEAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(info()), actionCollection(), "boardinfo");
 	(void) new TDEAction(i18n("&Edit Groups..."), CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(editGroups()), actionCollection(), "groupeditor");
 
-	(void) new TDEAction(i18n("&Add 4 Squares"), "viewmag+", 0, TQT_TQOBJECT(this), TQT_SLOT(larger()), actionCollection(), "larger");
-	(void) new TDEAction(i18n("&Remove 4 Squares"), "viewmag-", 0, TQT_TQOBJECT(this), TQT_SLOT(smaller()), actionCollection(), "smaller");
+	(void) new TDEAction(i18n("&Add 4 Squares"), "zoom-in", 0, TQT_TQOBJECT(this), TQT_SLOT(larger()), actionCollection(), "larger");
+	(void) new TDEAction(i18n("&Remove 4 Squares"), "zoom-out", 0, TQT_TQOBJECT(this), TQT_SLOT(smaller()), actionCollection(), "smaller");
 	(void) KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection());
 	(void) KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection());
 	(void) new TDEAction(i18n("&Up"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), actionCollection(), "up");
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index e3f5c43..49aba50 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -221,7 +221,7 @@
 		playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"play.png")));
 	}
 	else
-		playpause_button->setIconSet(SmallIconSet("player_play"));
+		playpause_button->setIconSet(SmallIconSet("media-playback-start"));
 }
 
 void MediaControl::slotPlayingStatusChanged(int status)
@@ -239,13 +239,13 @@
 			if(_configFrontend->useCustomTheme())
 				playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"play.png")));
 			else
-				playpause_button->setIconSet(SmallIconSet("player_play"));
+				playpause_button->setIconSet(SmallIconSet("media-playback-start"));
 			break;
 		case (PlayerInterface::Playing):
 			if(_configFrontend->useCustomTheme())
 				playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"pause.png")));
 			else
-				playpause_button->setIconSet(SmallIconSet("player_pause"));
+				playpause_button->setIconSet(SmallIconSet("media-playback-pause"));
 			break;
 	}
 }
@@ -254,13 +254,13 @@
 {
 	if(!_configFrontend->useCustomTheme())
 	{
-		prev_button->setIconSet(SmallIconSet("player_start"));
+		prev_button->setIconSet(SmallIconSet("media-skip-backward"));
 		if (_player->playingStatus() == PlayerInterface::Playing)
-			playpause_button->setIconSet(SmallIconSet("player_pause"));
+			playpause_button->setIconSet(SmallIconSet("media-playback-pause"));
 		else
-			playpause_button->setIconSet(SmallIconSet("player_play"));
-		stop_button->setIconSet(SmallIconSet("player_stop"));
-		next_button->setIconSet(SmallIconSet("player_end"));
+			playpause_button->setIconSet(SmallIconSet("media-playback-start"));
+		stop_button->setIconSet(SmallIconSet("media-playback-stop"));
+		next_button->setIconSet(SmallIconSet("media-skip-forward"));
 	}
 }
 
diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp
index 1f1b4a6..5eaa6f1 100644
--- a/konq-plugins/rellinks/plugin_rellinks.cpp
+++ b/konq-plugins/rellinks/plugin_rellinks.cpp
@@ -144,7 +144,7 @@
     m_more->insert(tdeaction_map["help"]);
     tdeaction_map["help"]->setWhatsThis( i18n("<p>This link references the help.</p>") );
 
-    tdeaction_map["author"]  = new TDEAction( i18n("&Authors"), "mail_new", TDEShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" );
+    tdeaction_map["author"]  = new TDEAction( i18n("&Authors"), "mail-message-new", TDEShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" );
     m_more->insert(tdeaction_map["author"]);
     tdeaction_map["author"]->setWhatsThis( i18n("<p>This link references the author.</p>") );
 
diff --git a/konq-plugins/sidebar/metabar/src/layout.html b/konq-plugins/sidebar/metabar/src/layout.html
index 6bae311..baf2513 100644
--- a/konq-plugins/sidebar/metabar/src/layout.html
+++ b/konq-plugins/sidebar/metabar/src/layout.html
@@ -37,7 +37,7 @@
 </div>
 
 <div class="frame">
-  <div class="head"><a i18n image="player_play" class="title" onClick="this.blur();"  href="function://toggle/preview">Preview</a></div>
+  <div class="head"><a i18n image="media-playback-start" class="title" onClick="this.blur();"  href="function://toggle/preview">Preview</a></div>
   <li id="preview" expanded="true" style="height:0px">
   </li>
 </div>

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeaddons

diff --git a/cmake b/cmake
index 08c6f54..47d7755 160000
--- a/cmake
+++ b/cmake
-Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
+Subproject commit 47d775518c382c77f663a70bb23fad93e6810090