diff --git a/manifest b/manifest
index cf80497..fb288dc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Folder\sstate\sgeneration\sand\spropagation\snow\shappens\sduring\sworkspace\sscan.
-D 2015-07-11T11:11:23.497
+C Added\sstate\stooltips\sfor\sfolders\nMinor\srefactoring
+D 2015-07-11T11:38:33.592
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -224,7 +224,7 @@ F src/FslSettingsDialog.cpp 2531d3709f0eab66651671e3edead2ca720d07d5
 F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7
 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp 8fa06052057d3baea6940bb678a3d5635c923028
+F src/MainWindow.cpp c28be6f903cc6a5b0e4f3f4fd24f08a68ea2f444
 F src/MainWindow.h 765c362ad4937da808276ec321adf4a351ab5b28
 F src/RemoteDialog.cpp 8540cc5e2e41c4127ed8a028d84691604fa6ecac
 F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d
@@ -252,7 +252,7 @@ F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043
 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b
 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
 F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d
-P a2d5250064d0499d5ceea87b5eadaa8b90057ba8
-R 6b66888091a002191379c9bfc712f500
+P 309756d79851ed8606d748fb226b2eab3d2276a8
+R 1ba13a8c3dfed8a57137f98f9085f473
 U kostas
-Z 4e5fa5b655da848f296886ad1e62bf9b
+Z 340343f58afcf6f76e7fc50d6c26bfb7
diff --git a/manifest.uuid b/manifest.uuid
index 89fdda2..dc8312e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-309756d79851ed8606d748fb226b2eab3d2276a8
\ No newline at end of file
+802d22504691be0f770b7e6ce3840a4d1a12dea4
\ No newline at end of file
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 606bea0..5dcd356 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -65,7 +65,7 @@ struct WorkspaceItem
 	enum
 	{
 		STATE_DEFAULT,
-		STATE_CLEAN,
+		STATE_UNCHANGED,
 		STATE_MODIFIED,
 		STATE_UNKNOWN
 	};
@@ -716,9 +716,9 @@ void MainWindow::scanWorkspace()
 }
 
 //------------------------------------------------------------------------------
-static void addPathToTree(QStandardItem &root, const QString &path, const QIcon &iconDefault, const QIcon &iconClean, const QIcon &iconDirty, const QIcon &iconUnknown, const pathstate_map_t &pathState)
+static void addPathToTree(QStandardItem &root, const QString &path, const QIcon &iconDefault, const QIcon &iconUnchanged, const QIcon &iconModified, const QIcon &iconUnknown, const pathstate_map_t &pathState)
 {
-	QStringList dirs = path.split('/');
+	QStringList dirs = path.split(PATH_SEPARATOR);
 	QStandardItem *parent = &root;
 
 	QString fullpath;
@@ -754,26 +754,39 @@ static void addPathToTree(QStandardItem &root, const QString &path, const QIcon
 				else if(type == WorkspaceFile::TYPE_UNKNOWN)
 					state = WorkspaceItem::STATE_UNKNOWN;
 				else
-					state = WorkspaceItem::STATE_CLEAN;
+					state = WorkspaceItem::STATE_UNCHANGED;
 			}
 
 			QStandardItem *child = new QStandardItem(dir);
 			child->setData(WorkspaceItem(WorkspaceItem::TYPE_FOLDER, fullpath, state), ROLE_WORKSPACE_ITEM);
 
-			if(state == WorkspaceItem::STATE_CLEAN)
-				child->setIcon(iconClean);
+			QString tooltip = fullpath;
+
+			if(state == WorkspaceItem::STATE_UNCHANGED)
+			{
+				child->setIcon(iconUnchanged);
+				tooltip += " " + QObject::tr("Unchanged");
+			}
 			else if(state == WorkspaceItem::STATE_MODIFIED)
-				child->setIcon(iconDirty);
+			{
+				child->setIcon(iconModified);
+				tooltip += " " + QObject::tr("Modified");
+			}
 			else if(state == WorkspaceItem::STATE_UNKNOWN)
+			{
 				child->setIcon(iconUnknown);
+				tooltip += " " + QObject::tr("Unknown");
+			}
 			else
 				child->setIcon(iconDefault);
 
+			child->setToolTip(tooltip);
+
 			parent->appendRow(child);
 			parent = child;
 		}
 
-		fullpath += '/';
+		fullpath += PATH_SEPARATOR;
 	}
 }