diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae0b2ad84..0e4c5a591 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - Countries: show states for Mexico
+- Estonian translation (thanks Priit Jõerüüt)
 
 ### Changed
 
diff --git a/fastlane/metadata/android/et/images/featureGraphic.png b/fastlane/metadata/android/et/images/featureGraphic.png
new file mode 100644
index 000000000..338dc1575
Binary files /dev/null and b/fastlane/metadata/android/et/images/featureGraphic.png differ
diff --git a/fastlane/metadata/android/et/images/phoneScreenshots/1.png b/fastlane/metadata/android/et/images/phoneScreenshots/1.png
new file mode 100644
index 000000000..cdb408094
Binary files /dev/null and b/fastlane/metadata/android/et/images/phoneScreenshots/1.png differ
diff --git a/fastlane/metadata/android/et/images/phoneScreenshots/2.png b/fastlane/metadata/android/et/images/phoneScreenshots/2.png
new file mode 100644
index 000000000..e9b0da673
Binary files /dev/null and b/fastlane/metadata/android/et/images/phoneScreenshots/2.png differ
diff --git a/fastlane/metadata/android/et/images/phoneScreenshots/3.png b/fastlane/metadata/android/et/images/phoneScreenshots/3.png
new file mode 100644
index 000000000..61009e0a1
Binary files /dev/null and b/fastlane/metadata/android/et/images/phoneScreenshots/3.png differ
diff --git a/fastlane/metadata/android/et/images/phoneScreenshots/4.png b/fastlane/metadata/android/et/images/phoneScreenshots/4.png
new file mode 100644
index 000000000..a2020e1c5
Binary files /dev/null and b/fastlane/metadata/android/et/images/phoneScreenshots/4.png differ
diff --git a/fastlane/metadata/android/et/images/phoneScreenshots/5.png b/fastlane/metadata/android/et/images/phoneScreenshots/5.png
new file mode 100644
index 000000000..370631de2
Binary files /dev/null and b/fastlane/metadata/android/et/images/phoneScreenshots/5.png differ
diff --git a/fastlane/metadata/android/et/images/phoneScreenshots/6.png b/fastlane/metadata/android/et/images/phoneScreenshots/6.png
new file mode 100644
index 000000000..9354af38d
Binary files /dev/null and b/fastlane/metadata/android/et/images/phoneScreenshots/6.png differ
diff --git a/fastlane/metadata/android/et/images/phoneScreenshots/7.png b/fastlane/metadata/android/et/images/phoneScreenshots/7.png
new file mode 100644
index 000000000..896863d5b
Binary files /dev/null and b/fastlane/metadata/android/et/images/phoneScreenshots/7.png differ
diff --git a/lib/model/app/contributors.dart b/lib/model/app/contributors.dart
index 5d1a0d79d..a73d919b6 100644
--- a/lib/model/app/contributors.dart
+++ b/lib/model/app/contributors.dart
@@ -118,13 +118,13 @@ class Contributors {
     Contributor('தமிழ்நேரம்', 'anishprabu.t@gmail.com'),
     Contributor('bovirus', 'roberto.boriotti@canon.it'),
     Contributor('Максим Горпиніч', 'mgorpinic2005@gmail.com'),
+    Contributor('Priit Jõerüüt', 'hwlate@joeruut.com'),
     // Contributor('Femini', 'nizamismidov4@gmail.com'), // Azerbaijani
     // Contributor('Alvi Khan', 'aveenalvi@gmail.com'), // Bengali
     // Contributor('Htet Oo Hlaing', 'htetoh2006@outlook.com'), // Burmese
     // Contributor('Khant', 'khant@users.noreply.hosted.weblate.org'), // Burmese
     // Contributor('Grooty12', 'Rasmus@rosendahl-kaa.name'), // Danish
     // Contributor('Victor M', 'victormorita@tuta.io'), // Danish
-    // Contributor('Priit Jõerüüt', 'hwlate@joeruut.com'), // Estonian
     // Contributor('Åzze', 'laitinen.jere222@gmail.com'), // Finnish
     // Contributor('Olli', 'ollinen@ollit.dev'), // Finnish
     // Contributor('Idj', 'joneltmp+goahn@gmail.com'), // Hebrew
diff --git a/lib/widgets/aves_app.dart b/lib/widgets/aves_app.dart
index 6c38f9a65..fa7eec2b0 100644
--- a/lib/widgets/aves_app.dart
+++ b/lib/widgets/aves_app.dart
@@ -68,7 +68,6 @@ class AvesApp extends StatefulWidget {
     'bn', // Bengali
     'ckb', // Kurdish (Central)
     'da', // Danish
-    'et', // Estonian
     'fi', // Finnish
     'gl', // Galician
     'he', // Hebrew
diff --git a/lib/widgets/settings/language/locales.dart b/lib/widgets/settings/language/locales.dart
index 335b0ffb2..cbcfd9720 100644
--- a/lib/widgets/settings/language/locales.dart
+++ b/lib/widgets/settings/language/locales.dart
@@ -13,6 +13,7 @@ class SupportedLocales {
     'en': 'English',
     'en_Shaw': '𐑦𐑙𐑜𐑤𐑦𐑖 (𐑖𐑱𐑝𐑰𐑩𐑯)',
     'es': 'Español (México)',
+    'et': 'Eesti',
     'eu': 'Euskara',
     'fa': 'فارسی',
     'fr': 'Français',