diff --git a/layouts/404.html b/layouts/404.html
index 78413b5ece3..6cc8a5c27c6 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -5,6 +5,8 @@
         <title>{{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }}</title>
     </head>
     <body class="td-{{ .Kind }}">
+        <!-- MvM - Include mx-dock at the top of all pages, except print versions -->
+        {{ partial "mx-dock.html" . }}
         {{/* NK - deactivation of original navbar 
         <header>
             {{ partial "navbar.html" . }}
diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html
index 4f342609732..39a1cf1aab3 100644
--- a/layouts/docs/baseof.html
+++ b/layouts/docs/baseof.html
@@ -5,6 +5,8 @@
  </head>
  <!-- DB – Check for numberless_headings -->
  <body class="td-{{ .Kind }}{{ with .Page.Params.body_class }} {{ . }}{{ end }}{{ if .Params.numberless_headings }} numberless_headings{{ end }}">
+  <!-- MvM - Include mx-dock at the top of all pages, except print versions -->
+  {{ partial "mx-dock.html" . }}
 {{/* NK - deactivation of original navbar
    <header>
      {{ partial "navbar.html" . }}
diff --git a/layouts/landingpage/landingpage.html b/layouts/landingpage/landingpage.html
index f0ee2b34d46..29a0d8a42cb 100644
--- a/layouts/landingpage/landingpage.html
+++ b/layouts/landingpage/landingpage.html
@@ -5,6 +5,8 @@
         {{ partial "head.html" . }}
     </head>
     <body class="td-{{ .Kind }}">
+        <!-- MvM - Include mx-dock at the top of all pages, except print versions -->
+        {{ partial "mx-dock.html" . }}
         <div class="container-fluid td-outer">
             <div class="td-main">
                 <div class="row flex-xl-nowrap stretch-main">
diff --git a/layouts/partials/hooks/body-end.html b/layouts/partials/hooks/body-end.html
index 0099435fd30..3a47f28b594 100644
--- a/layouts/partials/hooks/body-end.html
+++ b/layouts/partials/hooks/body-end.html
@@ -1,6 +1,3 @@
-<!-- Include mx-dock on all pages-->
-<div>{{ partial "mx-dock.html" . }}</div>
-
 <!-- Add analytics as defined by Marketing -->
 {{- if and (eq hugo.Environment "production") (not .Params.disable_usercentrics) -}}<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-QJG4"
   height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
diff --git a/layouts/swagger/baseof.html b/layouts/swagger/baseof.html
index 009d5f7926a..d9d4224a813 100644
--- a/layouts/swagger/baseof.html
+++ b/layouts/swagger/baseof.html
@@ -10,6 +10,8 @@
     <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist@5.1.0/swagger-ui.css" integrity="sha384-4cTBOIJxihgy9mISVlGqdBZkd66byHFwoLscqza6swXPIp5qiLBwuzuJD9cMjYOw" crossorigin="anonymous">
   </head>
   <body class="td-{{ .Kind }}">
+    <!-- MvM - Include mx-dock at the top of all pages, except print versions -->
+    {{ partial "mx-dock.html" . }}
     <script>window.noZensmooth = true;</script> <!-- DB - Disable Swagger's scrolling behavior -->
     {{/* NK - deactivation of original navbar 
     <header>