diff --git a/digimarks.py b/digimarks.py
index 7cdd186..a935fd4 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -426,9 +426,12 @@ def tags(userkey):
         total = Bookmark.select().where(Bookmark.userkey == userkey, Bookmark.tags.contains(tag), Bookmark.status == Bookmark.VISIBLE).count()
         alltags.append({'tag': tag, 'publictag': publictag, 'total': total})
     totaltags = len(alltags)
-    totalbookmarks = Bookmark.select().where(Bookmark.userkey == userkey).count()
+    totalbookmarks = Bookmark.select().where(Bookmark.userkey == userkey, Bookmark.status == Bookmark.VISIBLE).count()
     totalpublic = PublicTag.select().where(PublicTag.userkey == userkey).count()
-    return render_template('tags.html', tags=alltags, totaltags=totaltags, totalpublic=totalpublic, totalbookmarks=totalbookmarks, userkey=userkey)
+    totaldeleted = Bookmark.select().where(Bookmark.userkey == userkey, Bookmark.status == Bookmark.DELETED).count()
+    totalstarred = Bookmark.select().where(Bookmark.userkey == userkey, Bookmark.starred == True).count()
+    return render_template('tags.html', tags=alltags, totaltags=totaltags, totalpublic=totalpublic, totalbookmarks=totalbookmarks,
+                            totaldeleted=totaldeleted, totalstarred=totalstarred, userkey=userkey)
 
 
 @app.route('/<userkey>/tag/<tag>')
diff --git a/templates/tags.html b/templates/tags.html
index 03f4f56..4c6f9d6 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -5,37 +5,23 @@
 <div class="row">
 
     <div class="col s12">
-    <table>
+    <table class="centered">
         <thead>
             <tr>
-                <th>&nbsp;</th>
-                <th>Total</th>
+                <th><i class="material-icons" title="Unique labels">label</i></th>
+                <th><i class="material-icons green-text" title="Public tag pages">present_to_all</i></th>
+                <th><i class="material-icons" title="Total bookmarks">turned_in</i></th>
+                <th><i class="material-icons yellow-text" title="Starred bookmarks">star</i></th>
+                <th><i class="material-icons red-text" title="Deleted bookmarks">delete</i></th>
             </tr>
         </thead>
         <tbody>
             <tr>
-                <td>
-                    Different tags
-                </td>
-                <td>
-                    {{ totaltags }}
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    Public tag pages
-                </td>
-                <td>
-                    {{ totalpublic }}
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    Bookmarks
-                </td>
-                <td>
-                    {{ totalbookmarks }}
-                </td>
+                <td>{{ totaltags }}</td>
+                <td>{{ totalpublic }}</td>
+                <td>{{ totalbookmarks }}</td>
+                <td>{{ totalstarred }}</td>
+                <td>{{ totaldeleted }}</td>
             </tr>
         </tbody>
     </table>