diff --git a/aqt/browser.py b/aqt/browser.py
index 9081ba96a..b452417df 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -513,9 +513,9 @@ class Browser(QMainWindow):
             self.onclick = onclick
 
     def setupTree(self):
+        self._systemTagTree(self.form.tree.invisibleRootItem())
         self.form.tree.addTopLevelItem(self._modelTree())
         self.form.tree.addTopLevelItem(self._groupTree())
-        self.form.tree.addTopLevelItem(self._systemTagTree())
         self.form.tree.addTopLevelItem(self._userTagTree())
         self.form.tree.expandToDepth(0)
         self.form.tree.setIndentation(15)
@@ -577,16 +577,16 @@ class Browser(QMainWindow):
         fillGroups(root, grps)
         return root
 
-    def _systemTagTree(self):
-        root = QTreeWidgetItem([_("System Tags")])
-        root.setIcon(0, QIcon(":/icons/anki-tag.png"))
-        tags = ((_("New"), "anki-tag.png", "is:new"),
-                (_("Learning"), "anki-tag.png", "is:lrn"),
-                (_("Review"), "anki-tag.png", "is:rev"),
-                (_("Due"), "anki-tag.png", "is:due"),
-                (_("Marked"), "anki-tag.png", "tag:marked"),
-                (_("Suspended"), "anki-tag.png", "is:suspended"),
-                (_("Leech"), "anki-tag.png", "tag:leech"))
+    def _systemTagTree(self, root):
+        tags = (
+            (_("All cards"), "stock_new_template", ""),
+            (_("Never seen"), "stock_new_template_blue.png", "is:new"),
+            (_("In learning"), "stock_new_template_red.png", "is:lrn"),
+            (_("In review"), "stock_new_template_green.png", "is:rev"),
+            (_("Due reviews"), "stock_new_template_green.png", "is:due"),
+            (_("Marked"), "rating.png", "tag:marked"),
+            (_("Suspended"), "media-playback-pause.png", "is:suspended"),
+            (_("Leech"), "emblem-important.png", "tag:leech"))
         for name, icon, cmd in tags:
             item = self.CallbackItem(
                 name, lambda c=cmd: self.setFilter(c))
@@ -595,7 +595,7 @@ class Browser(QMainWindow):
         return root
 
     def _userTagTree(self):
-        root = QTreeWidgetItem([_("User Tags")])
+        root = QTreeWidgetItem([_("Tags")])
         root.setIcon(0, QIcon(":/icons/anki-tag.png"))
         for t in self.deck.tagList():
             item = self.CallbackItem(
diff --git a/designer/icons.qrc b/designer/icons.qrc
index ed8341229..6c0150065 100644
--- a/designer/icons.qrc
+++ b/designer/icons.qrc
@@ -99,6 +99,9 @@
     <file>icons/text_remove.png</file>
     <file>icons/product_design.png</file>
     <file>icons/stock_new_template.png</file>
+    <file>icons/stock_new_template_blue.png</file>
+    <file>icons/stock_new_template_green.png</file>
+    <file>icons/stock_new_template_red.png</file>
     <file>icons/stock_group.png</file>
   </qresource>
 </RCC>
diff --git a/designer/icons/stock_new_template.png b/designer/icons/stock_new_template.png
index 0c77eba09..479adde4f 100644
Binary files a/designer/icons/stock_new_template.png and b/designer/icons/stock_new_template.png differ
diff --git a/designer/icons/stock_new_template_blue.png b/designer/icons/stock_new_template_blue.png
new file mode 100644
index 000000000..d77a9e4ba
Binary files /dev/null and b/designer/icons/stock_new_template_blue.png differ
diff --git a/designer/icons/stock_new_template_green.png b/designer/icons/stock_new_template_green.png
new file mode 100644
index 000000000..55c283b2e
Binary files /dev/null and b/designer/icons/stock_new_template_green.png differ
diff --git a/designer/icons/stock_new_template_red.png b/designer/icons/stock_new_template_red.png
new file mode 100644
index 000000000..3389a744c
Binary files /dev/null and b/designer/icons/stock_new_template_red.png differ