diff --git a/lib/pages/configuration.dart b/lib/pages/configuration.dart
index 79a0d95..40acb97 100644
--- a/lib/pages/configuration.dart
+++ b/lib/pages/configuration.dart
@@ -111,7 +111,7 @@ class _ConfigurationPageState extends State<ConfigurationPage> {
                       },
                     ),
                     if (core.settings.getTrainerApp() != null) ...[
-                      if (core.settings.getTrainerApp()!.supportsOpenBikeProtocol == true)
+                      if (core.settings.getTrainerApp()!.supportsOpenBikeProtocol == true && !screenshotMode)
                         Text(
                           AppLocalizations.of(context).openBikeControlAnnouncement(core.settings.getTrainerApp()!.name),
                         ).xSmall,
@@ -162,7 +162,7 @@ class _ConfigurationPageState extends State<ConfigurationPage> {
                         ],
                       ),
                     ],
-                    if (core.settings.getTrainerApp()?.star == true)
+                    if (core.settings.getTrainerApp()?.star == true && !screenshotMode)
                       Row(
                         spacing: 8,
                         children: [
diff --git a/lib/pages/customize.dart b/lib/pages/customize.dart
index 5102c3e..78a02d4 100644
--- a/lib/pages/customize.dart
+++ b/lib/pages/customize.dart
@@ -23,7 +23,7 @@ class _CustomizeState extends State<CustomizePage> {
   @override
   Widget build(BuildContext context) {
     return SingleChildScrollView(
-      padding: EdgeInsets.symmetric(vertical: 32, horizontal: 16),
+      padding: EdgeInsets.all(16),
       child: Column(
         spacing: 12,
         mainAxisAlignment: MainAxisAlignment.start,
diff --git a/lib/widgets/scan.dart b/lib/widgets/scan.dart
index a612bce..35a2f13 100644
--- a/lib/widgets/scan.dart
+++ b/lib/widgets/scan.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:bike_control/gen/l10n.dart';
+import 'package:bike_control/main.dart';
 import 'package:bike_control/pages/button_simulator.dart';
 import 'package:bike_control/pages/markdown.dart';
 import 'package:bike_control/utils/core.dart';
@@ -112,57 +113,58 @@ class _ScanWidgetState extends State<ScanWidget> {
                         },
                       ),
                     SizedBox(),
-                    Column(
-                      spacing: 8,
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        OutlineButton(
-                          onPressed: () {
-                            Navigator.push(
-                              context,
-                              MaterialPageRoute(builder: (c) => MarkdownPage(assetPath: 'TROUBLESHOOTING.md')),
-                            );
-                          },
-                          leading: Icon(Icons.help_outline),
-                          child: Text(context.i18n.showTroubleshootingGuide),
-                        ),
-                        OutlineButton(
-                          onPressed: () {
-                            launchUrlString(
-                              'https://github.com/jonasbark/swiftcontrol/?tab=readme-ov-file#supported-devices',
-                            );
-                          },
-                          leading: Icon(Icons.gamepad_outlined),
-                          child: Text(context.i18n.showSupportedControllers),
-                        ),
-                        if (core.settings.getIgnoredDevices().isNotEmpty)
+                    if (!screenshotMode)
+                      Column(
+                        spacing: 8,
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
                           OutlineButton(
-                            leading: Icon(Icons.block_outlined),
-                            onPressed: () async {
-                              await showDialog(
-                                context: context,
-                                builder: (context) => IgnoredDevicesDialog(),
-                              );
-                              setState(() {});
-                            },
-                            child: Text(context.i18n.manageIgnoredDevices),
-                          ),
-
-                        if (core.connection.controllerDevices.isEmpty)
-                          PrimaryButton(
-                            leading: Icon(Icons.computer_outlined),
                             onPressed: () {
                               Navigator.push(
                                 context,
-                                MaterialPageRoute(
-                                  builder: (c) => ButtonSimulator(),
-                                ),
+                                MaterialPageRoute(builder: (c) => MarkdownPage(assetPath: 'TROUBLESHOOTING.md')),
                               );
                             },
-                            child: Text(AppLocalizations.of(context).noControllerUseCompanionMode),
+                            leading: Icon(Icons.help_outline),
+                            child: Text(context.i18n.showTroubleshootingGuide),
                           ),
-                      ],
-                    ),
+                          OutlineButton(
+                            onPressed: () {
+                              launchUrlString(
+                                'https://github.com/jonasbark/swiftcontrol/?tab=readme-ov-file#supported-devices',
+                              );
+                            },
+                            leading: Icon(Icons.gamepad_outlined),
+                            child: Text(context.i18n.showSupportedControllers),
+                          ),
+                          if (core.settings.getIgnoredDevices().isNotEmpty)
+                            OutlineButton(
+                              leading: Icon(Icons.block_outlined),
+                              onPressed: () async {
+                                await showDialog(
+                                  context: context,
+                                  builder: (context) => IgnoredDevicesDialog(),
+                                );
+                                setState(() {});
+                              },
+                              child: Text(context.i18n.manageIgnoredDevices),
+                            ),
+
+                          if (core.connection.controllerDevices.isEmpty)
+                            PrimaryButton(
+                              leading: Icon(Icons.computer_outlined),
+                              onPressed: () {
+                                Navigator.push(
+                                  context,
+                                  MaterialPageRoute(
+                                    builder: (c) => ButtonSimulator(),
+                                  ),
+                                );
+                              },
+                              child: Text(AppLocalizations.of(context).noControllerUseCompanionMode),
+                            ),
+                        ],
+                      ),
                   ],
                 );
               } else {
diff --git a/screenshots/companion-android-1320x2868.png b/screenshots/companion-android-1320x2868.png
index 19212c6..cd9d947 100644
Binary files a/screenshots/companion-android-1320x2868.png and b/screenshots/companion-android-1320x2868.png differ
diff --git a/screenshots/companion-androidTablet-3840x2400.png b/screenshots/companion-androidTablet-3840x2400.png
index 0c7d29e..eaf6516 100644
Binary files a/screenshots/companion-androidTablet-3840x2400.png and b/screenshots/companion-androidTablet-3840x2400.png differ
diff --git a/screenshots/companion-desktop-2560x1600.png b/screenshots/companion-desktop-2560x1600.png
index d0e5c5f..0d30e30 100644
Binary files a/screenshots/companion-desktop-2560x1600.png and b/screenshots/companion-desktop-2560x1600.png differ
diff --git a/screenshots/companion-iPad-2752x2064.png b/screenshots/companion-iPad-2752x2064.png
index 58dd555..5ed4958 100644
Binary files a/screenshots/companion-iPad-2752x2064.png and b/screenshots/companion-iPad-2752x2064.png differ
diff --git a/screenshots/companion-iPhone-1242x2688.png b/screenshots/companion-iPhone-1242x2688.png
index 191de24..945afb1 100644
Binary files a/screenshots/companion-iPhone-1242x2688.png and b/screenshots/companion-iPhone-1242x2688.png differ
diff --git a/screenshots/companion-noFrame-1100x2390.png b/screenshots/companion-noFrame-1100x2390.png
index 303752f..c51467c 100644
Binary files a/screenshots/companion-noFrame-1100x2390.png and b/screenshots/companion-noFrame-1100x2390.png differ
diff --git a/screenshots/customization-android-1320x2868.png b/screenshots/customization-android-1320x2868.png
index b465e24..f3939d6 100644
Binary files a/screenshots/customization-android-1320x2868.png and b/screenshots/customization-android-1320x2868.png differ
diff --git a/screenshots/customization-androidTablet-3840x2400.png b/screenshots/customization-androidTablet-3840x2400.png
index 8ffe561..b26879e 100644
Binary files a/screenshots/customization-androidTablet-3840x2400.png and b/screenshots/customization-androidTablet-3840x2400.png differ
diff --git a/screenshots/customization-desktop-2560x1600.png b/screenshots/customization-desktop-2560x1600.png
index 2a0045d..8abee71 100644
Binary files a/screenshots/customization-desktop-2560x1600.png and b/screenshots/customization-desktop-2560x1600.png differ
diff --git a/screenshots/customization-iPad-2752x2064.png b/screenshots/customization-iPad-2752x2064.png
index 9eb04c2..43e08af 100644
Binary files a/screenshots/customization-iPad-2752x2064.png and b/screenshots/customization-iPad-2752x2064.png differ
diff --git a/screenshots/customization-iPhone-1242x2688.png b/screenshots/customization-iPhone-1242x2688.png
index dfaf037..46af0b0 100644
Binary files a/screenshots/customization-iPhone-1242x2688.png and b/screenshots/customization-iPhone-1242x2688.png differ
diff --git a/screenshots/customization-noFrame-1100x2390.png b/screenshots/customization-noFrame-1100x2390.png
index f25f91c..1256b55 100644
Binary files a/screenshots/customization-noFrame-1100x2390.png and b/screenshots/customization-noFrame-1100x2390.png differ
diff --git a/screenshots/device-android-1320x2868.png b/screenshots/device-android-1320x2868.png
index 9a37d8a..831cb28 100644
Binary files a/screenshots/device-android-1320x2868.png and b/screenshots/device-android-1320x2868.png differ
diff --git a/screenshots/device-androidTablet-3840x2400.png b/screenshots/device-androidTablet-3840x2400.png
index 54ce52c..4c035e4 100644
Binary files a/screenshots/device-androidTablet-3840x2400.png and b/screenshots/device-androidTablet-3840x2400.png differ
diff --git a/screenshots/device-desktop-2560x1600.png b/screenshots/device-desktop-2560x1600.png
index d9c876b..ef7b02c 100644
Binary files a/screenshots/device-desktop-2560x1600.png and b/screenshots/device-desktop-2560x1600.png differ
diff --git a/screenshots/device-iPad-2752x2064.png b/screenshots/device-iPad-2752x2064.png
index 55a5f03..ecb6ff8 100644
Binary files a/screenshots/device-iPad-2752x2064.png and b/screenshots/device-iPad-2752x2064.png differ
diff --git a/screenshots/device-iPhone-1242x2688.png b/screenshots/device-iPhone-1242x2688.png
index 69b2bd8..473e098 100644
Binary files a/screenshots/device-iPhone-1242x2688.png and b/screenshots/device-iPhone-1242x2688.png differ
diff --git a/screenshots/device-noFrame-1100x2390.png b/screenshots/device-noFrame-1100x2390.png
index a5be07b..6c6a7c4 100644
Binary files a/screenshots/device-noFrame-1100x2390.png and b/screenshots/device-noFrame-1100x2390.png differ
diff --git a/screenshots/trainer-android-1320x2868.png b/screenshots/trainer-android-1320x2868.png
index 5068913..a85fe74 100644
Binary files a/screenshots/trainer-android-1320x2868.png and b/screenshots/trainer-android-1320x2868.png differ
diff --git a/screenshots/trainer-androidTablet-3840x2400.png b/screenshots/trainer-androidTablet-3840x2400.png
index 09390f9..b1113be 100644
Binary files a/screenshots/trainer-androidTablet-3840x2400.png and b/screenshots/trainer-androidTablet-3840x2400.png differ
diff --git a/screenshots/trainer-desktop-2560x1600.png b/screenshots/trainer-desktop-2560x1600.png
index 57c6804..4b3a955 100644
Binary files a/screenshots/trainer-desktop-2560x1600.png and b/screenshots/trainer-desktop-2560x1600.png differ
diff --git a/screenshots/trainer-iPad-2752x2064.png b/screenshots/trainer-iPad-2752x2064.png
index 5442837..5e9db82 100644
Binary files a/screenshots/trainer-iPad-2752x2064.png and b/screenshots/trainer-iPad-2752x2064.png differ
diff --git a/screenshots/trainer-iPhone-1242x2688.png b/screenshots/trainer-iPhone-1242x2688.png
index 144a185..7bf5595 100644
Binary files a/screenshots/trainer-iPhone-1242x2688.png and b/screenshots/trainer-iPhone-1242x2688.png differ
diff --git a/screenshots/trainer-noFrame-1100x2390.png b/screenshots/trainer-noFrame-1100x2390.png
index c91b54a..7f73546 100644
Binary files a/screenshots/trainer-noFrame-1100x2390.png and b/screenshots/trainer-noFrame-1100x2390.png differ
diff --git a/test/screenshot_test.dart b/test/screenshot_test.dart
index 57f99b0..fc8c521 100644
--- a/test/screenshot_test.dart
+++ b/test/screenshot_test.dart
@@ -32,7 +32,7 @@ Future<void> main() async {
   PackageInfo.setMockInitialValues(
     appName: 'BikeControl',
     packageName: 'de.jonasbark.swiftcontrol',
-    version: '4.0.0',
+    version: '4.2.0',
     buildNumber: '1',
     buildSignature: '',
   );