diff --git a/core/lib/presentation/utils/shims/dart_ui_real.dart b/core/lib/presentation/utils/shims/dart_ui_real.dart
index 90ecd7d00..2cd8a4def 100644
--- a/core/lib/presentation/utils/shims/dart_ui_real.dart
+++ b/core/lib/presentation/utils/shims/dart_ui_real.dart
@@ -2,4 +2,4 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-export 'dart:ui';
+export 'dart:ui_web';
diff --git a/lib/features/base/isolate/isolate_manager.dart b/lib/features/base/isolate/isolate_manager.dart
index f85c79dc6..50a376583 100644
--- a/lib/features/base/isolate/isolate_manager.dart
+++ b/lib/features/base/isolate/isolate_manager.dart
@@ -1,8 +1,8 @@
 
 import 'dart:async';
 import 'dart:isolate';
+import 'dart:ui';
 
-import 'package:core/presentation/utils/shims/dart_ui_real.dart';
 import 'package:core/utils/app_logger.dart';
 
 abstract class IsolateManager {
diff --git a/test/features/rule_filter_creator/presentation/rule_filter_creator_controller_test.dart b/test/features/rule_filter_creator/presentation/rule_filter_creator_controller_test.dart
index 5a73beaed..9f91147e1 100644
--- a/test/features/rule_filter_creator/presentation/rule_filter_creator_controller_test.dart
+++ b/test/features/rule_filter_creator/presentation/rule_filter_creator_controller_test.dart
@@ -2,10 +2,10 @@ import 'package:core/data/network/config/dynamic_url_interceptors.dart';
 import 'package:core/presentation/resources/image_paths.dart';
 import 'package:core/presentation/utils/app_toast.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
-import 'package:core/presentation/utils/shims/dart_ui_real.dart';
 import 'package:core/utils/application_manager.dart';
 import 'package:dartz/dartz.dart' hide State;
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart' hide State;
 import 'package:flutter_test/flutter_test.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';