diff --git a/security-info/canaries.md b/security-info/canaries.md
index 0d503041..e91d1bb3 100644
--- a/security-info/canaries.md
+++ b/security-info/canaries.md
@@ -10,41 +10,18 @@ Qubes Canaries
 
 Qubes Canaries are published through the [Qubes Security Pack](/security/pack/).
 
-2015
-----
-
--   [Qubes Canary \#1](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-001-2015.txt)
--   [Qubes Canary \#2](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-002-2015.txt)
--   [Qubes Canary \#3](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-003-2015.txt)
--   [Qubes Canary \#4](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-004-2015.txt)
--   [Qubes Canary \#5](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-005-2015.txt)
-
-2016
-----
-
--   [Qubes Canary \#6](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-006-2016.txt)
--   [Qubes Canary \#7](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-007-2016.txt)
--   [Qubes Canary \#8](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-008-2016.txt)
--   [Qubes Canary \#9](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-009-2016.txt)
--   [Qubes Canary \#10](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-010-2016.txt)
-
-2017
-----
-
--   [Qubes Canary \#11](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-011-2017.txt)
--   [Qubes Canary \#12](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-012-2017.txt)
--   [Qubes Canary \#13](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-013-2017.txt)
--   [Qubes Canary \#14](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-014-2017.txt)
-
-2018
-----
-
--   [Qubes Canary \#15](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-015-2018.txt)
--   [Qubes Canary \#16](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-016-2018.txt)
--   [Qubes Canary \#17](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-017-2018.txt)
-
-2019
-----
-
--   [Qubes Canary \#18](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-018-2019.txt)
+<table>
+  <tr>
+    <th title="Anchor Link"><span class="fa fa-link"></span></th>
+    <th>Date</th>
+    <th>Qubes Canary</th>
+  </tr>
+{% for canary in site.data.canary reversed %}
+  <tr id="{{ canary.canary }}">
+    <td><a href="#{{ canary.canary }}" class="fa fa-link black-icon" title="Anchor link to Qubes Canary row: Qubes Canary #{{ canary.canary }}"></a></td>
+    <td>{{ canary.date }}</td>
+    <td><a href="https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-{{ canary.canary }}-{{ canary.date | date: '%Y' }}.txt">Qubes Canary #{{ canary.canary }}</a></td>
+  </tr>
+{% endfor %}
+</table>
 
diff --git a/security-info/security-bulletins.md b/security-info/security-bulletins.md
index 4e56f073..0b2f287e 100644
--- a/security-info/security-bulletins.md
+++ b/security-info/security-bulletins.md
@@ -17,15 +17,15 @@ Qubes Security Bulletins (QSBs) are published through the [Qubes Security Pack](
 
 <table>
   <tr>
-    <th>QSB</th>
+    <th title="Anchor Link"><span class="fa fa-link"></span></th>
     <th>Date</th>
-    <th>Title</th>
+    <th>Qubes Security Bulletin</th>
   </tr>
-{% for qsb in site.data.qsb %}
+{% for qsb in site.data.qsb reversed %}
   <tr id="{{ qsb.qsb }}">
-    <td><a href="#{{ qsb.qsb }}">{{ qsb.qsb }}</a></td>
+    <td><a href="#{{ qsb.qsb }}" class="fa fa-link black-icon" title="Anchor link to QSB row: QSB #{{ qsb.qsb }}"></a></td>
     <td>{{ qsb.date }}</td>
-    <td><a href="https://github.com/QubesOS/qubes-secpack/blob/master/QSBs/qsb-{{ qsb.qsb }}-{{ qsb.date | date: '%Y' }}.txt">{{ qsb.title | truncate: 76 }}</a></td>
+    <td><a href="https://github.com/QubesOS/qubes-secpack/blob/master/QSBs/qsb-{{ qsb.qsb }}-{{ qsb.date | date: '%Y' }}.txt">QSB #{{ qsb.qsb }}: {{ qsb.title | truncate: 68 }}</a></td>
   </tr>
 {% endfor %}
 </table>