diff --git a/manifest b/manifest
index de0b505..af91f79 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Support\sfor\sdeleting\stags\nWhen\sparsing\stags,\salso\skeep\strack\sof\sthe\scheckin\suuid\nFixed\skey-value\sparsing\nPrevent\sapply\sstash\swhen\snothing\sis\sselected
-D 2015-05-03T10:05:46.143
+C Fixed\sup-to-date\sworkspace\scheck\nAdded\sicons\sfor\stag\soperations
+D 2015-05-03T10:26:29.811
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -200,7 +200,7 @@ F src/Fossil.cpp 46edbf48a7f09c0673136c726f62cf3e95e92f1e
 F src/Fossil.h 7e45c12f80c06af78bf7a13cce75e0b105e0b99a
 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp b671fe2af7eb0c0abfecfde6840e1871d81b8b2e
+F src/MainWindow.cpp 032fec25b6f679d2863839095c9039ff4bf4b41d
 F src/MainWindow.h dffe67ceb1d7a51b858ce8a0fb688bfa7e90c5be
 F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
 F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
@@ -217,10 +217,10 @@ F ui/BrowserWidget.ui 5ad98b13773afadb20a1a2c22148aaebe5dbd95d
 F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
 F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
-F ui/MainWindow.ui 90bbd2df0afd46e82d4a850882a22f30d3bffe38
+F ui/MainWindow.ui d4fc7971a0717677adb1be0bb88502dfcb92f5c4
 F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
 F ui/UpdateDialog.ui 636fd495d481ade1f20a65f79b538b9a49bbf1fa
-P f718ab845eb859700e230090f2fcbc7ddb068e62
-R 197606d9fc8722007f17afea79985f5b
+P 72ac541c4c28f83c94c371f2d81e116b8f3cf261
+R fd6aaebd153d8868db1e625f9440db3c
 U kostas
-Z ca089f166e60a5d33f43d6190be818dc
+Z 43ffc6ff0a38aa6f520fbb26747d7238
diff --git a/manifest.uuid b/manifest.uuid
index 2c802b5..050962e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-72ac541c4c28f83c94c371f2d81e116b8f3cf261
\ No newline at end of file
+87468705beaaef842877ab8459e287a61edf4bc3
\ No newline at end of file
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 979841f..3fb97c9 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1459,7 +1459,7 @@ void MainWindow::on_actionUpdate_triggered()
 	QStringMap kv;
 	ParseProperties(kv, res, ':');
 	// If no changes exit
-	if(kv.contains("changes") && kv["changes"].indexOf("None."))
+	if(kv.contains("changes") && kv["changes"].indexOf("None.")!=-1)
 		return;
 
 	if(!FileActionDialog::run(this, tr("Update"), tr("The following files will be updated.")+"\n"+tr("Are you sure?"), res))
@@ -2203,7 +2203,7 @@ void MainWindow::updateRevision(const QString &revision)
 	QStringMap kv;
 	ParseProperties(kv, res, ':');
 	// If no changes exit
-	if(kv.contains("changes") && kv["changes"].indexOf("None."))
+	if(kv.contains("changes") && kv["changes"].indexOf("None.")!=-1)
 		return;
 
 	if(!FileActionDialog::run(this, tr("Update"), tr("The following files will be updated.")+"\n"+tr("Are you sure?"), res))
@@ -2239,7 +2239,7 @@ void MainWindow::on_actionDeleteTag_triggered()
 
 	const QString &tagname = selectedTags.first();
 
-	if(QMessageBox::Yes != DialogQuery(this, tr("Delete Tag"), tr("Are you sure want to delete the tag %0 ?").arg(tagname)))
+	if(QMessageBox::Yes != DialogQuery(this, tr("Delete Tag"), tr("Are you sure want to delete the tag '%0' ?").arg(tagname)))
 		return;
 
 	Q_ASSERT(getWorkspace().getTags().contains(tagname));
diff --git a/ui/MainWindow.ui b/ui/MainWindow.ui
index 1d4c60e..c5ca02e 100644
--- a/ui/MainWindow.ui
+++ b/ui/MainWindow.ui
@@ -918,6 +918,10 @@
    </property>
   </action>
   <action name="actionDeleteTag">
+   <property name="icon">
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Button Close-01.png</normaloff>:/icons/icons/Button Close-01.png</iconset>
+   </property>
    <property name="text">
     <string>Delete Tag</string>
    </property>
@@ -938,6 +942,10 @@
    </property>
   </action>
   <action name="actionMergeBranch">
+   <property name="icon">
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icons/Document Flow Chart-01.png</normaloff>:/icons/icons/Document Flow Chart-01.png</iconset>
+   </property>
    <property name="text">
     <string>Merge Branch</string>
    </property>