diff --git a/.gitignore b/.gitignore
index fb2527ac..c24966b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,9 @@
 # App config (contains API keys, passed via --dart-define-from-file)
 apps/mobile_app/config/*.json
 
+# Golden test diff outputs (transient artifacts written when goldens fail)
+**/test/failures/
+
 # macOS
 .DS_Store
 **/.DS_Store
diff --git a/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/control_panel_screen.dart b/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/control_panel_screen.dart
index 280cefe3..abb63ac4 100644
--- a/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/control_panel_screen.dart
+++ b/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/control_panel_screen.dart
@@ -262,6 +262,7 @@ class _MapSection extends ConsumerWidget {
                       .value
                       ?.selectedDevice;
                   if (device == null) return;
+                  if (!context.mounted) return;
                   try {
                     await showInfoDialog(
                       context,
diff --git a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/location_map.dart b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/location_map.dart
index a6fa59d8..92dc4e30 100644
--- a/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/location_map.dart
+++ b/modules/legacy/modules/location/lib/src/features/location/presentation/widgets/location_map.dart
@@ -959,6 +959,7 @@ class _LocationMapState extends ConsumerState<LocationMap>
             );
             final device = widget.selectedDevice;
             if (device == null) return;
+            if (!mounted) return;
             try {
               await showInfoDialog(
                 context,
diff --git a/packages/design_system/lib/src/buttons/primary_button.dart b/packages/design_system/lib/src/buttons/primary_button.dart
index e9ef3da9..e7bedabc 100644
--- a/packages/design_system/lib/src/buttons/primary_button.dart
+++ b/packages/design_system/lib/src/buttons/primary_button.dart
@@ -62,15 +62,17 @@ class PrimaryButton extends StatelessWidget {
               ),
               SizedBox(width: leadingGap),
             ],
-            Text(
-              text,
-              overflow: TextOverflow.ellipsis,
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                fontSize: size,
-                fontWeight: FontWeight.w500,
-                letterSpacing: 0,
-                color: Colors.white,
+            Flexible(
+              child: Text(
+                text,
+                overflow: TextOverflow.ellipsis,
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  fontSize: size,
+                  fontWeight: FontWeight.w500,
+                  letterSpacing: 0,
+                  color: Colors.white,
+                ),
               ),
             ),
           ],
diff --git a/packages/design_system/test/goldens/primary_button.png b/packages/design_system/test/goldens/primary_button.png
index 0129f296..6cd45f6e 100644
Binary files a/packages/design_system/test/goldens/primary_button.png and b/packages/design_system/test/goldens/primary_button.png differ
diff --git a/packages/design_system/test/goldens/secondary_button.png b/packages/design_system/test/goldens/secondary_button.png
index 9394324c..361db4ae 100644
Binary files a/packages/design_system/test/goldens/secondary_button.png and b/packages/design_system/test/goldens/secondary_button.png differ
diff --git a/packages/flutter_treezor_entrust_sdk_bridge/example/test/widget_test.dart b/packages/flutter_treezor_entrust_sdk_bridge/example/test/widget_test.dart
deleted file mode 100644
index 9da7bc1b..00000000
--- a/packages/flutter_treezor_entrust_sdk_bridge/example/test/widget_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility in the flutter_test package. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:flutter_treezor_entrust_sdk_bridge_example/main.dart';
-
-void main() {
-  testWidgets('Verify Platform version', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(const MyApp());
-
-    // Verify that platform version is retrieved.
-    expect(
-      find.byWidgetPredicate(
-        (Widget widget) =>
-            widget is Text && widget.data!.startsWith('Running on:'),
-      ),
-      findsOneWidget,
-    );
-  });
-}