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/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp
index c4fd896..58a9c20 100644
--- a/ksquirrel/ksquirrel.cpp
+++ b/ksquirrel/ksquirrel.cpp
@@ -820,8 +820,8 @@
     pAThumb2 = new TDERadioAction(i18n("Large thumbnails"), locate("data", "images/thumbs/thumbs_large.png"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotThumbsLarge()), actionCollection(), "SQ thumbs2");
     pAThumb3 = new TDERadioAction(i18n("Huge thumbnails"), locate("data", "images/thumbs/thumbs_huge.png"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotThumbsHuge()), actionCollection(), "SQ thumbs3");
 
-    pASelectGroup = new TDEAction(i18n("Select group"), "viewmag+", CTRL+TQt::Key_Plus, 0, 0, actionCollection(), "SQ Select Group");
-    pADeselectGroup = new TDEAction(i18n("Deselect group"), "viewmag-", CTRL+TQt::Key_Minus, 0, 0, actionCollection(), "SQ Deselect Group");
+    pASelectGroup = new TDEAction(i18n("Select group"), "zoom-in", CTRL+TQt::Key_Plus, 0, 0, actionCollection(), "SQ Select Group");
+    pADeselectGroup = new TDEAction(i18n("Deselect group"), "zoom-out", CTRL+TQt::Key_Minus, 0, 0, actionCollection(), "SQ Deselect Group");
 
     const TQString thumbs_size__ = TQString::fromLatin1("thumbs_size__");
     pAThumb1->setExclusiveGroup(thumbs_size__);
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
index 92cc629..27864ed 100644
--- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
+++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
@@ -81,10 +81,10 @@
     TDEAction *a;
 
     a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Plus));
-    new TDEAction(i18n("Zoom +"), "viewmag+", 0, a,  TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom in");
+    new TDEAction(i18n("Zoom +"), "zoom-in", 0, a,  TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom in");
 
     a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Minus));
-    new TDEAction(i18n("Zoom -"), "viewmag-", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom out");
+    new TDEAction(i18n("Zoom -"), "zoom-out", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom out");
 
     a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_P));
     new TDEAction(i18n("Properties"), "image",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart properties");
@@ -101,10 +101,10 @@
 
     // rotate
     a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Left+CTRL));
-    new TDEAction(i18n("Rotate left"), "rotate_ccw",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart rotateleft");
+    new TDEAction(i18n("Rotate left"), "object-rotate-left",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart rotateleft");
 
     a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Right+CTRL));
-    new TDEAction(i18n("Rotate right"), "rotate_cw",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart rotateright");
+    new TDEAction(i18n("Rotate right"), "object-rotate-right",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart rotateright");
 
     // copy/move
     a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F5));
diff --git a/ksquirrel/sq_progressbox.cpp b/ksquirrel/sq_progressbox.cpp
index bab32d8..8997589 100644
--- a/ksquirrel/sq_progressbox.cpp
+++ b/ksquirrel/sq_progressbox.cpp
@@ -29,7 +29,7 @@
 //    TQToolBar *progressBoxBar = new TQToolBar(TQString(), NULL, this);
     buttonStop = new TQPushButton(this);
     buttonStop->setFlat(true);
-    buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("player_stop", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("media-playback-stop", TDEIcon::Desktop, TDEIcon::SizeSmall));
     connect(buttonStop, TQT_SIGNAL(clicked()), parent, TQT_SLOT(slotThumbnailUpdateToggle()));
 
     // create progress bar
@@ -50,10 +50,10 @@
 
 void SQ_ProgressBox::startButtonPixmap()
 {
-    buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("player_play", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("media-playback-start", TDEIcon::Desktop, TDEIcon::SizeSmall));
 }
 
 void SQ_ProgressBox::stopButtonPixmap()
 {
-    buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("player_stop", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("media-playback-stop", TDEIcon::Desktop, TDEIcon::SizeSmall));
 }
diff --git a/ksquirrel/sq_slideshowwidget.cpp b/ksquirrel/sq_slideshowwidget.cpp
index 5ed32d3..2577d4a 100644
--- a/ksquirrel/sq_slideshowwidget.cpp
+++ b/ksquirrel/sq_slideshowwidget.cpp
@@ -89,7 +89,7 @@
 
     buttonPause = new TQToolButton(options);
     buttonPause->setToggleButton(true);
-    buttonPause->setIconSet(SQ_IconLoader::instance()->loadIcon("player_pause", TDEIcon::Desktop, is));
+    buttonPause->setIconSet(SQ_IconLoader::instance()->loadIcon("media-playback-pause", TDEIcon::Desktop, is));
     connect(buttonPause, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(pause()));
 
     b = new TQToolButton(options);

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

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