Bring stop, lock, exit, and run icons into XDG compliance

diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
index 5e9601c..2ed85bc 100644
--- a/src/gvcore/filethumbnailview.cpp
+++ b/src/gvcore/filethumbnailview.cpp
@@ -82,7 +82,7 @@
 		setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
 		
 		mStop=new TQPushButton(this);
-		mStop->setPixmap(SmallIcon("stop"));
+		mStop->setPixmap(SmallIcon("process-stop"));
 		mStop->setFlat(true);
 
 		mProgressBar=new KProgress(count, this);
diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
index ec8f490..9330308 100644
--- a/src/gvcore/imageview.cpp
+++ b/src/gvcore/imageview.cpp
@@ -342,7 +342,7 @@
 	d->mResetZoom=KStdAction::actualSize(TQT_TQOBJECT(this),TQT_SLOT(slotResetZoom()),d->mActionCollection);
 	d->mResetZoom->setIcon("viewmag1");
 
-	d->mLockZoom=new TDEToggleAction(i18n("&Lock Zoom"),"lock",0,d->mActionCollection,"view_zoom_lock");
+	d->mLockZoom=new TDEToggleAction(i18n("&Lock Zoom"),"system-lock-screen",0,d->mActionCollection,"view_zoom_lock");
 	d->mLockZoom->setChecked(ImageViewConfig::lockZoom());
 	connect(d->mLockZoom,TQT_SIGNAL(toggled(bool)),
 		TQT_TQOBJECT(this), TQT_SLOT(setLockZoom(bool)) );

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

diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c