diff --git a/packages/firebase_ui_database/lib/src/table_builder.dart b/packages/firebase_ui_database/lib/src/table_builder.dart
index 42b61d55..09e6cbd6 100644
--- a/packages/firebase_ui_database/lib/src/table_builder.dart
+++ b/packages/firebase_ui_database/lib/src/table_builder.dart
@@ -428,7 +428,7 @@ class _PropertyTypeDropdown extends StatelessWidget {
     final localizations = FirebaseUILocalizations.labelsOf(context);
 
     return DropdownButtonFormField<_PropertyType?>(
-      initialValue: formState?.type,
+      value: formState?.type,
       decoration: InputDecoration(labelText: localizations.typeLabel),
       items: [
         DropdownMenuItem(
diff --git a/packages/firebase_ui_firestore/lib/src/table_builder.dart b/packages/firebase_ui_firestore/lib/src/table_builder.dart
index 580e7595..faa3402b 100644
--- a/packages/firebase_ui_firestore/lib/src/table_builder.dart
+++ b/packages/firebase_ui_firestore/lib/src/table_builder.dart
@@ -547,7 +547,7 @@ class _PropertyTypeDropdown extends StatelessWidget {
     final localizations = FirebaseUILocalizations.labelsOf(context);
 
     return DropdownButtonFormField<_PropertyType?>(
-      initialValue: formState?.type,
+      value: formState?.type,
       decoration: InputDecoration(labelText: localizations.typeLabel),
       items: [
         DropdownMenuItem(
diff --git a/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart b/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart
index 96b272dd..b959d1a1 100644
--- a/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart
+++ b/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart
@@ -2,8 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:flutter/widgets.dart';
-
+import 'package:flutter/material.dart';
 import 'package:firebase_ui_shared/firebase_ui_shared.dart';
 import 'package:flutter_svg/svg.dart';
 
diff --git a/packages/firebase_ui_shared/lib/src/themed.dart b/packages/firebase_ui_shared/lib/src/themed.dart
index e254c992..f33f5ae1 100644
--- a/packages/firebase_ui_shared/lib/src/themed.dart
+++ b/packages/firebase_ui_shared/lib/src/themed.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:flutter/widgets.dart';
+import 'package:flutter/material.dart';
 
 /// {@template ui.shared.themed_value}
 /// Helper class that helps to resolve a value based on the current app