diff --git a/dependencies.yaml b/dependencies.yaml
index 065c637b..58d50e60 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -12,6 +12,9 @@ dependencies:
   blurhash_dart:
     git: https://github.com/justacid/blurhash-dart.git
     tag: v1.2.1
+  emoji_picker_flutter:
+    git: https://github.com/otsmr/emoji_picker_flutter.git
+    commit: 47ddf705fb4840d6fbe305b79e896666dda7b0d5
   exif:
     git: https://github.com/bigflood/dartexif.git
     dependencies:
@@ -72,9 +75,6 @@ dependencies:
   photo_view:
     git: https://github.com/bluefireteam/photo_view.git
     commit: a13ca2fc387a3fb1276126959e092c44d0029987
-  pro_video_editor:
-    git: https://github.com/hm21/pro_video_editor.git
-    tag: v2.11.3
   qr_flutter:
     git: https://github.com/theyakka/qr.flutter.git
     dependencies:
diff --git a/lib/src/localization/translations b/lib/src/localization/translations
index 50cc5cb6..17d10180 160000
--- a/lib/src/localization/translations
+++ b/lib/src/localization/translations
@@ -1 +1 @@
-Subproject commit 50cc5cb69dd91a5c626534fe4c015e50d2a0a486
+Subproject commit 17d101801f02cfeaa2a175083111a59fa6d6822c
diff --git a/pubspec.lock b/pubspec.lock
index d89953aa..c5ff523d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -407,12 +407,10 @@ packages:
   emoji_picker_flutter:
     dependency: "direct main"
     description:
-      path: "."
-      ref: "23a0595f7dde50728afce917c1c58f284ccbb495"
-      resolved-ref: "23a0595f7dde50728afce917c1c58f284ccbb495"
-      url: "https://github.com/otsmr/emoji_picker_flutter.git"
-    source: git
-    version: "4.4.0"
+      path: "dependencies/emoji_picker_flutter"
+      relative: true
+    source: path
+    version: "4.5.3"
   exif:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 329f102f..8448787d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -66,10 +66,6 @@ dependencies:
   flutter_local_notifications: ^19.1.0
   sentry_flutter: ^9.14.0
 
-
-  # Overwritten by self-controlled repository
-  emoji_picker_flutter: ^4.3.0
-
   # With high download. (But should be checked nonetheless.)
   app_links: ^7.0.0 # 1.6 mio
   flutter_secure_storage: ^10.3.1 # 1.85 mio
@@ -92,6 +88,7 @@ dependencies:
   audio_waveforms: ^2.0.2
   avatar_maker: ^1.5.0
   blurhash_dart: ^1.2.1
+  emoji_picker_flutter: ^4.5.3
   exif: ^3.3.0
   sprintf: ^7.0.0
   flutter_blurhash: ^0.9.1
@@ -118,12 +115,6 @@ dependencies:
 
 
 dependency_overrides:
-  emoji_picker_flutter:
-    # Fixes the issue with recent emojis (solved by https://github.com/Fintasys/emoji_picker_flutter/pull/238)
-    # Using override until this gets merged.
-    git:
-      url: https://github.com/otsmr/emoji_picker_flutter.git
-      ref: 23a0595f7dde50728afce917c1c58f284ccbb495
   flutter_android_volume_keydown:
     git:
       url: https://github.com/yenchieh/flutter_android_volume_keydown.git
@@ -136,6 +127,8 @@ dependency_overrides:
     path: ./dependencies/avatar_maker
   blurhash_dart:
     path: ./dependencies/blurhash_dart
+  emoji_picker_flutter:
+    path: ./dependencies/emoji_picker_flutter
   exif:
     path: ./dependencies/exif
   sprintf: