diff --git a/data/marginalia.json b/data/marginalia.json
index 174d61c..7082730 100644
--- a/data/marginalia.json
+++ b/data/marginalia.json
@@ -244,6 +244,47 @@
       "face"
     ]
   },
+  {
+    "id": "Yuh6NF0EUhe2",
+    "url": "/fluentui-emoji/star_3d.png",
+    "name": "Star",
+    "w": 256,
+    "h": 256,
+    "alt": "A star emoji",
+    "tags": [
+      "fluentui",
+      "emoji",
+      "star"
+    ]
+  },  
+  {
+    "id": "uN9XITgQcitE",
+    "url": "/fluentui-emoji/hourglass_done_3d.png",
+    "name": "Hourglass Done",
+    "w": 256,
+    "h": 256,
+    "alt": "An hourglass emoji with the sand at the bottom",
+    "tags": [
+      "fluentui",
+      "emoji",
+      "hourglass",
+      "wait"
+    ]
+  },   
+  {
+    "id": "pe2QTCd5Vldw",
+    "url": "/fluentui-emoji/hourglass_not_done_3d.png",
+    "name": "Hourglass",
+    "w": 256,
+    "h": 256,
+    "alt": "An hourglass emoji",
+    "tags": [
+      "fluentui",
+      "emoji",
+      "hourglass",
+      "wait"
+    ]
+  },   
   {
     "id": "reKMcHAMYhNo",
     "url": "/fluentui-emoji/unicorn_3d.png",
@@ -366,7 +407,7 @@
   },
   {
     "id": "agI56m7_SaXOLrqfhmm6x",
-    "url": "/custom/3GCCpQkW0lJqm8Svu9JBy.png",
+    "url": "/custom/podcast-pass-the-ajax.png",
     "name": "Podcast show artwork for a fictional podcast called 'Pass the AJAX'",
     "w": 512,
     "h": 512,
@@ -416,7 +457,7 @@
   },
   {
     "id": "Yz9jcFcZidSysK08PXQDj",
-    "url": "/custom/imagen-94isJc2QjZBs1JFjfjMbC.png",
+    "url": "/custom/art-of-the-best-words.png",
     "name": "Art of the Best Words",
     "w": 512,
     "h": 460,
@@ -430,7 +471,7 @@
   },
   {
     "id": "nrYP2SilRSRRf-8CqqG9v",
-    "url": "/custom/imagen-y0Mee69ja1oOIvYf06vkm.png",
+    "url": "/custom/kubernetes-yay-whale.png",
     "name": "Kubernetes Yay Whale",
     "w": 512,
     "h": 439,
@@ -444,7 +485,7 @@
   },
   {
     "id": "FZ7ZqvugXmm4ygWBggwrG",
-    "url": "/custom/imagen-DRWmK1iVAI620rDrTyYTr.png",
+    "url": "/custom/kubernetes-yay-whale-alt.png",
     "name": "Kubernetes Yay Whale - Alt",
     "w": 512,
     "h": 439,
@@ -458,7 +499,7 @@
   },
   {
     "id": "-CQuUaKqFlHx-BUDNTM7C",
-    "url": "/custom/imagen-feoE6OLksr32y6Ph2eqnP.png",
+    "url": "/custom/kubernetes-crash-whale.png",
     "name": "Kubernetes Crash Whale",
     "w": 512,
     "h": 354,
@@ -472,7 +513,7 @@
   },
   {
     "id": "dC760P9TYtUi0WCZlD4dk",
-    "url": "/custom/imagen-nsmo2M9PNCJ6j6Hyy9ILk.png",
+    "url": "/custom/kubernetes-miffed-whale.png",
     "name": "Kubernetes Miffed Whale",
     "w": 512,
     "h": 439,
@@ -487,7 +528,7 @@
   },
   {
     "id": "vIAvDXKPNJ1a0WQhcfC2I",
-    "url": "/custom/imagen-T0f15eGid5KpDH0CGt6a4.png",
+    "url": "/custom/kubernetes-fail-whale.png",
     "name": "Kubernetes Fail Whale",
     "w": 512,
     "h": 439,
diff --git a/site/images/marginalia/custom/imagen-94isJc2QjZBs1JFjfjMbC.png b/site/images/marginalia/custom/art-of-the-best-words.png
similarity index 100%
rename from site/images/marginalia/custom/imagen-94isJc2QjZBs1JFjfjMbC.png
rename to site/images/marginalia/custom/art-of-the-best-words.png
diff --git a/site/images/marginalia/custom/imagen-feoE6OLksr32y6Ph2eqnP.png b/site/images/marginalia/custom/kubernetes-crash-whale.png
similarity index 100%
rename from site/images/marginalia/custom/imagen-feoE6OLksr32y6Ph2eqnP.png
rename to site/images/marginalia/custom/kubernetes-crash-whale.png
diff --git a/site/images/marginalia/custom/imagen-T0f15eGid5KpDH0CGt6a4.png b/site/images/marginalia/custom/kubernetes-fail-whale.png
similarity index 100%
rename from site/images/marginalia/custom/imagen-T0f15eGid5KpDH0CGt6a4.png
rename to site/images/marginalia/custom/kubernetes-fail-whale.png
diff --git a/site/images/marginalia/custom/imagen-nsmo2M9PNCJ6j6Hyy9ILk.png b/site/images/marginalia/custom/kubernetes-miffed-whale.png
similarity index 100%
rename from site/images/marginalia/custom/imagen-nsmo2M9PNCJ6j6Hyy9ILk.png
rename to site/images/marginalia/custom/kubernetes-miffed-whale.png
diff --git a/site/images/marginalia/custom/imagen-DRWmK1iVAI620rDrTyYTr.png b/site/images/marginalia/custom/kubernetes-yay-whale-alt.png
similarity index 100%
rename from site/images/marginalia/custom/imagen-DRWmK1iVAI620rDrTyYTr.png
rename to site/images/marginalia/custom/kubernetes-yay-whale-alt.png
diff --git a/site/images/marginalia/custom/imagen-y0Mee69ja1oOIvYf06vkm.png b/site/images/marginalia/custom/kubernetes-yay-whale.png
similarity index 100%
rename from site/images/marginalia/custom/imagen-y0Mee69ja1oOIvYf06vkm.png
rename to site/images/marginalia/custom/kubernetes-yay-whale.png
diff --git a/site/images/marginalia/custom/3GCCpQkW0lJqm8Svu9JBy.png b/site/images/marginalia/custom/podcast-pass-the-ajax.png
similarity index 100%
rename from site/images/marginalia/custom/3GCCpQkW0lJqm8Svu9JBy.png
rename to site/images/marginalia/custom/podcast-pass-the-ajax.png
diff --git a/site/images/marginalia/fluentui-emoji/hourglass_done_3d.png b/site/images/marginalia/fluentui-emoji/hourglass_done_3d.png
new file mode 100644
index 0000000..e506847
Binary files /dev/null and b/site/images/marginalia/fluentui-emoji/hourglass_done_3d.png differ
diff --git a/site/images/marginalia/fluentui-emoji/hourglass_not_done_3d.png b/site/images/marginalia/fluentui-emoji/hourglass_not_done_3d.png
new file mode 100644
index 0000000..46d5575
Binary files /dev/null and b/site/images/marginalia/fluentui-emoji/hourglass_not_done_3d.png differ
diff --git a/site/images/marginalia/fluentui-emoji/star_3d.png b/site/images/marginalia/fluentui-emoji/star_3d.png
new file mode 100644
index 0000000..fd68271
Binary files /dev/null and b/site/images/marginalia/fluentui-emoji/star_3d.png differ