diff --git a/lib/view/page/container.dart b/lib/view/page/container.dart
index 15566123..7faa8109 100644
--- a/lib/view/page/container.dart
+++ b/lib/view/page/container.dart
@@ -60,7 +60,7 @@ class _ContainerPageState extends State<ContainerPage> {
       builder: (_, __) => Consumer<ContainerProvider>(
         builder: (_, ___, __) {
           return Scaffold(
-            appBar: AppBar(
+            appBar: CustomAppBar(
               centerTitle: true,
               title: TwoLineText(up: l10n.container, down: widget.spi.name),
               actions: [
diff --git a/lib/view/page/home/home.dart b/lib/view/page/home/home.dart
index 5e37483d..195feac5 100644
--- a/lib/view/page/home/home.dart
+++ b/lib/view/page/home/home.dart
@@ -177,7 +177,7 @@ class _HomePageState extends State<HomePage>
             builder: (context, child) =>
                 AdaptiveScaffold.standardNavigationRail(
               extended: extended,
-              padding: EdgeInsets.zero,
+              padding: EdgeInsets.only(top: CustomAppBar.sysStatusBarHeight),
               selectedIndex: _selectIndex.value,
               destinations: AppTab.navRailDestinations,
               onDestinationSelected: _onDestinationSelected,
diff --git a/lib/view/page/setting/entry.dart b/lib/view/page/setting/entry.dart
index 7793ef4d..4fd407e3 100644
--- a/lib/view/page/setting/entry.dart
+++ b/lib/view/page/setting/entry.dart
@@ -55,7 +55,7 @@ class _SettingsPageState extends State<SettingsPage>
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+      appBar: CustomAppBar(
         title: Text(libL10n.setting, style: const TextStyle(fontSize: 20)),
         bottom: TabBar(
           controller: _tabCtrl,
diff --git a/pubspec.lock b/pubspec.lock
index b89afd14..18ad1178 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -488,6 +488,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_adaptive_scaffold:
+    dependency: "direct main"
+    description:
+      name: flutter_adaptive_scaffold
+      sha256: "7279d74da2f2531a16d21c2ec327308778c3aedd672dfe4eaf3bf416463501f8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.2"
   flutter_displaymode:
     dependency: "direct main"
     description: