diff --git a/lib/screens/home/stream_list/offline_channel_card.dart b/lib/screens/home/stream_list/offline_channel_card.dart
index 0394ad9e..799a0c74 100644
--- a/lib/screens/home/stream_list/offline_channel_card.dart
+++ b/lib/screens/home/stream_list/offline_channel_card.dart
@@ -81,9 +81,11 @@ class OfflineChannelCard extends StatelessWidget {
         );
       },
       child: Padding(
-        padding: EdgeInsets.symmetric(
-          horizontal: 16 + MediaQuery.of(context).padding.left,
-          vertical: 8,
+        padding: EdgeInsets.fromLTRB(
+          16 + MediaQuery.of(context).padding.left,
+          8,
+          16 + MediaQuery.of(context).padding.right,
+          8,
         ),
         child: Row(
           spacing: 12,
diff --git a/lib/screens/settings/settings.dart b/lib/screens/settings/settings.dart
index 1d750d0f..a0360635 100644
--- a/lib/screens/settings/settings.dart
+++ b/lib/screens/settings/settings.dart
@@ -77,11 +77,14 @@ class Settings extends StatelessWidget {
       body: Stack(
         children: [
           // Main scrollable content
-          FrostyScrollbar(
-            padding: EdgeInsets.only(
-              top: MediaQuery.of(context).padding.top + kToolbarHeight,
-            ),
-            child: CustomScrollView(
+          SafeArea(
+            top: false,
+            bottom: false,
+            child: FrostyScrollbar(
+              padding: EdgeInsets.only(
+                top: MediaQuery.of(context).padding.top + kToolbarHeight,
+              ),
+              child: CustomScrollView(
               slivers: [
                 SliverPadding(
                   padding: EdgeInsets.only(
@@ -201,6 +204,7 @@ class Settings extends StatelessWidget {
               ],
             ),
           ),
+          ),
           // Blurred app bar overlay
           Positioned(
             top: 0,
diff --git a/lib/screens/settings/widgets/release_notes.dart b/lib/screens/settings/widgets/release_notes.dart
index f36f4d12..a004e100 100644
--- a/lib/screens/settings/widgets/release_notes.dart
+++ b/lib/screens/settings/widgets/release_notes.dart
@@ -74,9 +74,9 @@ class _ReleaseNotesState extends State<ReleaseNotes> {
               ),
               child: Markdown(
                 padding: EdgeInsets.fromLTRB(
-                  16,
+                  16 + MediaQuery.of(context).padding.left,
                   MediaQuery.of(context).padding.top + kToolbarHeight,
-                  16,
+                  16 + MediaQuery.of(context).padding.right,
                   16,
                 ),
                 controller: _scrollController,
diff --git a/lib/screens/settings/widgets/settings_tile_route.dart b/lib/screens/settings/widgets/settings_tile_route.dart
index 23bb7c74..7a24ce4f 100644
--- a/lib/screens/settings/widgets/settings_tile_route.dart
+++ b/lib/screens/settings/widgets/settings_tile_route.dart
@@ -70,10 +70,14 @@ class _BlurredSettingsPage extends StatelessWidget {
         children: [
           // Main scrollable content
           Positioned.fill(
-            child: MediaQuery.removePadding(
-              context: context,
-              removeTop: true,
-              child: child,
+            child: SafeArea(
+              top: false,
+              bottom: false,
+              child: MediaQuery.removePadding(
+                context: context,
+                removeTop: true,
+                child: child,
+              ),
             ),
           ),
           // Blurred app bar overlay - positioned AFTER content so it renders on top
diff --git a/lib/widgets/expandable_section_header.dart b/lib/widgets/expandable_section_header.dart
index 64935101..7e3dcb78 100644
--- a/lib/widgets/expandable_section_header.dart
+++ b/lib/widgets/expandable_section_header.dart
@@ -22,8 +22,6 @@ class ExpandableSectionHeader extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final isLandscape = context.isLandscape;
-
     return InkWell(
       onTap: onToggle != null
           ? () {
@@ -35,9 +33,9 @@ class ExpandableSectionHeader extends StatelessWidget {
         padding:
             padding ??
             EdgeInsets.fromLTRB(
-              isLandscape ? MediaQuery.of(context).padding.left : 16,
+              16 + MediaQuery.of(context).padding.left,
               0,
-              isLandscape ? MediaQuery.of(context).padding.right : 16,
+              16 + MediaQuery.of(context).padding.right,
               8,
             ),
         child: Column(
diff --git a/lib/widgets/section_header.dart b/lib/widgets/section_header.dart
index 877df882..285244a6 100644
--- a/lib/widgets/section_header.dart
+++ b/lib/widgets/section_header.dart
@@ -19,15 +19,13 @@ class SectionHeader extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final isLandscape = context.isLandscape;
-
     return Padding(
       padding:
           padding ??
           EdgeInsets.fromLTRB(
-            isLandscape ? MediaQuery.of(context).padding.left : 16,
+            16 + MediaQuery.of(context).padding.left,
             0,
-            isLandscape ? MediaQuery.of(context).padding.right : 16,
+            16 + MediaQuery.of(context).padding.right,
             8,
           ),
       child: Column(