diff --git a/icons/calendar-check-2.json b/icons/calendar-check-2.json
index 877725d3ebc..7b0942d8fe1 100644
--- a/icons/calendar-check-2.json
+++ b/icons/calendar-check-2.json
@@ -6,10 +6,13 @@
   ],
   "tags": [
     "date",
-    "time",
+    "day",
+    "month",
+    "year",
     "event",
     "confirm",
     "subscribe",
+    "schedule",
     "done",
     "todo",
     "tick",
diff --git a/icons/calendar-check.json b/icons/calendar-check.json
index d3fc818eb4e..7b0942d8fe1 100644
--- a/icons/calendar-check.json
+++ b/icons/calendar-check.json
@@ -6,7 +6,9 @@
   ],
   "tags": [
     "date",
-    "time",
+    "day",
+    "month",
+    "year",
     "event",
     "confirm",
     "subscribe",
diff --git a/icons/calendar-clock.json b/icons/calendar-clock.json
index 9c8be4409d9..61eb6535c90 100644
--- a/icons/calendar-clock.json
+++ b/icons/calendar-clock.json
@@ -6,9 +6,12 @@
   ],
   "tags": [
     "date",
-    "time",
+    "day",
+    "month",
+    "year",
     "event",
-    "clock"
+    "clock",
+    "hour"
   ],
   "categories": [
     "time"
diff --git a/icons/calendar-days.json b/icons/calendar-days.json
index e5fb6e9c0e9..21bd75aceae 100644
--- a/icons/calendar-days.json
+++ b/icons/calendar-days.json
@@ -6,7 +6,8 @@
   ],
   "tags": [
     "date",
-    "time",
+    "month",
+    "year",
     "event"
   ],
   "categories": [
diff --git a/icons/calendar-heart.json b/icons/calendar-heart.json
index 0c752c171bf..5ac06799ad2 100644
--- a/icons/calendar-heart.json
+++ b/icons/calendar-heart.json
@@ -5,11 +5,13 @@
   ],
   "tags": [
     "date",
-    "time",
+    "month",
+    "year",
     "event",
     "heart",
     "favourite",
-    "subscribe"
+    "subscribe",
+    "valentines day"
   ],
   "categories": [
     "time"
diff --git a/icons/calendar-minus-2.json b/icons/calendar-minus-2.json
index e99b85f9ead..03225650de0 100644
--- a/icons/calendar-minus-2.json
+++ b/icons/calendar-minus-2.json
@@ -5,7 +5,9 @@
   ],
   "tags": [
     "date",
-    "time",
+    "day",
+    "month",
+    "year",
     "event",
     "delete",
     "remove"
diff --git a/icons/calendar-minus.json b/icons/calendar-minus.json
index d4fbcb5ab2b..7734f1d4e63 100644
--- a/icons/calendar-minus.json
+++ b/icons/calendar-minus.json
@@ -6,7 +6,9 @@
   ],
   "tags": [
     "date",
-    "time",
+    "day",
+    "month",
+    "year",
     "event",
     "delete",
     "remove"
diff --git a/icons/calendar-off.json b/icons/calendar-off.json
index d4fbcb5ab2b..7734f1d4e63 100644
--- a/icons/calendar-off.json
+++ b/icons/calendar-off.json
@@ -6,7 +6,9 @@
   ],
   "tags": [
     "date",
-    "time",
+    "day",
+    "month",
+    "year",
     "event",
     "delete",
     "remove"
diff --git a/icons/calendar-plus-2.json b/icons/calendar-plus-2.json
index 3daacd7402e..031b560907d 100644
--- a/icons/calendar-plus-2.json
+++ b/icons/calendar-plus-2.json
@@ -5,7 +5,9 @@
   ],
   "tags": [
     "date",
-    "time",
+    "day",
+    "month",
+    "year",
     "event",
     "add",
     "subscribe",
diff --git a/icons/calendar-plus.json b/icons/calendar-plus.json
index cd0d3dd392a..f3f463a4984 100644
--- a/icons/calendar-plus.json
+++ b/icons/calendar-plus.json
@@ -6,7 +6,9 @@
   ],
   "tags": [
     "date",
-    "time",
+    "day",
+    "month",
+    "year",
     "event",
     "add",
     "subscribe",
diff --git a/icons/calendar-range.json b/icons/calendar-range.json
index c7bb9e37f50..42a131e56d8 100644
--- a/icons/calendar-range.json
+++ b/icons/calendar-range.json
@@ -6,7 +6,9 @@
   ],
   "tags": [
     "date",
-    "time",
+    "day",
+    "month",
+    "year",
     "event",
     "range",
     "period"
diff --git a/icons/calendar-search.json b/icons/calendar-search.json
index 6f385ba929d..af861d735c6 100644
--- a/icons/calendar-search.json
+++ b/icons/calendar-search.json
@@ -6,9 +6,11 @@
   ],
   "tags": [
     "date",
-    "time",
-    "search",
-    "events"
+    "day",
+    "month",
+    "year",
+    "events",
+    "search"
   ],
   "categories": [
     "time"
diff --git a/icons/calendar-x-2.json b/icons/calendar-x-2.json
index b59a53ab5f3..53b7d651ff1 100644
--- a/icons/calendar-x-2.json
+++ b/icons/calendar-x-2.json
@@ -6,7 +6,9 @@
   ],
   "tags": [
     "date",
-    "time",
+    "day",
+    "month",
+    "year",
     "event",
     "remove"
   ],
diff --git a/icons/calendar-x.json b/icons/calendar-x.json
index b124a986306..b24768e85c4 100644
--- a/icons/calendar-x.json
+++ b/icons/calendar-x.json
@@ -6,7 +6,9 @@
   ],
   "tags": [
     "date",
-    "time",
+    "day",
+    "month",
+    "year",
     "event",
     "remove",
     "busy"
diff --git a/icons/calendar.json b/icons/calendar.json
index 5bdbf1ff657..1172063521e 100644
--- a/icons/calendar.json
+++ b/icons/calendar.json
@@ -6,10 +6,11 @@
   ],
   "tags": [
     "date",
-    "birthdate",
+    "month",
+    "year",
+    "event",
     "birthday",
-    "time",
-    "event"
+    "birthdate"
   ],
   "categories": [
     "time"