diff --git a/modules/fx-rates/assets/fx-rates.css b/modules/fx-rates/assets/fx-rates.css
index 663266a..ba76b37 100644
--- a/modules/fx-rates/assets/fx-rates.css
+++ b/modules/fx-rates/assets/fx-rates.css
@@ -1,15 +1,6 @@
 #fx-rates-app,
 #fx-rates-currencies {
-  display: grid;
-  gap: 16px;
-}
-
-.fx-submenu-row {
-  display: flex;
-  gap: 14px;
-  justify-content: space-between;
-  align-items: center;
-  flex-wrap: wrap;
+  display: contents;
 }
 
 .fx-section-head {
@@ -284,7 +275,6 @@
     flex-direction: column;
   }
 
-  .fx-submenu-row,
   .fx-card-head {
     align-items: flex-start;
   }
diff --git a/modules/fx-rates/pages/currencies.php b/modules/fx-rates/pages/currencies.php
index d6e1967..fc06944 100644
--- a/modules/fx-rates/pages/currencies.php
+++ b/modules/fx-rates/pages/currencies.php
@@ -117,23 +117,15 @@ $tabs = [
     ['label' => 'Waehrungen', 'href' => '/module/fx-rates/currencies', 'active' => true],
 ];
 ?>
+<?= module_shell_header('fx-rates', [
+    'title' => 'Waehrungen',
+    'tabs' => $tabs,
+    'actions' => [
+        ['label' => 'Nexus Übersicht', 'href' => '/', 'variant' => 'secondary', 'size' => 'sm'],
+        ['label' => 'Setup', 'href' => '/modules/setup/fx-rates', 'variant' => 'secondary', 'size' => 'sm'],
+    ],
+]) ?>
 <div id="fx-rates-currencies" data-page='<?= e(is_string($currencyPageData) ? $currencyPageData : '{}') ?>'>
-  <div class="submenu-box">
-    <div class="fx-submenu-row">
-      <nav class="module-tabs" aria-label="Unterseiten von Waehrungskurse">
-        <?php foreach ($tabs as $tab): ?>
-          <a
-            class="<?= !empty($tab['active']) ? 'module-button module-button--tab-active' : 'module-button module-button--tab' ?>"
-            href="<?= e((string) $tab['href']) ?>"
-          ><?= e((string) $tab['label']) ?></a>
-        <?php endforeach; ?>
-      </nav>
-      <div class="module-submenu-actions">
-        <a class="module-button module-button--secondary module-button--small" href="/modules/setup/fx-rates">Setup</a>
-      </div>
-    </div>
-  </div>
-
   <?php if ($notice !== ''): ?>
     <section class="section-box">
       <div class="fx-message is-success"><?= e($notice) ?></div>
@@ -285,3 +277,4 @@ $tabs = [
     </div>
   </section>
 </div>
+<?= module_shell_footer() ?>
diff --git a/modules/fx-rates/pages/index.php b/modules/fx-rates/pages/index.php
index 4b7e5f5..1dcd7a6 100644
--- a/modules/fx-rates/pages/index.php
+++ b/modules/fx-rates/pages/index.php
@@ -64,24 +64,16 @@ $tabs = [
     ['label' => 'Waehrungen', 'href' => '/module/fx-rates/currencies'],
 ];
 ?>
+<?= module_shell_header('fx-rates', [
+    'title' => 'Ueberblick',
+    'tabs' => $tabs,
+    'actions' => [
+        ['label' => 'Nexus Übersicht', 'href' => '/', 'variant' => 'secondary', 'size' => 'sm'],
+        ['label' => 'Setup', 'href' => '/modules/setup/fx-rates', 'variant' => 'secondary', 'size' => 'sm'],
+        ['label' => 'Aktuelle Kurse abrufen', 'href' => '/module/fx-rates?refresh=1', 'variant' => 'secondary', 'size' => 'sm'],
+    ],
+]) ?>
 <div id="fx-rates-app" data-page='<?= e(is_string($pageData) ? $pageData : '{}') ?>'>
-  <div class="submenu-box">
-    <div class="fx-submenu-row">
-      <nav class="module-tabs" aria-label="Unterseiten von Waehrungskurse">
-        <?php foreach ($tabs as $tab): ?>
-          <a
-            class="<?= !empty($tab['active']) ? 'module-button module-button--tab-active' : 'module-button module-button--tab' ?>"
-            href="<?= e((string) $tab['href']) ?>"
-          ><?= e((string) $tab['label']) ?></a>
-        <?php endforeach; ?>
-      </nav>
-      <div class="module-submenu-actions">
-        <a class="module-button module-button--secondary module-button--small" href="/modules/setup/fx-rates">Setup</a>
-        <a class="module-button module-button--secondary module-button--small" href="/module/fx-rates?refresh=1">Aktuelle Kurse abrufen</a>
-      </div>
-    </div>
-  </div>
-
   <?php if ($notice !== ''): ?>
     <section class="section-box">
       <div class="fx-message is-success"><?= e($notice) ?></div>
@@ -153,4 +145,5 @@ $tabs = [
       </table>
     </div>
   </section>
-  </div>
+</div>
+<?= module_shell_footer() ?>