diff --git a/brutaldon/static/css/brutaldon-dark.css b/brutaldon/static/css/brutaldon-dark.css
index d1de81c..f285d65 100644
--- a/brutaldon/static/css/brutaldon-dark.css
+++ b/brutaldon/static/css/brutaldon-dark.css
@@ -250,3 +250,12 @@ a.navbar-item span:nth-child(2):before
     content: " ";
 }
 
+/* Fix some rules that don't need to be there */
+.content figure:not(:last-child)
+{
+    margin-bottom: 0;
+}
+.content figure:not(:first-child)
+{
+    margin-top: 0;
+}
diff --git a/brutaldon/static/css/brutaldon.css b/brutaldon/static/css/brutaldon.css
index 84de284..b6b9ecf 100644
--- a/brutaldon/static/css/brutaldon.css
+++ b/brutaldon/static/css/brutaldon.css
@@ -234,3 +234,13 @@ a.navbar-item span:nth-child(2):before
 {
     content: " ";
 }
+
+/* Fix some rules that don't need to be there */
+.content figure:not(:last-child)
+{
+    margin-bottom: 0;
+}
+.content figure:not(:first-child)
+{
+    margin-top: 0;
+}
diff --git a/brutaldon/templates/base.html b/brutaldon/templates/base.html
index 324e5be..14ec711 100644
--- a/brutaldon/templates/base.html
+++ b/brutaldon/templates/base.html
@@ -200,7 +200,7 @@
                  {
                      $('.attachments').each(function() {
                          $(this).magnificPopup({
-                             delegate: 'a.attachment-image',
+                             delegate: 'figure.attachment-image a',
                              type: 'image',
                              preload: [1, 1],
                              gallery:  {enabled: true },