diff --git a/packages/smooth_app/pubspec.lock b/packages/smooth_app/pubspec.lock
index ddb26b90d493..367dc2ef345c 100644
--- a/packages/smooth_app/pubspec.lock
+++ b/packages/smooth_app/pubspec.lock
@@ -119,7 +119,7 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   built_collection:
     dependency: transitive
     description:
@@ -209,7 +209,7 @@ packages:
       name: code_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.2.0"
+    version: "4.3.0"
   collection:
     dependency: "direct main"
     description:
@@ -223,7 +223,7 @@ packages:
       name: connectivity_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.6+1"
+    version: "2.3.7"
   connectivity_plus_linux:
     dependency: transitive
     description:
@@ -272,7 +272,7 @@ packages:
       name: cross_file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.3+1"
+    version: "0.3.3+2"
   crypto:
     dependency: transitive
     description:
@@ -1231,7 +1231,7 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.3"
   source_span:
     dependency: transitive
     description:
diff --git a/packages/smooth_app/test/pages/goldens/user_preferences_page-dark.png b/packages/smooth_app/test/pages/goldens/user_preferences_page-dark.png
index 6e74c8bb3ed2..b195014bd7fc 100644
Binary files a/packages/smooth_app/test/pages/goldens/user_preferences_page-dark.png and b/packages/smooth_app/test/pages/goldens/user_preferences_page-dark.png differ
diff --git a/packages/smooth_app/test/pages/goldens/user_preferences_page-light.png b/packages/smooth_app/test/pages/goldens/user_preferences_page-light.png
index 6e74c8bb3ed2..e2e998cab23b 100644
Binary files a/packages/smooth_app/test/pages/goldens/user_preferences_page-light.png and b/packages/smooth_app/test/pages/goldens/user_preferences_page-light.png differ
diff --git a/packages/smooth_app/test/pages/user_preferences_page_test.dart b/packages/smooth_app/test/pages/user_preferences_page_test.dart
index 580b39a8aed8..085e3dec568b 100644
--- a/packages/smooth_app/test/pages/user_preferences_page_test.dart
+++ b/packages/smooth_app/test/pages/user_preferences_page_test.dart
@@ -16,7 +16,7 @@ import '../tests_utils/mocks.dart';
 void main() {
   group('UserPreferencesPage looks as expected', () {
     for (final bool themeDark in <bool>[true, false]) {
-      final String theme = themeDark ? 'dark' : 'light';
+      final String theme = themeDark ? 'Dark' : 'Light';
 
       testWidgets(theme, (WidgetTester tester) async {
         // Override & mock out HTTP Requests
@@ -28,12 +28,12 @@ void main() {
         late ThemeProvider themeProvider;
 
         SharedPreferences.setMockInitialValues(
-          mockSharedPreferences(
-            themeDark: themeDark,
-          ),
+          mockSharedPreferences(),
         );
 
         userPreferences = await UserPreferences.getUserPreferences();
+        userPreferences.setTheme(theme);
+
         productPreferences = ProductPreferences(ProductPreferencesSelection(
           setImportance: userPreferences.setImportance,
           getImportance: userPreferences.getImportance,
@@ -43,17 +43,23 @@ void main() {
         await userPreferences.init(productPreferences);
         themeProvider = ThemeProvider(userPreferences);
 
-        await tester.pumpWidget(MockSmoothApp(
-          userPreferences,
-          UserManagementProvider(),
-          productPreferences,
-          themeProvider,
-          const UserPreferencesPage(),
-        ));
+        await tester.pumpWidget(
+          MockSmoothApp(
+            userPreferences,
+            UserManagementProvider(),
+            productPreferences,
+            themeProvider,
+            const UserPreferencesPage(),
+          ),
+        );
         await tester.pump();
 
-        await expectGoldenMatches(find.byType(UserPreferencesPage),
-            'user_preferences_page-$theme.png');
+        // We need to lowercase the theme, as on some platforms
+        // the name is always lowercase
+        await expectGoldenMatches(
+          find.byType(UserPreferencesPage),
+          'user_preferences_page-${theme.toLowerCase()}.png',
+        );
         expect(tester, meetsGuideline(textContrastGuideline));
         expect(tester, meetsGuideline(labeledTapTargetGuideline));
         expect(tester, meetsGuideline(iOSTapTargetGuideline));
diff --git a/packages/smooth_app/test/tests_utils/mocks.dart b/packages/smooth_app/test/tests_utils/mocks.dart
index e46396423a3a..a30158a3b831 100644
--- a/packages/smooth_app/test/tests_utils/mocks.dart
+++ b/packages/smooth_app/test/tests_utils/mocks.dart
@@ -58,7 +58,6 @@ class MockSmoothApp extends StatelessWidget {
 }
 
 Map<String, Object> mockSharedPreferences({
-  Color color = Colors.lightBlue,
   bool init = true,
   bool themeDark = false,
 }) =>