diff --git a/icons/calendar-check-2.json b/icons/calendar-check-2.json
index 877725d3e..7b0942d8f 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-2.svg b/icons/calendar-check-2.svg
index 3f1433873..c23c6d788 100644
--- a/icons/calendar-check-2.svg
+++ b/icons/calendar-check-2.svg
@@ -9,9 +9,9 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
+  <path d="M8 2v4" />
+  <path d="M16 2v4" />
   <path d="M21 14V6a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h8" />
-  <line x1="16" x2="16" y1="2" y2="6" />
-  <line x1="8" x2="8" y1="2" y2="6" />
-  <line x1="3" x2="21" y1="10" y2="10" />
+  <path d="M3 10h18" />
   <path d="m16 20 2 2 4-4" />
 </svg>
diff --git a/icons/calendar-check.json b/icons/calendar-check.json
index d3fc818eb..7b0942d8f 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-check.svg b/icons/calendar-check.svg
index 72abdd187..270f8439b 100644
--- a/icons/calendar-check.svg
+++ b/icons/calendar-check.svg
@@ -9,9 +9,9 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="18" height="18" x="3" y="4" rx="2" ry="2" />
-  <line x1="16" x2="16" y1="2" y2="6" />
-  <line x1="8" x2="8" y1="2" y2="6" />
-  <line x1="3" x2="21" y1="10" y2="10" />
+  <path d="M8 2v4" />
+  <path d="M16 2v4" />
+  <rect width="18" height="18" x="3" y="4" rx="2" />
+  <path d="M3 10h18" />
   <path d="m9 16 2 2 4-4" />
 </svg>
diff --git a/icons/calendar-clock.json b/icons/calendar-clock.json
index 9c8be4409..61eb6535c 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-clock.svg b/icons/calendar-clock.svg
index a1c19bda4..ce254a444 100644
--- a/icons/calendar-clock.svg
+++ b/icons/calendar-clock.svg
@@ -13,6 +13,6 @@
   <path d="M16 2v4" />
   <path d="M8 2v4" />
   <path d="M3 10h5" />
-  <path d="M17.5 17.5 16 16.25V14" />
-  <path d="M22 16a6 6 0 1 1-12 0 6 6 0 0 1 12 0Z" />
+  <path d="M17.5 17.5 16 16.3V14" />
+  <circle cx="16" cy="16" r="6" />
 </svg>
diff --git a/icons/calendar-days.json b/icons/calendar-days.json
index e5fb6e9c0..21bd75ace 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-days.svg b/icons/calendar-days.svg
index d97809e50..f05864a9c 100644
--- a/icons/calendar-days.svg
+++ b/icons/calendar-days.svg
@@ -9,10 +9,10 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="18" height="18" x="3" y="4" rx="2" ry="2" />
-  <line x1="16" x2="16" y1="2" y2="6" />
-  <line x1="8" x2="8" y1="2" y2="6" />
-  <line x1="3" x2="21" y1="10" y2="10" />
+  <path d="M8 2v4" />
+  <path d="M16 2v4" />
+  <rect width="18" height="18" x="3" y="4" rx="2" />
+  <path d="M3 10h18" />
   <path d="M8 14h.01" />
   <path d="M12 14h.01" />
   <path d="M16 14h.01" />
diff --git a/icons/calendar-fold.json b/icons/calendar-fold.json
new file mode 100644
index 000000000..abc62e538
--- /dev/null
+++ b/icons/calendar-fold.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "date",
+    "month",
+    "year",
+    "event",
+    "birthday",
+    "birthdate",
+    "ics"
+  ],
+  "categories": [
+    "time",
+    "files"
+  ]
+}
\ No newline at end of file
diff --git a/icons/calendar-fold.svg b/icons/calendar-fold.svg
new file mode 100644
index 000000000..0e200a5c1
--- /dev/null
+++ b/icons/calendar-fold.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M8 2v4" />
+  <path d="M16 2v4" />
+  <path d="M21 17V6a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h11Z" />
+  <path d="M3 10h18" />
+  <path d="M15 22v-4a2 2 0 0 1 2-2h4" />
+</svg>
diff --git a/icons/calendar-heart.json b/icons/calendar-heart.json
index 0c752c171..5ac06799a 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-heart.svg b/icons/calendar-heart.svg
index 18bb1f746..0ad9524b0 100644
--- a/icons/calendar-heart.svg
+++ b/icons/calendar-heart.svg
@@ -9,9 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M21 10V6a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v14c0 1.1.9 2 2 2h7" />
-  <path d="M16 2v4" />
+  <path d="M3 10h18V6a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h7" />
   <path d="M8 2v4" />
-  <path d="M3 10h18" />
+  <path d="M16 2v4" />
   <path d="M21.29 14.7a2.43 2.43 0 0 0-2.65-.52c-.3.12-.57.3-.8.53l-.34.34-.35-.34a2.43 2.43 0 0 0-2.65-.53c-.3.12-.56.3-.79.53-.95.94-1 2.53.2 3.74L17.5 22l3.6-3.55c1.2-1.21 1.14-2.8.19-3.74Z" />
 </svg>
diff --git a/icons/calendar-minus-2.json b/icons/calendar-minus-2.json
new file mode 100644
index 000000000..03225650d
--- /dev/null
+++ b/icons/calendar-minus-2.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "date",
+    "day",
+    "month",
+    "year",
+    "event",
+    "delete",
+    "remove"
+  ],
+  "categories": [
+    "time"
+  ]
+}
\ No newline at end of file
diff --git a/icons/calendar-minus-2.svg b/icons/calendar-minus-2.svg
new file mode 100644
index 000000000..ed715e846
--- /dev/null
+++ b/icons/calendar-minus-2.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M8 2v4" />
+  <path d="M16 2v4" />
+  <rect width="18" height="18" x="3" y="4" rx="2" />
+  <path d="M3 10h18" />
+  <path d="M10 16h4" />
+</svg>
diff --git a/icons/calendar-minus.json b/icons/calendar-minus.json
index d4fbcb5ab..7734f1d4e 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-minus.svg b/icons/calendar-minus.svg
index daf82bb58..1e9308a89 100644
--- a/icons/calendar-minus.svg
+++ b/icons/calendar-minus.svg
@@ -9,9 +9,9 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
+  <path d="M8 2v4" />
+  <path d="M16 2v4" />
   <path d="M21 13V6a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h8" />
-  <line x1="16" x2="16" y1="2" y2="6" />
-  <line x1="8" x2="8" y1="2" y2="6" />
-  <line x1="3" x2="21" y1="10" y2="10" />
-  <line x1="16" x2="22" y1="19" y2="19" />
+  <path d="M3 10h18" />
+  <path d="M16 19h6" />
 </svg>
diff --git a/icons/calendar-off.json b/icons/calendar-off.json
index d4fbcb5ab..7734f1d4e 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-off.svg b/icons/calendar-off.svg
index 8470e4653..012885a07 100644
--- a/icons/calendar-off.svg
+++ b/icons/calendar-off.svg
@@ -9,10 +9,10 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M4.18 4.18A2 2 0 0 0 3 6v14a2 2 0 0 0 2 2h14a2 2 0 0 0 1.82-1.18" />
+  <path d="M4.2 4.2A2 2 0 0 0 3 6v14a2 2 0 0 0 2 2h14a2 2 0 0 0 1.82-1.18" />
   <path d="M21 15.5V6a2 2 0 0 0-2-2H9.5" />
   <path d="M16 2v4" />
   <path d="M3 10h7" />
   <path d="M21 10h-5.5" />
-  <line x1="2" x2="22" y1="2" y2="22" />
+  <path d="m2 2 20 20" />
 </svg>
diff --git a/icons/calendar-plus-2.json b/icons/calendar-plus-2.json
new file mode 100644
index 000000000..031b56090
--- /dev/null
+++ b/icons/calendar-plus-2.json
@@ -0,0 +1,20 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "date",
+    "day",
+    "month",
+    "year",
+    "event",
+    "add",
+    "subscribe",
+    "create",
+    "new"
+  ],
+  "categories": [
+    "time"
+  ]
+}
\ No newline at end of file
diff --git a/icons/calendar-plus-2.svg b/icons/calendar-plus-2.svg
new file mode 100644
index 000000000..dcb8e365a
--- /dev/null
+++ b/icons/calendar-plus-2.svg
@@ -0,0 +1,18 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M8 2v4" />
+  <path d="M16 2v4" />
+  <rect width="18" height="18" x="3" y="4" rx="2" />
+  <path d="M3 10h18" />
+  <path d="M10 16h4" />
+  <path d="M12 14v4" />
+</svg>
diff --git a/icons/calendar-plus.json b/icons/calendar-plus.json
index cd0d3dd39..f3f463a49 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-plus.svg b/icons/calendar-plus.svg
index ba0fe9348..f9eab2094 100644
--- a/icons/calendar-plus.svg
+++ b/icons/calendar-plus.svg
@@ -9,10 +9,10 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
+  <path d="M8 2v4" />
+  <path d="M16 2v4" />
   <path d="M21 13V6a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h8" />
-  <line x1="16" x2="16" y1="2" y2="6" />
-  <line x1="8" x2="8" y1="2" y2="6" />
-  <line x1="3" x2="21" y1="10" y2="10" />
-  <line x1="19" x2="19" y1="16" y2="22" />
-  <line x1="16" x2="22" y1="19" y2="19" />
+  <path d="M3 10h18" />
+  <path d="M16 19h6" />
+  <path d="M19 16v6" />
 </svg>
diff --git a/icons/calendar-range.json b/icons/calendar-range.json
index c7bb9e37f..42a131e56 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-range.svg b/icons/calendar-range.svg
index 6d49ebc7e..65492c67d 100644
--- a/icons/calendar-range.svg
+++ b/icons/calendar-range.svg
@@ -9,10 +9,10 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="18" height="18" x="3" y="4" rx="2" ry="2" />
-  <line x1="16" x2="16" y1="2" y2="6" />
-  <line x1="8" x2="8" y1="2" y2="6" />
-  <line x1="3" x2="21" y1="10" y2="10" />
+  <rect width="18" height="18" x="3" y="4" rx="2" />
+  <path d="M16 2v4" />
+  <path d="M3 10h18" />
+  <path d="M8 2v4" />
   <path d="M17 14h-6" />
   <path d="M13 18H7" />
   <path d="M7 14h.01" />
diff --git a/icons/calendar-search.json b/icons/calendar-search.json
index 6f385ba92..af861d735 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-search.svg b/icons/calendar-search.svg
index 5ad25ae17..6ce14eb7a 100644
--- a/icons/calendar-search.svg
+++ b/icons/calendar-search.svg
@@ -9,10 +9,10 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M21 12V6a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v14c0 1.1.9 2 2 2h7.5" />
+  <path d="M21 12V6a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h7.5" />
   <path d="M16 2v4" />
   <path d="M8 2v4" />
   <path d="M3 10h18" />
-  <path d="M18 21a3 3 0 1 0 0-6 3 3 0 0 0 0 6v0Z" />
+  <circle cx="18" cy="18" r="3" />
   <path d="m22 22-1.5-1.5" />
 </svg>
diff --git a/icons/calendar-x-2.json b/icons/calendar-x-2.json
index b59a53ab5..53b7d651f 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-2.svg b/icons/calendar-x-2.svg
index cbc292025..a4748e980 100644
--- a/icons/calendar-x-2.svg
+++ b/icons/calendar-x-2.svg
@@ -9,10 +9,10 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
+  <path d="M8 2v4" />
+  <path d="M16 2v4" />
   <path d="M21 13V6a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h8" />
-  <line x1="16" x2="16" y1="2" y2="6" />
-  <line x1="8" x2="8" y1="2" y2="6" />
-  <line x1="3" x2="21" y1="10" y2="10" />
-  <line x1="17" x2="22" y1="17" y2="22" />
-  <line x1="17" x2="22" y1="22" y2="17" />
+  <path d="M3 10h18" />
+  <path d="m17 22 5-5" />
+  <path d="m17 17 5 5" />
 </svg>
diff --git a/icons/calendar-x.json b/icons/calendar-x.json
index b124a9863..b24768e85 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-x.svg b/icons/calendar-x.svg
index d14908bcd..d5bafda03 100644
--- a/icons/calendar-x.svg
+++ b/icons/calendar-x.svg
@@ -9,10 +9,10 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="18" height="18" x="3" y="4" rx="2" ry="2" />
-  <line x1="16" x2="16" y1="2" y2="6" />
-  <line x1="8" x2="8" y1="2" y2="6" />
-  <line x1="3" x2="21" y1="10" y2="10" />
-  <line x1="10" x2="14" y1="14" y2="18" />
-  <line x1="14" x2="10" y1="14" y2="18" />
+  <path d="M8 2v4" />
+  <path d="M16 2v4" />
+  <rect width="18" height="18" x="3" y="4" rx="2" />
+  <path d="M3 10h18" />
+  <path d="m14 14-4 4" />
+  <path d="m10 14 4 4" />
 </svg>
diff --git a/icons/calendar.json b/icons/calendar.json
index 5bdbf1ff6..117206352 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"
diff --git a/icons/calendar.svg b/icons/calendar.svg
index 9f628e92d..738ea05b4 100644
--- a/icons/calendar.svg
+++ b/icons/calendar.svg
@@ -9,8 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="18" height="18" x="3" y="4" rx="2" ry="2" />
-  <line x1="16" x2="16" y1="2" y2="6" />
-  <line x1="8" x2="8" y1="2" y2="6" />
-  <line x1="3" x2="21" y1="10" y2="10" />
+  <path d="M8 2v4" />
+  <path d="M16 2v4" />
+  <rect width="18" height="18" x="3" y="4" rx="2" />
+  <path d="M3 10h18" />
 </svg>