diff --git a/lib/App/Container/Registrars/AppServicesRegistrar.php b/lib/App/Container/Registrars/AppServicesRegistrar.php
index 57a273a..4b7f0f6 100644
--- a/lib/App/Container/Registrars/AppServicesRegistrar.php
+++ b/lib/App/Container/Registrars/AppServicesRegistrar.php
@@ -16,6 +16,7 @@ use MintyPHP\Http\SessionStore;
 use MintyPHP\Http\SessionStoreInterface;
 use MintyPHP\Repository\Search\SearchQueryRepository;
 use MintyPHP\Repository\Stats\AdminStatsRepository;
+use MintyPHP\Repository\System\SystemHealthRepository;
 use MintyPHP\Repository\Tenant\UserTenantRepository;
 use MintyPHP\Repository\User\UserReadRepository;
 use MintyPHP\Service\Access\PermissionService;
@@ -45,7 +46,6 @@ use MintyPHP\Service\Settings\SettingsFrontendTelemetryGateway;
 use MintyPHP\Service\Stats\AdminStatsViewDataService;
 use MintyPHP\Service\System\SystemHealthService;
 use MintyPHP\Service\System\SystemInfoService;
-use MintyPHP\Repository\System\SystemHealthRepository;
 
 final class AppServicesRegistrar implements ContainerRegistrar
 {
diff --git a/lib/Console/Commands/Module/ValidateCommand.php b/lib/Console/Commands/Module/ValidateCommand.php
index 686df93..e8f6744 100644
--- a/lib/Console/Commands/Module/ValidateCommand.php
+++ b/lib/Console/Commands/Module/ValidateCommand.php
@@ -8,7 +8,6 @@ use MintyPHP\App\Module\Contracts\LayoutContextProvider;
 use MintyPHP\App\Module\Contracts\ModuleDeactivationHandler;
 use MintyPHP\App\Module\Contracts\SearchResourceProvider;
 use MintyPHP\App\Module\Contracts\SessionProvider;
-use MintyPHP\App\Module\ModuleManifest;
 use MintyPHP\App\Module\ModuleManifestLoader;
 use MintyPHP\Console\Command;
 use MintyPHP\Service\Access\AuthorizationPolicyInterface;
diff --git a/lib/Service/Directory/DirectorySettingsGateway.php b/lib/Service/Directory/DirectorySettingsGateway.php
index 91cbe08..f431939 100644
--- a/lib/Service/Directory/DirectorySettingsGateway.php
+++ b/lib/Service/Directory/DirectorySettingsGateway.php
@@ -10,8 +10,7 @@ class DirectorySettingsGateway
     public function __construct(
         private readonly SettingsDefaultsGateway $settingsDefaultsGateway,
         private readonly SettingsAppGateway $settingsAppGateway
-    )
-    {
+    ) {
     }
 
     public function setDefaultTenantId(?int $tenantId): void
diff --git a/lib/Service/Module/ModuleMigrationService.php b/lib/Service/Module/ModuleMigrationService.php
index a03197b..1c392cb 100644
--- a/lib/Service/Module/ModuleMigrationService.php
+++ b/lib/Service/Module/ModuleMigrationService.php
@@ -18,7 +18,8 @@ final class ModuleMigrationService
     public function __construct(
         private readonly ModuleRegistry $registry,
         private readonly ModuleMigrationRepository $repository,
-    ) {}
+    ) {
+    }
 
     /**
      * Apply all pending module migrations.
diff --git a/tests/Support/ThemeResolutionTest.php b/tests/Support/ThemeResolutionTest.php
index df7c7d5..61f2c6e 100644
--- a/tests/Support/ThemeResolutionTest.php
+++ b/tests/Support/ThemeResolutionTest.php
@@ -5,7 +5,6 @@ namespace MintyPHP\Tests\Support;
 use MintyPHP\App\AppContainer;
 use MintyPHP\Service\Settings\SettingCacheService;
 use MintyPHP\Service\Settings\ThemeConfigGateway;
-use MintyPHP\Tests\Support\AppContainerIsolationTrait;
 use PHPUnit\Framework\TestCase;
 
 class ThemeResolutionTest extends TestCase
diff --git a/tests/Unit/Module/LayoutContextProviderTest.php b/tests/Unit/Module/LayoutContextProviderTest.php
index 3afbdb3..fc689e0 100644
--- a/tests/Unit/Module/LayoutContextProviderTest.php
+++ b/tests/Unit/Module/LayoutContextProviderTest.php
@@ -77,7 +77,10 @@ final class LayoutContextProviderTest extends TestCase
         // addressbook.nav via the provider loop
         $layoutNav = appBuildLayoutNavContext([], [], []);
 
-        self::assertArrayHasKey('addressbook.nav', $layoutNav,
-            'addressbook.nav key must be present in layoutNav when module is active');
+        self::assertArrayHasKey(
+            'addressbook.nav',
+            $layoutNav,
+            'addressbook.nav key must be present in layoutNav when module is active'
+        );
     }
 }
diff --git a/tests/Unit/Module/SearchProviderCollectionTest.php b/tests/Unit/Module/SearchProviderCollectionTest.php
index a4530ab..e8ffbb3 100644
--- a/tests/Unit/Module/SearchProviderCollectionTest.php
+++ b/tests/Unit/Module/SearchProviderCollectionTest.php
@@ -46,8 +46,11 @@ final class SearchProviderCollectionTest extends TestCase
         $coreResources = SearchConfig::resources('test', 'en');
         $coreKeys = array_column($coreResources, 'key');
 
-        self::assertNotContains('address-book', $coreKeys,
-            'address-book must not be in Core search resources (moved to module)');
+        self::assertNotContains(
+            'address-book',
+            $coreKeys,
+            'address-book must not be in Core search resources (moved to module)'
+        );
     }
 
     public function testAddressBookSearchProviderDirectly(): void
@@ -105,16 +108,22 @@ final class SearchProviderCollectionTest extends TestCase
     {
         $moduleResources = SearchConfig::moduleResources();
 
-        self::assertArrayHasKey('address-book', $moduleResources,
-            'address-book resource must come from module provider via SearchConfig');
+        self::assertArrayHasKey(
+            'address-book',
+            $moduleResources,
+            'address-book resource must come from module provider via SearchConfig'
+        );
     }
 
     public function testTenantFilterMergedFromModule(): void
     {
         $filters = SearchConfig::tenantScopeFilters();
 
-        self::assertArrayHasKey('address-book', $filters,
-            'address-book tenant scope filter must be provided by module');
+        self::assertArrayHasKey(
+            'address-book',
+            $filters,
+            'address-book tenant scope filter must be provided by module'
+        );
     }
 
     public function testSearchConfigListUrlDelegatesToModule(): void
diff --git a/web/css/components/app-icon-button.css b/web/css/components/app-icon-button.css
index de42fb7..715001d 100644
--- a/web/css/components/app-icon-button.css
+++ b/web/css/components/app-icon-button.css
@@ -13,7 +13,7 @@
     background: transparent;
     color: var(--app-muted-color);
     font-size: var(--text-sm);
-    line-height: 1;
+    line-height: var(--leading-none);
     cursor: pointer;
     text-decoration: none;
     transition:
@@ -29,6 +29,6 @@
 
   .app-icon-button i {
     font-size: 15px; /* icon-font metric — intentional px */
-    line-height: 1;
+    line-height: var(--leading-none);
   }
 }
diff --git a/web/css/components/app-tabs.css b/web/css/components/app-tabs.css
index eb1fee6..310a689 100644
--- a/web/css/components/app-tabs.css
+++ b/web/css/components/app-tabs.css
@@ -47,7 +47,7 @@
     background: transparent;
     color: var(--tabs-muted);
     font-size: var(--text-xs);
-    line-height: 1;
+    line-height: var(--leading-none);
     width: 24px;
     height: 24px;
     padding: 0;
diff --git a/web/css/layout/app-shell.css b/web/css/layout/app-shell.css
index 69518aa..f928e3e 100644
--- a/web/css/layout/app-shell.css
+++ b/web/css/layout/app-shell.css
@@ -12,7 +12,7 @@
 
   small {
     --app-font-size: 0.875em;
-    line-height: 1.9;
+    line-height: var(--leading-loose);
   }
 
   div#debugger-bar {