diff --git a/source/_static/scss/includes/_misc.scss b/source/_static/scss/includes/_misc.scss
index 19d8fe86..5422e37b 100644
--- a/source/_static/scss/includes/_misc.scss
+++ b/source/_static/scss/includes/_misc.scss
@@ -224,7 +224,6 @@
 }
 
 [data-lightbox] img {
-  padding: 0;
   margin-bottom: 1rem;
 }
 
diff --git a/source/_static/scss/includes/_reset.scss b/source/_static/scss/includes/_reset.scss
index 7ab8ebd6..ea4d7b3a 100644
--- a/source/_static/scss/includes/_reset.scss
+++ b/source/_static/scss/includes/_reset.scss
@@ -173,7 +173,6 @@ li pre {
 // ----------------------
 [data-lightbox] {
     img {
-        padding: 0.25rem;
         border: 1px solid var(--theme-light-bg);
         border-radius: $border-radius;
     }
@@ -185,7 +184,7 @@ li pre {
     }
 }
 
-.content__main {
+.content__body {
     figure {
         box-shadow: none;
     }
@@ -193,7 +192,7 @@ li pre {
     img {
         background-color: $white;
         border-radius: $border-radius;
-        padding: 1rem;
+        padding: 0;
     }
 
     figcaption {
diff --git a/source/_templates/footer.html b/source/_templates/footer.html
index c2299749..7c740601 100644
--- a/source/_templates/footer.html
+++ b/source/_templates/footer.html
@@ -5,4 +5,4 @@
    <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">
       <img height="10" alt="Creative Commons License" src="https://i.creativecommons.org/l/by/4.0/80x15.png" />
    </a>
- </div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/source/_templates/layout.html b/source/_templates/layout.html
index 53a0b5a6..2e285ca1 100644
--- a/source/_templates/layout.html
+++ b/source/_templates/layout.html
@@ -81,7 +81,9 @@
          {%- include "toc.html" %}
 
          <div class="content__main">
-            {% block body %} {% endblock %}
+            <div class="content__body">
+               {% block body %} {% endblock %}
+            </div>
 
             {%- if pagename != "search-results" %}
                {%- include "footer.html" %}