diff --git a/lib/app/modules/profile/views/profile_view.dart b/lib/app/modules/profile/views/profile_view.dart
index c26d11c1..cd9b8e28 100644
--- a/lib/app/modules/profile/views/profile_view.dart
+++ b/lib/app/modules/profile/views/profile_view.dart
@@ -6,6 +6,7 @@ import 'package:get/get.dart';
 
 import '../../../../services/auth_service.dart';
 import '../../../../models/screens.dart';
+import '../../../utils/img_constants.dart';
 import '../../../widgets/change_password_dialog.dart';
 import '../../../widgets/image_picker_button.dart';
 import '../controllers/profile_controller.dart';
@@ -62,7 +63,7 @@ class ProfileView extends GetView<ProfileController> {
                       )
                     : Center(
                         child: Image.asset(
-                          'assets/images/dash.png',
+                          ImgConstants.dash,
                           width: size,
                           fit: BoxFit.contain,
                         ),
diff --git a/lib/app/modules/root/views/root_view.dart b/lib/app/modules/root/views/root_view.dart
index 2bbf228c..e5be177b 100644
--- a/lib/app/modules/root/views/root_view.dart
+++ b/lib/app/modules/root/views/root_view.dart
@@ -5,6 +5,7 @@ import 'package:get/get.dart';
 import 'package:get_flutter_fire/services/auth_service.dart';
 import '../../../routes/app_pages.dart';
 import '../../../../models/screens.dart';
+import '../../../utils/icon_constants.dart';
 import '../controllers/root_controller.dart';
 import 'drawer.dart';
 
@@ -31,7 +32,7 @@ class RootView extends GetView<RootController> {
                   )
                 : IconButton(
                     icon: ImageIcon(
-                      const AssetImage("icons/logo.png"),
+                      const AssetImage(IconConstants.logo),
                       color: Colors.grey.shade800,
                     ),
                     onPressed: () => AuthService.to.isLoggedInValue
diff --git a/lib/app/utils/icon_constants.dart b/lib/app/utils/icon_constants.dart
new file mode 100644
index 00000000..b3351a95
--- /dev/null
+++ b/lib/app/utils/icon_constants.dart
@@ -0,0 +1,5 @@
+abstract class IconConstants {
+  static const _assetsIcon = 'assets/icons';
+
+  static const logo = '$_assetsIcon/logo.png';
+}
diff --git a/lib/app/utils/img_constants.dart b/lib/app/utils/img_constants.dart
new file mode 100644
index 00000000..83a5c0c6
--- /dev/null
+++ b/lib/app/utils/img_constants.dart
@@ -0,0 +1,6 @@
+abstract class ImgConstants {
+  static const _assetsImg = 'assets/images';
+
+  static const dash = '$_assetsImg/dash.png';
+  static const flutterfire = '$_assetsImg/flutterfire_300x.png';
+}
diff --git a/lib/app/widgets/image_picker_button.dart b/lib/app/widgets/image_picker_button.dart
index d6e87ff4..1385f052 100644
--- a/lib/app/widgets/image_picker_button.dart
+++ b/lib/app/widgets/image_picker_button.dart
@@ -86,6 +86,6 @@ class ImagePickerButton extends MenuSheetButton<ImageSources> {
             icon: icon,
             label: const Text('Pick an Image'),
           )
-        : builder(context);
+        : builder(context, vals: values);
   }
 }
diff --git a/lib/app/widgets/login_widgets.dart b/lib/app/widgets/login_widgets.dart
index b8f2d8c1..98d6f950 100644
--- a/lib/app/widgets/login_widgets.dart
+++ b/lib/app/widgets/login_widgets.dart
@@ -6,6 +6,7 @@ import 'package:get/get.dart';
 import '../../services/auth_service.dart';
 import '../../models/screens.dart';
 import '../../services/remote_config.dart';
+import '../utils/img_constants.dart';
 import 'menu_sheet_button.dart';
 
 class LoginWidgets {
@@ -14,7 +15,7 @@ class LoginWidgets {
       padding: const EdgeInsets.all(20),
       child: AspectRatio(
         aspectRatio: 1,
-        child: Image.asset('assets/images/flutterfire_300x.png'),
+        child: Image.asset(ImgConstants.flutterfire),
       ),
     );
   }
@@ -38,7 +39,7 @@ class LoginWidgets {
       padding: const EdgeInsets.all(20),
       child: AspectRatio(
         aspectRatio: 1,
-        child: Image.asset('assets/images/flutterfire_300x.png'),
+        child: Image.asset(ImgConstants.flutterfire),
       ),
     );
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 2909a374..d000e5f5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -36,8 +36,8 @@ flutter:
       fonts:
         - asset: packages/firebase_ui_auth/fonts/SocialIcons.ttf
   assets:
-    - assets/images/flutterfire_300x.png
-    - assets/images/dash.png
-    - assets/icons/logo.png
+    - assets/
+    - assets/images/
+    - assets/icons/
   uses-material-design: true