diff --git a/images/tag.png b/images/tag.png
deleted file mode 100644
index 40c5fd44e2..0000000000
Binary files a/images/tag.png and /dev/null differ
diff --git a/images/tag_b.png b/images/tag_b.png
deleted file mode 100644
index 66c03415de..0000000000
Binary files a/images/tag_b.png and /dev/null differ
diff --git a/view/theme/quattro/dark/colors.less b/view/theme/quattro/dark/colors.less
index 5c9de37531..35a8d8468f 100644
--- a/view/theme/quattro/dark/colors.less
+++ b/view/theme/quattro/dark/colors.less
@@ -89,6 +89,7 @@
 @CommentBoxFullBorderColor: @Grey5;
 
 @TagColor: @Grey1;
+@MentionColor: @Grey4;
 
 @JotToolsBackgroundColor: @Metalic4;
 @JotToolsBorderColor: @Metalic2;
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 524edf4e3d..fff08b2e4c 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -1138,19 +1138,45 @@ section {
   padding-top: 5px;
 }
 .tag {
-  background: url("../../../images/tag_b.png") no-repeat center left;
+  background: url("icons/tag.png") no-repeat center right;
   color: #ffffff;
+  padding-right: 8px;
   padding-left: 3px;
 }
 .tag a {
-  padding-right: 8px;
-  background: url("../../../images/tag.png") no-repeat center right;
   color: #ffffff;
 }
-.filesavetags {
-  padding: 3px 0px 3px 0px;
-  opacity: 0.5;
+.mention {
+  background: url("icons/men.png") no-repeat 1px center;
+  color: #666666;
+  padding-right: 3px;
+  padding-left: 18px;
 }
+.mention a {
+  color: #666666;
+}
+.folder {
+  background: url("icons/folder.png") no-repeat 1px center;
+  color: #666666;
+  padding-right: 3px;
+  padding-left: 15px;
+}
+.folder a {
+  color: #666666;
+}
+.category {
+  background: url("icons/category.png") no-repeat 1px center;
+  color: #666666;
+  padding-right: 3px;
+  padding-left: 15px;
+}
+.category a {
+  color: #666666;
+}
+/*.filesavetags {
+    padding: 3px 0px 3px 0px;
+    opacity: 0.5;
+}*/
 .wwto {
   background: #FFFFFF;
   border: 2px solid #364e59;
diff --git a/view/theme/quattro/green/colors.less b/view/theme/quattro/green/colors.less
index f14c636331..78c67a13b4 100644
--- a/view/theme/quattro/green/colors.less
+++ b/view/theme/quattro/green/colors.less
@@ -87,6 +87,7 @@
 @CommentBoxFullBorderColor: @Grey5;
 
 @TagColor: @Grey1;
+@MentionColor: @Grey4;
 
 @JotToolsBackgroundColor: @Green3;
 @JotToolsBorderColor: @Metalic2;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index a89277a128..9584b019aa 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -1138,19 +1138,45 @@ section {
   padding-top: 5px;
 }
 .tag {
-  background: url("../../../images/tag_b.png") no-repeat center left;
+  background: url("icons/tag.png") no-repeat center right;
   color: #ffffff;
+  padding-right: 8px;
   padding-left: 3px;
 }
 .tag a {
-  padding-right: 8px;
-  background: url("../../../images/tag.png") no-repeat center right;
   color: #ffffff;
 }
-.filesavetags {
-  padding: 3px 0px 3px 0px;
-  opacity: 0.5;
+.mention {
+  background: url("icons/men.png") no-repeat 1px center;
+  color: #666666;
+  padding-right: 3px;
+  padding-left: 18px;
 }
+.mention a {
+  color: #666666;
+}
+.folder {
+  background: url("icons/folder.png") no-repeat 1px center;
+  color: #666666;
+  padding-right: 3px;
+  padding-left: 15px;
+}
+.folder a {
+  color: #666666;
+}
+.category {
+  background: url("icons/category.png") no-repeat 1px center;
+  color: #666666;
+  padding-right: 3px;
+  padding-left: 15px;
+}
+.category a {
+  color: #666666;
+}
+/*.filesavetags {
+    padding: 3px 0px 3px 0px;
+    opacity: 0.5;
+}*/
 .wwto {
   background: #FFFFFF;
   border: 2px solid #364e59;
diff --git a/view/theme/quattro/icons/category.png b/view/theme/quattro/icons/category.png
new file mode 100644
index 0000000000..ec4ad1dc59
Binary files /dev/null and b/view/theme/quattro/icons/category.png differ
diff --git a/view/theme/quattro/icons/folder.png b/view/theme/quattro/icons/folder.png
new file mode 100644
index 0000000000..fee4395521
Binary files /dev/null and b/view/theme/quattro/icons/folder.png differ
diff --git a/view/theme/quattro/icons/men.png b/view/theme/quattro/icons/men.png
new file mode 100644
index 0000000000..e5b9c4a6f6
Binary files /dev/null and b/view/theme/quattro/icons/men.png differ
diff --git a/view/theme/quattro/icons/tag.png b/view/theme/quattro/icons/tag.png
new file mode 100644
index 0000000000..15758af472
Binary files /dev/null and b/view/theme/quattro/icons/tag.png differ
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index ca4ec2625d..62260ef393 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -591,19 +591,37 @@ section {
 
 .wall-item-tags { padding-top: 5px; }
 .tag {
-	background: url("../../../images/tag_b.png") no-repeat center left;
+	background: url("icons/tag.png") no-repeat center right;
 	color: @TagColor;
+	padding-right: 8px;
 	padding-left: 3px;
-	a {
-		padding-right: 8px;
-		background: url("../../../images/tag.png") no-repeat center right;
-		color: @TagColor;
-	}
+	a { color: @TagColor;	}
 }
-.filesavetags {
+.mention {
+	background: url("icons/men.png") no-repeat 1px center;
+	color: @MentionColor;
+	padding-right: 3px;
+	padding-left: 18px;
+	a { color: @MentionColor;	}
+}
+.folder {
+	background: url("icons/folder.png") no-repeat 1px center;
+	color: @MentionColor;
+	padding-right: 3px;
+	padding-left: 15px;
+	a { color: @MentionColor;	}
+}
+.category {
+	background: url("icons/category.png") no-repeat 1px center;
+	color: @MentionColor;
+	padding-right: 3px;
+	padding-left: 15px;
+	a { color: @MentionColor;	}
+}
+/*.filesavetags {
     padding: 3px 0px 3px 0px;
     opacity: 0.5;
-}
+}*/
 
 .wwto { 
 	position: absolute !important;