diff --git a/.changeset/techdocs-parents-suffer.md b/.changeset/techdocs-parents-suffer.md
new file mode 100644
index 0000000000..8e366dd506
--- /dev/null
+++ b/.changeset/techdocs-parents-suffer.md
@@ -0,0 +1,12 @@
+---
+'@backstage/plugin-techdocs': patch
+---
+
+Some documentation layout tweaks:
+
+- drawer toggle margins
+- code block margins
+- sidebar drawer width
+- inner content width
+- footer link width
+- sidebar table of contents scroll
diff --git a/plugins/techdocs/src/reader/components/Reader.tsx b/plugins/techdocs/src/reader/components/Reader.tsx
index 9ce9ad5d6d..28453b8201 100644
--- a/plugins/techdocs/src/reader/components/Reader.tsx
+++ b/plugins/techdocs/src/reader/components/Reader.tsx
@@ -38,7 +38,10 @@ import { CompoundEntityRef } from '@backstage/catalog-model';
 import { useApi, configApiRef } from '@backstage/core-plugin-api';
 import { scmIntegrationsApiRef } from '@backstage/integration-react';
 import { BackstageTheme } from '@backstage/theme';
-import { SidebarPinStateContext } from '@backstage/core-components';
+import {
+  sidebarConfig,
+  SidebarPinStateContext,
+} from '@backstage/core-components';
 
 import { techdocsStorageApiRef } from '../../api';
 
@@ -450,12 +453,6 @@ export const useTechDocsReaderDom = (
               scrollbar-color: rgb(193, 193, 193) #eee;
               scrollbar-width: thin;
             }
-            .md-sidebar .md-sidebar__scrollwrap {
-              width: calc(16rem - 10px);
-            }
-            .md-sidebar--secondary {
-              right: ${theme.spacing(3)}px;
-            }
             .md-sidebar::-webkit-scrollbar {
               width: 5px;
             }
@@ -478,6 +475,12 @@ export const useTechDocsReaderDom = (
             .md-sidebar::-webkit-scrollbar-thumb:hover {
               background: rgb(125, 125, 125);
             }
+            .md-sidebar--secondary {
+              right: ${theme.spacing(3)}px;
+            }
+            .md-sidebar__scrollwrap {
+              overflow: unset !important;
+            }
 
             .md-content {
               max-width: calc(100% - 16rem * 2);
@@ -492,7 +495,7 @@ export const useTechDocsReaderDom = (
             .md-footer__title {
               background-color: unset;
             }
-            .md-footer-nav__link {
+            .md-footer__link, .md-footer-nav__link {
               width: 16rem;
             }
 
@@ -556,20 +559,32 @@ export const useTechDocsReaderDom = (
                 height: 100%;
               }
               .md-sidebar--primary {
-                width: 12.1rem !important;
+                width: 16rem !important;
                 z-index: 200;
                 left: ${
-                  isPinned ? 'calc(-12.1rem + 242px)' : 'calc(-12.1rem + 72px)'
+                  isPinned
+                    ? `calc(-16rem + ${sidebarConfig.drawerWidthOpen}px)`
+                    : `calc(-16rem + ${sidebarConfig.drawerWidthClosed}px)`
                 } !important;
               }
               .md-sidebar--secondary:not([hidden]) {
                 display: none;
               }
+              [data-md-toggle=drawer]:checked~.md-container .md-sidebar--primary {
+                transform: translateX(16rem);
+              }
 
               .md-content {
                 max-width: 100%;
                 margin-left: 0;
               }
+              .md-content__inner {
+                margin: 0;
+              }
+              .md-content__inner .highlighttable {
+                max-width: 100%;
+                margin: 1em 0;
+              }
 
               .md-header__button {
                 margin: 0.4rem 0;
@@ -585,7 +600,7 @@ export const useTechDocsReaderDom = (
                 position: static;
                 padding-left: 0;
               }
-              .md-footer-nav__link {
+              .md-footer__link, .md-footer-nav__link {
                 /* footer links begin to overlap at small sizes without setting width */
                 width: 50%;
               }
@@ -593,8 +608,11 @@ export const useTechDocsReaderDom = (
 
             @media screen and (max-width: 600px) {
               .md-sidebar--primary {
-                left: -12.1rem !important;
-                width: 12.1rem;
+                left: -16rem !important;
+                width: 16rem;
+              }
+              .md-sidebar--primary .md-sidebar__scrollwrap {
+                bottom: ${sidebarConfig.mobileSidebarHeight}px;
               }
             }
           `,
@@ -701,7 +719,7 @@ export const useTechDocsReaderDom = (
             .highlight .md-clipboard:after {
               content: unset;
             }
-
+            
             .highlight .nx {
               color: ${isDarkTheme ? '#ff53a3' : '#ec407a'};
             }
diff --git a/plugins/techdocs/src/reader/transformers/addSidebarToggle.ts b/plugins/techdocs/src/reader/transformers/addSidebarToggle.ts
index 9d9db15e45..69256d3ed6 100644
--- a/plugins/techdocs/src/reader/transformers/addSidebarToggle.ts
+++ b/plugins/techdocs/src/reader/transformers/addSidebarToggle.ts
@@ -34,10 +34,11 @@ export const addSidebarToggle = (): Transformer => {
 
     const toggleSidebar = mkdocsToggleSidebar.cloneNode() as HTMLLabelElement;
     ReactDOM.render(React.createElement(MenuIcon), toggleSidebar);
-    toggleSidebar.style.paddingLeft = '5px';
-    toggleSidebar.classList.add('md-content__button');
-    toggleSidebar.title = 'Toggle Sidebar';
     toggleSidebar.id = 'toggle-sidebar';
+    toggleSidebar.title = 'Toggle Sidebar';
+    toggleSidebar.classList.add('md-content__button');
+    toggleSidebar.style.setProperty('padding', '0 0 0 5px');
+    toggleSidebar.style.setProperty('margin', '0.4rem 0 0.4rem 0.4rem');
     article?.prepend(toggleSidebar);
     return dom;
   };