diff --git a/Makefile b/Makefile
index c2c4f5f0..b4948787 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ uninstall:
 	rm /usr/local/share/sparkleshare/SparkleShare.exe.mdb
 	rmdir /usr/local/share/sparkleshare
 	rm /usr/share/icons/hicolor/*x*/places/folder-sparkleshare.png
+	rm /usr/share/icons/hicolor/*x*/places/folder-sync*.png
 	rm /usr/share/icons/hicolor/*x*/status/document-*ed.png
 	rm /usr/share/icons/hicolor/*x*/status/avatar-default.png
 	rm /usr/share/icons/hicolor/*x*/emblems/emblem-sync*.png
diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs
index f449c420..4e13f8db 100644
--- a/SparkleShare/SparkleStatusIcon.cs
+++ b/SparkleShare/SparkleStatusIcon.cs
@@ -25,13 +25,18 @@ namespace SparkleShare {
 		}
 
 		public void SetIdleState () {
-			IconName = "folder-sparkleshare";
+			IconName = "folder-synced";
 			Tooltip = "SparkleShare, all up to date";
 		}
 
 		public void SetSyncingState () {
-			IconName = "view-refresh"; // Massively abusing this icon here :)
-			Tooltip = "SparkleShare, updating changes...";
+			IconName = "folder-syncing";
+			Tooltip = "SparkleShare, updating files...";
+		}
+
+		public void SetErrorState () {
+			IconName = "folder-sync-error";
+			Tooltip = "SparkleShare, something went wrong";
 		}
 
 	}