diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
index d7166d6..d73dd75 100644
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@@ -66,6 +66,7 @@ import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
 import com.mikepenz.materialdrawer.Drawer
 import com.mikepenz.materialdrawer.holder.BadgeStyle
+import com.mikepenz.materialdrawer.holder.StringHolder
 import com.mikepenz.materialdrawer.model.DividerDrawerItem
 import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
 import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
@@ -128,6 +129,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     private var badgeAll: Int = -1
     private var badgeFavs: Int = -1
 
+
+    private lateinit var tagsBadge: Map<Long, Int>
+
     data class DrawerData(val tags: List<Tag>?, val sources: List<Sources>?)
 
     override fun onStart() {
@@ -220,6 +224,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         if (items.size > 0) {
                             badgeNew--
                             reloadBadgeContent()
+
+                            tagsBadge = tagsBadge.map {
+                                if (it.key == i.tags.longHash()) {
+                                    (it.key to (it.value - 1))
+                                } else {
+                                    (it.key to it.value)
+                                }
+                            }.toMap()
+                            reloadTagsBadges()
                         } else {
                             tabNewBadge.hide()
                         }
@@ -417,6 +430,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     }
 
     private fun handleDrawerItems() {
+        tagsBadge = emptyMap()
         fun handleDrawerData(maybeDrawerData: DrawerData?, loadedFromCache: Boolean = false) {
             fun handleTags(maybeTags: List<Tag>?) {
                 if (maybeTags == null) {
@@ -428,10 +442,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         )
                     }
                 } else {
-                    for (tag in maybeTags) {
+                    tagsBadge = maybeTags.map {
                         val gd = GradientDrawable()
                         val color = try {
-                            Color.parseColor(tag.color)
+                            Color.parseColor(it.color)
                         } catch (e: IllegalArgumentException) {
                             resources.getColor(R.color.primary)
                         }
@@ -442,22 +456,24 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         gd.cornerRadius = 30F
                         drawer.addItem(
                             PrimaryDrawerItem()
-                                .withName(tag.tag)
-                                .withIdentifier(tag.tag.longHash())
+                                .withName(it.tag)
+                                .withIdentifier(it.tag.longHash())
                                 .withIcon(gd)
-                                .withBadge("${tag.unread}")
+                                .withBadge("${it.unread}")
                                 .withBadgeStyle(
                                     BadgeStyle().withTextColor(Color.WHITE)
                                         .withColor(appColors.accent)
                                 )
                                 .withOnDrawerItemClickListener { _, _, _ ->
                                     allItems = ArrayList()
-                                    maybeTagFilter = tag
+                                    maybeTagFilter = it
                                     getElementsAccordingToTab()
                                     false
                                 }
                         )
-                    }
+
+                        (it.tag.longHash() to it.unread)
+                    }.toMap()
                 }
             }
 
@@ -963,6 +979,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         }
     }
 
+    private fun reloadTagsBadges() {
+        tagsBadge.forEach {
+            drawer.updateBadge(it.key, StringHolder("${it.value}"))
+        }
+        drawer.resetDrawerContent()
+    }
+
     private fun calculateNoOfColumns(): Int {
         val displayMetrics = resources.displayMetrics
         val dpWidth = displayMetrics.widthPixels / displayMetrics.density
@@ -1054,6 +1077,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     needsConfirmation(R.string.readAll, R.string.markall_dialog_message, {
                         swipeRefreshLayout.isRefreshing = false
                         val ids = allItems.map { it.id }
+                        val itemsByTag: Map<Long, Int> =
+                            allItems
+                                .groupBy { it.tags.longHash() }
+                                .map { it.key to it.value.size }
+                                .toMap()
 
                         fun readAllDebug(e: Throwable) {
                             Crashlytics.setUserIdentifier(userIdentifier)
@@ -1074,6 +1102,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                             Toast.LENGTH_SHORT
                                         ).show()
                                         tabNewBadge.removeBadge()
+
+
+                                        tagsBadge = itemsByTag.map {
+                                            (it.key to ((tagsBadge[it.key] ?: it.value) - it.value))
+                                        }.toMap()
+
+                                        reloadTagsBadges()
+
+                                        getElementsAccordingToTab()
                                     } else {
                                         Toast.makeText(
                                             this@HomeActivity,
diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
index 01e6add..d6405e9 100644
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
@@ -70,7 +70,8 @@ data class Item(
     @SerializedName("thumbnail") val thumbnail: String,
     @SerializedName("icon") val icon: String,
     @SerializedName("link") val link: String,
-    @SerializedName("sourcetitle") val sourcetitle: String
+    @SerializedName("sourcetitle") val sourcetitle: String,
+    @SerializedName("tags") val tags: String
 ) : Parcelable {
 
     var config: Config? = null
@@ -92,7 +93,8 @@ data class Item(
         thumbnail = source.readString(),
         icon = source.readString(),
         link = source.readString(),
-        sourcetitle = source.readString()
+        sourcetitle = source.readString(),
+        tags = source.readString()
     )
 
     override fun describeContents() = 0
@@ -108,6 +110,7 @@ data class Item(
         dest.writeString(icon)
         dest.writeString(link)
         dest.writeString(sourcetitle)
+        dest.writeString(tags)
     }
 
     fun getIcon(app: Context): String {