diff --git a/templates/partials/app-footer.phtml b/templates/partials/app-footer.phtml
index 02063d5..ca3bf53 100644
--- a/templates/partials/app-footer.phtml
+++ b/templates/partials/app-footer.phtml
@@ -2,14 +2,16 @@
   <nav aria-label="<?php e(t('Footer navigation')); ?>">
     <ul>
       <li>
-        <a href="<?php e(lurl('')); ?>">
-          <span class="muted">©
-            <?php e(date('Y')); ?> <?php e(appTitle()); ?>
-          </span>
+        <a href="<?php e(lurl('')); ?>" class="muted">
+          <small>© <?php e(date('Y')); ?> <?php e(appTitle()); ?></small>
         </a>
       </li>
-      <li><a href="<?php e(lurl('imprint')); ?>"><?php e(t('Imprint')); ?></a></li>
-      <li><a href="<?php e(lurl('privacy')); ?>"><?php e(t('Privacy')); ?></a></li>
+      <li>
+        <a href="<?php e(lurl('imprint')); ?>" class="muted"><small><?php e(t('Imprint')); ?></small></a>
+      </li>
+      <li>
+        <a href="<?php e(lurl('privacy')); ?>" class="muted"><small><?php e(t('Privacy')); ?></small></a>
+      </li>
     </ul>
     <ul>
       <li>
diff --git a/templates/partials/app-topbar.phtml b/templates/partials/app-topbar.phtml
index 205b34e..f012621 100644
--- a/templates/partials/app-topbar.phtml
+++ b/templates/partials/app-topbar.phtml
@@ -36,8 +36,8 @@ $allowUserTheme = allowUserTheme();
     </ul>
     <div class="app-topbar-center" aria-hidden="true"></div>
     <ul class="app-topbar-right">
-      <li class="app-topbar-tenant-slot" data-tooltip="<?php e(t('Tenant')); ?>" data-tooltip-pos="bottom">
-        <?php if ($canSwitchTenant): ?>
+      <?php if ($canSwitchTenant): ?>
+        <li class="app-topbar-tenant-slot" data-tooltip="<?php e(t('Tenant')); ?>" data-tooltip-pos="bottom">
           <details class="dropdown app-topbar-tenant-menu">
             <summary class="app-topbar-tenant-chip" aria-label="<?php e(t('Switch tenant')); ?>" title="<?php e($tenantLabel); ?>">
               <span class="app-topbar-tenant-name"><?php e($tenantLabel); ?></span>
@@ -73,12 +73,8 @@ $allowUserTheme = allowUserTheme();
               <?php endforeach; ?>
             </ul>
           </details>
-        <?php else: ?>
-          <span class="app-topbar-tenant-chip" aria-label="<?php e(t('Tenant')); ?>" title="<?php e($tenantLabel); ?>">
-            <span class="app-topbar-tenant-name"><?php e($tenantLabel); ?></span>
-          </span>
-        <?php endif; ?>
-      </li>
+        </li>
+      <?php endif; ?>
       <li>
         <details class="dropdown app-topbar-user-menu"
           <?php if ($allowUserTheme): ?>
diff --git a/web/css/layout/app-shell.css b/web/css/layout/app-shell.css
index 5794ab2..b819ab7 100644
--- a/web/css/layout/app-shell.css
+++ b/web/css/layout/app-shell.css
@@ -323,8 +323,7 @@
 
   footer.site-footer {
     padding-inline: calc(var(--app-spacing) * 2);
-    border-top: 1px solid var(--app-border);
-  }
+    }
 
   footer.site-footer a {
     color: inherit;