diff --git a/lib/presentation/common/activity/view_model/activity_item_like_view_model.dart b/lib/presentation/common/activity/view_model/activity_item_like_view_model.dart
index 0ee37f2e..139223a3 100644
--- a/lib/presentation/common/activity/view_model/activity_item_like_view_model.dart
+++ b/lib/presentation/common/activity/view_model/activity_item_like_view_model.dart
@@ -1,9 +1,10 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import '../../core/widgets/view_model/infinite_scroll_list_view_model.dart';
+
 import '../../../../data/repositories/activity_repository_impl.dart';
 import '../../../../domain/entities/activity.dart';
 import '../../core/enums/infinite_scroll_list.enum.dart';
 import '../../core/utils/activity_utils.dart';
+import '../../core/widgets/view_model/infinite_scroll_list_view_model.dart';
 import 'state/activity_item_like_state.dart';
 
 /// Provider for the activity item like view model.
diff --git a/lib/presentation/common/activity/widgets/activity_item_user_informations.dart b/lib/presentation/common/activity/widgets/activity_item_user_informations.dart
index bfe01550..bb71b08c 100644
--- a/lib/presentation/common/activity/widgets/activity_item_user_informations.dart
+++ b/lib/presentation/common/activity/widgets/activity_item_user_informations.dart
@@ -2,12 +2,12 @@ import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import '../../user/view_model/profile_picture_view_model.dart';
 
 import '../../../../domain/entities/activity.dart';
 import '../../core/utils/color_utils.dart';
 import '../../core/utils/ui_utils.dart';
 import '../../core/utils/user_utils.dart';
+import '../../user/view_model/profile_picture_view_model.dart';
 import '../view_model/activity_item_view_model.dart';
 
 class ActivityItemUserInformation extends HookConsumerWidget {
diff --git a/lib/presentation/common/user/screens/profile_screen.dart b/lib/presentation/common/user/screens/profile_screen.dart
index 1dc5ca97..206d9bc5 100644
--- a/lib/presentation/common/user/screens/profile_screen.dart
+++ b/lib/presentation/common/user/screens/profile_screen.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import '../view_model/profile_picture_view_model.dart';
 
 import '../../../../domain/entities/activity.dart';
 import '../../../../domain/entities/enum/friend_request_status.dart';
@@ -10,6 +9,7 @@ import '../../activity/widgets/activity_list.dart';
 import '../../core/enums/infinite_scroll_list.enum.dart';
 import '../../core/utils/ui_utils.dart';
 import '../../core/utils/user_utils.dart';
+import '../view_model/profile_picture_view_model.dart';
 import '../view_model/profile_view_model.dart';
 import '../widgets/friend_request.dart';
 
diff --git a/lib/presentation/settings/screens/edit_profile_screen.dart b/lib/presentation/settings/screens/edit_profile_screen.dart
index e685564a..4921070c 100644
--- a/lib/presentation/settings/screens/edit_profile_screen.dart
+++ b/lib/presentation/settings/screens/edit_profile_screen.dart
@@ -3,7 +3,6 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import '../../common/user/view_model/profile_picture_view_model.dart';
 
 import '../../../domain/entities/user.dart';
 import '../../common/core/utils/color_utils.dart';
@@ -11,6 +10,7 @@ import '../../common/core/utils/form_utils.dart';
 import '../../common/core/utils/ui_utils.dart';
 import '../../common/core/validators/login_validators.dart';
 import '../../common/core/widgets/upload_file.dart';
+import '../../common/user/view_model/profile_picture_view_model.dart';
 import '../view_model/edit_profile_view_model.dart';
 
 class EditProfileScreen extends HookConsumerWidget {