diff --git a/manifest b/manifest
index fb288dc..2017cb9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Added\sstate\stooltips\sfor\sfolders\nMinor\srefactoring
-D 2015-07-11T11:38:33.592
+C Folder\sstate\snow\suses\sicon\saliases
+D 2015-07-11T11:43:28.331
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -205,7 +205,7 @@ F rsrc/icons/Zoom-01.png 67ca532922e9166325c5c75fce1ca3fbb0d2b6a6
 F rsrc/icons/fuel.icns 81e535004b62db801a02f3e15d0a33afc9d4070b
 F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038
 F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342
-F rsrc/resources.qrc 388225a5b09c56c12d4cbde8b4d0b4466740fc97
+F rsrc/resources.qrc eee283057169f9a5b32095c0d5cbc99cbc31ad1a
 F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056
 F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597
 F src/CloneDialog.cpp c341622b01d493387d6e4928018b3392d92471e8
@@ -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 c28be6f903cc6a5b0e4f3f4fd24f08a68ea2f444
+F src/MainWindow.cpp b9920340aaa14152287c482b524b12499067dc33
 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 309756d79851ed8606d748fb226b2eab3d2276a8
-R 1ba13a8c3dfed8a57137f98f9085f473
+P 802d22504691be0f770b7e6ce3840a4d1a12dea4
+R d10a7a3bf72e8afb9416f20dd6e5fec3
 U kostas
-Z 340343f58afcf6f76e7fc50d6c26bfb7
+Z 482389d37c0fa3611aa580d30fdee940
diff --git a/manifest.uuid b/manifest.uuid
index dc8312e..e56f7a5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-802d22504691be0f770b7e6ce3840a4d1a12dea4
\ No newline at end of file
+0f8cf57fa2a7b38a7d2a8ca22d7e0fa09b1cd24d
\ No newline at end of file
diff --git a/rsrc/resources.qrc b/rsrc/resources.qrc
index 779203f..a89bdb2 100644
--- a/rsrc/resources.qrc
+++ b/rsrc/resources.qrc
@@ -98,9 +98,9 @@
 	<file alias="icon-action-stash-diff">icons/Folder Explorer-01.png</file>
 	<file alias="icon-action-folder-explore">icons/Folder Explorer-01.png</file>
 	<file>icons/Folder Generic Blue-01.png</file>
-	<file>icons/Folder Generic Green-01.png</file>
-	<file>icons/Folder Generic Red-01.png</file>
-	<file>icons/Folder Generic Silver-01.png</file>
+	<file alias="icon-item-folder-unchanged">icons/Folder Generic Green-01.png</file>
+	<file alias="icon-item-folder-modified">icons/Folder Generic Red-01.png</file>
+	<file alias="icon-item-folder-unknown">icons/Folder Generic Silver-01.png</file>
 	<file alias="icon-action-folder-rename">icons/Folder Open-01.png</file>
 	<file>icons/Folder RAR-01.png</file>
 	<file>icons/Games-01.png</file>
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 5dcd356..40672fb 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -830,7 +830,12 @@ void MainWindow::updateWorkspaceView()
 			if(dir.isEmpty())
 				continue;
 
-			addPathToTree(*workspace, dir, getInternalIcon(":icons/icon-item-folder"), getInternalIcon(":icons/icons/Folder Generic Green-01.png"), getInternalIcon(":icons/icons/Folder Generic Red-01.png"), getInternalIcon(":icons/icons/Folder Generic Silver-01.png"), getWorkspace().getPathState());
+			addPathToTree(*workspace, dir,
+						  getInternalIcon(":icons/icon-item-folder"),
+						  getInternalIcon(":icons/icon-item-folder-unchanged"),
+						  getInternalIcon(":icons/icon-item-folder-modified"),
+						  getInternalIcon(":icons/icon-item-folder-unknown"),
+						  getWorkspace().getPathState());
 		}
 
 		// Expand root folder