diff --git a/app/lib/widget/image_editor.dart b/app/lib/widget/image_editor.dart
index fc65d800..3264607c 100644
--- a/app/lib/widget/image_editor.dart
+++ b/app/lib/widget/image_editor.dart
@@ -15,7 +15,6 @@ import 'package:nc_photos/help_utils.dart' as help_util;
 import 'package:nc_photos/k.dart' as k;
 import 'package:nc_photos/np_api_util.dart';
 import 'package:nc_photos/object_extension.dart';
-import 'package:nc_photos/pixel_image_provider.dart';
 import 'package:nc_photos/theme.dart';
 import 'package:nc_photos/url_launcher_util.dart';
 import 'package:nc_photos/widget/handler/permission_handler.dart';
diff --git a/app/lib/widget/image_editor/crop_controller.dart b/app/lib/widget/image_editor/crop_controller.dart
index d82a98b9..7ace5346 100644
--- a/app/lib/widget/image_editor/crop_controller.dart
+++ b/app/lib/widget/image_editor/crop_controller.dart
@@ -2,11 +2,11 @@ import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
-import 'package:nc_photos/pixel_image_provider.dart';
 import 'package:nc_photos/widget/image_editor/transform_toolbar.dart';
 import 'package:np_codegen/np_codegen.dart';
 import 'package:np_platform_image_processor/np_platform_image_processor.dart';
 import 'package:np_platform_raw_image/np_platform_raw_image.dart';
+import 'package:np_ui/np_ui.dart';
 
 part 'crop_controller.g.dart';
 
diff --git a/np_ui/lib/np_ui.dart b/np_ui/lib/np_ui.dart
index d68262dd..31d63f46 100644
--- a/np_ui/lib/np_ui.dart
+++ b/np_ui/lib/np_ui.dart
@@ -6,6 +6,7 @@ export 'src/app_bar_title_container.dart';
 export 'src/asset_icon.dart';
 export 'src/fancy_option_picker.dart';
 export 'src/material3.dart';
+export 'src/pixel_image_provider.dart';
 export 'src/shimmer.dart';
 export 'src/stateful_slider.dart';
 export 'src/switch_form_field.dart';
diff --git a/app/lib/pixel_image_provider.dart b/np_ui/lib/src/pixel_image_provider.dart
similarity index 91%
rename from app/lib/pixel_image_provider.dart
rename to np_ui/lib/src/pixel_image_provider.dart
index a2de56e9..f09c8fa9 100644
--- a/app/lib/pixel_image_provider.dart
+++ b/np_ui/lib/src/pixel_image_provider.dart
@@ -5,7 +5,7 @@ import 'package:flutter/rendering.dart';
 
 /// ImageProvider for raw RGBA pixels
 class PixelImage extends ImageProvider<PixelImage> {
-  PixelImage(
+  const PixelImage(
     this.rgba,
     this.width,
     this.height, {
@@ -13,7 +13,7 @@ class PixelImage extends ImageProvider<PixelImage> {
   });
 
   @override
-  obtainKey(ImageConfiguration configuration) =>
+  Future<PixelImage> obtainKey(ImageConfiguration configuration) =>
       SynchronousFuture<PixelImage>(this);
 
   @override