diff --git a/mobile/lib/common/app_bar_wrapper.dart b/mobile/lib/common/app_bar_wrapper.dart
index a8f6968f1..59860c24c 100644
--- a/mobile/lib/common/app_bar_wrapper.dart
+++ b/mobile/lib/common/app_bar_wrapper.dart
@@ -2,9 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:get_10101/common/color.dart';
 import 'package:get_10101/common/settings_screen.dart';
 import 'package:get_10101/common/status_icon_button.dart';
-import 'package:get_10101/features/trade/trade_screen.dart';
-import 'package:get_10101/features/wallet/wallet_screen.dart';
-import 'package:go_router/go_router.dart';
 
 class AppBarWrapper extends StatelessWidget {
   const AppBarWrapper({
@@ -13,34 +10,17 @@ class AppBarWrapper extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final currentRoute = GoRouterState.of(context).location;
     const appBarHeight = 35.0;
 
-    Widget? leadingButton;
-
-    if (currentRoute == WalletScreen.route) {
-      leadingButton = Row(mainAxisSize: MainAxisSize.min, children: [
-        IconButton(
-          icon: const Icon(Icons.settings),
-          tooltip: 'Settings',
-          onPressed: () {
-            Navigator.of(context).push(_createSettingsRoute());
-          },
-        )
-      ]);
-    }
-
-    if (currentRoute == TradeScreen.route) {
-      leadingButton = Row(mainAxisSize: MainAxisSize.min, children: [
-        IconButton(
-          icon: const Icon(Icons.settings),
-          tooltip: 'Settings',
-          onPressed: () {
-            Navigator.of(context).push(_createSettingsRoute());
-          },
-        )
-      ]);
-    }
+    final leadingButton = Row(mainAxisSize: MainAxisSize.min, children: [
+      IconButton(
+        icon: const Icon(Icons.settings),
+        tooltip: 'Settings',
+        onPressed: () {
+          Navigator.of(context).push(_createSettingsRoute());
+        },
+      )
+    ]);
 
     return Container(
         margin: const EdgeInsets.only(left: 6.0),
diff --git a/mobile/lib/common/status_screen.dart b/mobile/lib/common/status_screen.dart
index 67d136b6f..b65e2e49d 100644
--- a/mobile/lib/common/status_screen.dart
+++ b/mobile/lib/common/status_screen.dart
@@ -38,18 +38,21 @@ class _StatusScreenState extends State<StatusScreen> {
                 type: ValueType.text,
                 value: overallStatus,
                 label: "Services",
+                valueTextStyle: const TextStyle(fontWeight: FontWeight.bold),
               ),
               const Divider(),
               ValueDataRow(
                 type: ValueType.text,
                 value: orderbookStatus,
                 label: "Orderbook",
+                valueTextStyle: const TextStyle(fontWeight: FontWeight.bold),
               ),
               const SizedBox(height: 10),
               ValueDataRow(
                 type: ValueType.text,
                 value: coordinatorStatus,
                 label: "LSP",
+                valueTextStyle: const TextStyle(fontWeight: FontWeight.bold),
               ),
             ],
           )),
@@ -62,6 +65,7 @@ class _StatusScreenState extends State<StatusScreen> {
                 type: ValueType.text,
                 value: channelStatus,
                 label: "Channel status",
+                valueTextStyle: const TextStyle(fontWeight: FontWeight.bold),
               ),
             ],
           )),
diff --git a/mobile/lib/features/trade/trade_bottom_sheet_tab.dart b/mobile/lib/features/trade/trade_bottom_sheet_tab.dart
index 6572e4f8d..37f1ced3b 100644
--- a/mobile/lib/features/trade/trade_bottom_sheet_tab.dart
+++ b/mobile/lib/features/trade/trade_bottom_sheet_tab.dart
@@ -225,7 +225,7 @@ class _TradeBottomSheetTabState extends State<TradeBottomSheetTab> {
       BuildContext context,
       ChannelInfoService channelInfoService) {
     return Wrap(
-      runSpacing: 15,
+      runSpacing: 12,
       children: [
         Padding(
           padding: const EdgeInsets.only(bottom: 10),
@@ -394,7 +394,7 @@ class _TradeBottomSheetTabState extends State<TradeBottomSheetTab> {
                 builder: (context, liquidationPrice, child) {
                   return Flexible(child: FiatText(amount: liquidationPrice));
                 }),
-            const SizedBox(width: 20),
+            const SizedBox(width: 16),
             const Flexible(child: Text("Estimated fee:")),
             const SizedBox(width: 5),
             Selector<TradeValuesChangeNotifier, Amount>(