diff --git a/lib/features/base/mixin/message_dialog_action_mixin.dart b/lib/features/base/mixin/message_dialog_action_mixin.dart
index 9c5656a99..77b07040f 100644
--- a/lib/features/base/mixin/message_dialog_action_mixin.dart
+++ b/lib/features/base/mixin/message_dialog_action_mixin.dart
@@ -8,9 +8,6 @@ import 'package:tmail_ui_user/main/routes/route_navigation.dart';
 
 mixin MessageDialogActionMixin {
 
-  final _responsiveUtils = Get.find<ResponsiveUtils>();
-  final _imagePaths = Get.find<ImagePaths>();
-
   void showConfirmDialogAction(
       BuildContext context,
       String message,
@@ -29,6 +26,9 @@ mixin MessageDialogActionMixin {
         Color? cancelButtonColor,
       }
   ) {
+    final _responsiveUtils = Get.find<ResponsiveUtils>();
+    final _imagePaths = Get.find<ImagePaths>();
+
     if (_responsiveUtils.isMobile(context)) {
       if (showAsBottomSheet) {
         showModalBottomSheet(
diff --git a/lib/features/push_notification/data/model/fcm_token_cache.dart b/lib/features/push_notification/data/model/fcm_token_cache.dart
index 89ab810e9..47f755cc3 100644
--- a/lib/features/push_notification/data/model/fcm_token_cache.dart
+++ b/lib/features/push_notification/data/model/fcm_token_cache.dart
@@ -18,5 +18,5 @@ class FCMTokenCache extends HiveObject with EquatableMixin {
   );
 
   @override
-  List<Object?> get props => [token];
+  List<Object?> get props => [token, accountId];
 }
diff --git a/lib/features/push_notification/data/repository/fcm_repository_impl.dart b/lib/features/push_notification/data/repository/fcm_repository_impl.dart
index 118beeb84..453ab18df 100644
--- a/lib/features/push_notification/data/repository/fcm_repository_impl.dart
+++ b/lib/features/push_notification/data/repository/fcm_repository_impl.dart
@@ -16,7 +16,7 @@ class FCMRepositoryImpl extends FCMRepository {
 
   @override
   Future<void> setFCMToken(FCMTokenDto fcmTokenDto) {
-    log('FCMRepositoryImpl::setCurrentFCM(): $fcmTokenDto');
+    log('FCMRepositoryImpl::setFCMToken(): $fcmTokenDto');
     return _fcmDatasource.setFCMToken(fcmTokenDto);
   }
 
diff --git a/lib/features/push_notification/presentation/firebase_bindings.dart b/lib/features/push_notification/presentation/bindings/fcm_interactor_bindings.dart
similarity index 74%
rename from lib/features/push_notification/presentation/firebase_bindings.dart
rename to lib/features/push_notification/presentation/bindings/fcm_interactor_bindings.dart
index 4e775dded..2257434d7 100644
--- a/lib/features/push_notification/presentation/firebase_bindings.dart
+++ b/lib/features/push_notification/presentation/bindings/fcm_interactor_bindings.dart
@@ -1,11 +1,8 @@
 import 'package:get/get.dart';
-import 'package:hive/hive.dart';
-import 'package:tmail_ui_user/features/base/base_bindings.dart';
-import 'package:tmail_ui_user/features/caching/fcm_token_cache_client.dart';
+import 'package:tmail_ui_user/features/base/interactors_bindings.dart';
 import 'package:tmail_ui_user/features/push_notification/data/datasource/fcm_datasource.dart';
 import 'package:tmail_ui_user/features/push_notification/data/datasource_impl/hive_fcm_datasource_impl.dart';
 import 'package:tmail_ui_user/features/push_notification/data/local/fcm_cache_manager.dart';
-import 'package:tmail_ui_user/features/push_notification/data/model/fcm_token_cache.dart';
 import 'package:tmail_ui_user/features/push_notification/data/repository/fcm_repository_impl.dart';
 import 'package:tmail_ui_user/features/push_notification/domain/repository/fcm_repository.dart';
 import 'package:tmail_ui_user/features/push_notification/domain/usecases/delete_fcm_token_cache_interactor.dart';
@@ -13,15 +10,7 @@ import 'package:tmail_ui_user/features/push_notification/domain/usecases/get_fcm
 import 'package:tmail_ui_user/features/push_notification/domain/usecases/save_fcm_token_cache_interactor.dart';
 import 'package:tmail_ui_user/main/exceptions/cache_exception_thrower.dart';
 
-class FCMBindings extends BaseBindings {
-  @override
-  void dependencies() {
-    _bindingsLocal();
-    super.dependencies();
-  }
-
-  @override
-  void bindingsController() {}
+class FcmInteractorBindings extends InteractorsBindings {
 
   @override
   void bindingsDataSource() {
@@ -52,9 +41,4 @@ class FCMBindings extends BaseBindings {
   void bindingsRepositoryImpl() {
     Get.put(FCMRepositoryImpl(Get.find<FCMDatasource>()));
   }
-
-  void _bindingsLocal() {
-    Get.put(FCMCacheManager(Get.find<FcmTokenCacheClient>()));
-    Hive.registerAdapter(FCMTokenCacheAdapter());
-  }
 }
diff --git a/lib/features/push_notification/presentation/firebase_options.dart b/lib/features/push_notification/presentation/config/firebase_options.dart
similarity index 87%
rename from lib/features/push_notification/presentation/firebase_options.dart
rename to lib/features/push_notification/presentation/config/firebase_options.dart
index 281814d6c..217e1b8d0 100644
--- a/lib/features/push_notification/presentation/firebase_options.dart
+++ b/lib/features/push_notification/presentation/config/firebase_options.dart
@@ -49,11 +49,11 @@ class DefaultFirebaseOptions {
 
   static FirebaseOptions android = FirebaseOptions(
     apiKey: dotenv.get('FIREBASE_ANDROID_API_KEY', fallback: ''),
-    appId:  dotenv.get('FIREBASE_ANDROID_APP_ID', fallback: ''),
-    messagingSenderId:  dotenv.get('FIREBASE_ANDROID_MESSAGING_SENDER_ID', fallback: ''),
-    projectId:  dotenv.get('FIREBASE_ANDROID_PROJECT_ID', fallback: ''),
-    databaseURL:  dotenv.get('FIREBASE_ANDROID_DATABASE_URL', fallback: ''),
-    storageBucket:  dotenv.get('FIREBASE_ANDROID_STORAGE_BUCKET', fallback: ''),
+    appId: dotenv.get('FIREBASE_ANDROID_APP_ID', fallback: ''),
+    messagingSenderId: dotenv.get('FIREBASE_ANDROID_MESSAGING_SENDER_ID', fallback: ''),
+    projectId: dotenv.get('FIREBASE_ANDROID_PROJECT_ID', fallback: ''),
+    databaseURL: dotenv.get('FIREBASE_ANDROID_DATABASE_URL', fallback: ''),
+    storageBucket: dotenv.get('FIREBASE_ANDROID_STORAGE_BUCKET', fallback: ''),
   );
 
   static FirebaseOptions ios = FirebaseOptions(