diff --git a/packages/freesewing.org/pages/[...mdxslug].js b/packages/freesewing.org/pages/[...mdxslug].js
index e034090a680..e52f90bbeb9 100644
--- a/packages/freesewing.org/pages/[...mdxslug].js
+++ b/packages/freesewing.org/pages/[...mdxslug].js
@@ -39,13 +39,13 @@ const MdxPage = props => {
         <meta property="og:locale" content="en_US" key='locale' />
         <meta property="og:site_name" content="freesewing.dev" key='site' />
       </Head>
-      <div className="flex flex-row-reverse flex-wrap xl:flex-nowrap justify-end px-8 xl:px-0">
+      <div className="flex flex-row-reverse flex-wrap xl:flex-nowrap justify-end">
         {props.toc && (
-          <div className="mb-8 px-0 w-full xl:w-80 2xl:w-96 xl:pl-8 2xl:pl-16">
+          <div className="mb-8 w-full xl:w-80 2xl:w-96 xl:pl-8 2xl:pl-16">
             <TocWrapper toc={props.toc} app={app}/>
           </div>
         )}
-        <div className="px-0 xl:pl-8 2xl:pl-16">
+        <div className="xl:pl-8 2xl:pl-16">
           <MdxWrapper mdx={props.mdx} app={app} components={components} />
         </div>
       </div>
diff --git a/packages/freesewing.org/pages/blog/[slug].js b/packages/freesewing.org/pages/blog/[slug].js
index 88433dfd731..8f082e1b7b2 100644
--- a/packages/freesewing.org/pages/blog/[slug].js
+++ b/packages/freesewing.org/pages/blog/[slug].js
@@ -5,7 +5,8 @@ import MdxWrapper from 'shared/components/wrappers/mdx'
 import mdxCompiler from 'shared/mdx/compiler'
 import Markdown from 'react-markdown'
 import Head from 'next/head'
-import Modal from 'shared/components/modal.js'
+import Lightbox from 'shared/components/lightbox.js'
+import ImageWrapper from 'shared/components/wrappers/img.js'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 import { strapiHost } from 'shared/config/freesewing.mjs'
 import { strapiImage } from 'shared/utils.js'
@@ -82,17 +83,19 @@ const PostPage = ({ post, author }) => {
           </span>
         </div>
         <figure>
-          <Modal>
-            <img
-              src={`${strapiHost}${post.image.url}`}
-              alt={post.caption}
-              className="shadow m-auto"
-            />
+          <Lightbox>
+            <ImageWrapper>
+              <img
+                src={`${strapiHost}${post.image.url}`}
+                alt={post.caption}
+                className="shadow m-auto"
+              />
+            </ImageWrapper>
             <figcaption
               className="text-center mb-8 prose m-auto mt-1"
               dangerouslySetInnerHTML={{__html: post.caption}}
             />
-          </Modal>
+          </Lightbox>
         </figure>
         <div className="strapi prose lg:prose-lg mb-12 m-auto">
           <MdxWrapper mdx={post.mdx} app={app} />
diff --git a/packages/freesewing.org/pages/blog/index.js b/packages/freesewing.org/pages/blog/index.js
index 08ec569b083..df59cdbdb3e 100644
--- a/packages/freesewing.org/pages/blog/index.js
+++ b/packages/freesewing.org/pages/blog/index.js
@@ -62,7 +62,7 @@ const BlogIndexPage = (props) => {
 
   return (
     <Page app={app} title={t('blog')} slug='blog'>
-      <div className="grid grid-cols-1 gap-4 lg:grid-cols-2 px-8 max-w-7xl">
+      <div className="grid grid-cols-1 gap-4 lg:grid-cols-2 max-w-7xl">
         {props.posts.map(post => <Preview app={app} post={post} key={post.slug}/>)
         }
       </div>
diff --git a/packages/freesewing.org/pages/showcase/[slug].js b/packages/freesewing.org/pages/showcase/[slug].js
index e7743d936c4..df25be8131d 100644
--- a/packages/freesewing.org/pages/showcase/[slug].js
+++ b/packages/freesewing.org/pages/showcase/[slug].js
@@ -6,7 +6,7 @@ import mdxCompiler from 'shared/mdx/compiler'
 import Markdown from 'react-markdown'
 import Head from 'next/head'
 import PageLink from 'shared/components/page-link.js'
-import Modal from 'shared/components/modal.js'
+import Lightbox from 'shared/components/lightbox.js'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 import { strapiHost } from 'shared/config/freesewing.mjs'
 import { strapiImage } from 'shared/utils.js'
@@ -82,7 +82,7 @@ const PostPage = ({ post, maker }) => {
           </div>
         </div>
         <figure>
-          <Modal>
+          <Lightbox>
             <img
               src={`${strapiHost}${post.image.url}`}
               alt={post.caption}
@@ -92,7 +92,7 @@ const PostPage = ({ post, maker }) => {
               className="text-center mb-8 prose m-auto"
               dangerouslySetInnerHTML={{__html: post.caption}}
             />
-          </Modal>
+          </Lightbox>
         </figure>
         <div className="strapi prose lg:prose-lg mb-12 m-auto">
           <MdxWrapper mdx={post.mdx} app={app} />
diff --git a/packages/freesewing.shared/components/breadcrumbs.js b/packages/freesewing.shared/components/breadcrumbs.js
index e211c897644..c2d962b496c 100644
--- a/packages/freesewing.shared/components/breadcrumbs.js
+++ b/packages/freesewing.shared/components/breadcrumbs.js
@@ -1,13 +1,13 @@
 import React from 'react'
 import Link from 'next/link'
-import Logo from 'shared/components/logos/freesewing.js'
+import FreeSewingIcon from 'shared/components/icons/freesewing.js'
 
 const Breadcrumbs = ({ crumbs=[], title }) => (
   <ul className="flex flex-row flex-wrap gap-2 font-bold">
     <li>
       <Link href="/">
         <a title="FreeSewing" className="text-base-content">
-          <Logo size={24} fill="currentColor" stroke={false}/>
+          <FreeSewingIcon />
         </a>
       </Link>
     </li>
diff --git a/packages/freesewing.shared/components/modal.js b/packages/freesewing.shared/components/lightbox.js
similarity index 70%
rename from packages/freesewing.shared/components/modal.js
rename to packages/freesewing.shared/components/lightbox.js
index eea6366202c..dab7fd8c1ab 100644
--- a/packages/freesewing.shared/components/modal.js
+++ b/packages/freesewing.shared/components/lightbox.js
@@ -1,15 +1,15 @@
 import { useState } from 'react'
 
-const Modal = ({ cancel, children }) => {
+const Lightbox = ({ cancel, children }) => {
 
-  const [ modal, setModal ] = useState(false)
+  const [ box, setBox ] = useState(false)
 
-  if (modal) return (
+  if (box) return (
     <div className={`
       fixed top-0 left-0 right-0 w-screen h-screen
       bg-neutral bg-opacity-90 z-30
       hover:cursor-zoom-out flex flex-col justify-center
-      `} onClick={() => setModal(false)}>
+      `} onClick={() => setBox(false)}>
         <div className="m-auto text-neutral-content lightbox" style={{
           maxHeight: "calc(100vh - 6rem)",
           maxWidth: "calc(100vw - 6rem)",
@@ -21,10 +21,10 @@ const Modal = ({ cancel, children }) => {
 
   return (
     <div
-      onClick={() => setModal(!modal)}
+      onClick={() => setBox(!box)}
       className="hover:cursor-zoom-in"
     >{children}</div>
   )
 }
 
-export default Modal
+export default Lightbox
diff --git a/packages/freesewing.shared/components/mdx/figure.js b/packages/freesewing.shared/components/mdx/figure.js
index f9e2b31db0c..425af8dc4f3 100644
--- a/packages/freesewing.shared/components/mdx/figure.js
+++ b/packages/freesewing.shared/components/mdx/figure.js
@@ -1,5 +1,6 @@
 import Popout from 'shared/components/popout'
-import Modal from 'shared/components/modal'
+import Lightbox from 'shared/components/lightbox'
+import ImageWrapper from 'shared/components/wrappers/img.js'
 
 const Figure = props => {
 
@@ -11,17 +12,15 @@ const Figure = props => {
 
   return (
     <figure className="block my-4">
-      <Modal>
-        <img
-          src={props?.src}
-          alt={props?.alt || ''}
-          title={title || ''}
-          className="m-auto"
-          style={{
-            maxHeight: "calc(100vh - 6rem)",
-            maxWidth: "calc(100vw - 6rem)",
-          }}
-        />
+      <Lightbox>
+        <ImageWrapper>
+          <img
+            src={props?.src}
+            alt={props?.alt || ''}
+            title={title || ''}
+            className="m-auto"
+          />
+        </ImageWrapper>
         {title
           ? <figcaption className="text-center italic mt-1">{title}</figcaption>
           : (
@@ -31,7 +30,7 @@ const Figure = props => {
             </Popout>
           )
         }
-      </Modal>
+      </Lightbox>
     </figure>
   )
 }
diff --git a/packages/freesewing.shared/components/wrappers/img.js b/packages/freesewing.shared/components/wrappers/img.js
new file mode 100644
index 00000000000..705442cbc0a
--- /dev/null
+++ b/packages/freesewing.shared/components/wrappers/img.js
@@ -0,0 +1,7 @@
+/* Breaks image out of its parent container to fill the screen on mobile */
+const ImageWrapper = ({ children }) => (
+  <div className="-ml-8 -mr-8 sm:m-0">{children}</div>
+)
+
+export default ImageWrapper
+
diff --git a/packages/freesewing.shared/styles/globals.css b/packages/freesewing.shared/styles/globals.css
index 3cf9a3748ef..e8f83f9679e 100644
--- a/packages/freesewing.shared/styles/globals.css
+++ b/packages/freesewing.shared/styles/globals.css
@@ -235,7 +235,7 @@
    }
 }
 
-/* modal */
+/* Lightbox */
 .lightbox img {
   max-width: calc(100vw - 6rem);
   max-height: calc(100vh - 6rem);