diff --git a/README.md b/README.md
index 7cc5f669..0626b7d3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![logo](/images/icon_small.png)
+![logo](/assets/icon_small.png)
# SimpleEmail
An [Free Software][free-software], minimalistic and privacy friendly email app for Android.
@@ -54,10 +54,10 @@ service with a low priority status bar notification to make sure you'll never mi
## Screenshots
-[](metadata/en-US/phoneScreenshots/05_screenshot.png)
-[](metadata/en-US/phoneScreenshots/08_screenshot.png)
+[](metadata/en-US/images/phoneScreenshots/05_screenshot.png)
+[](metadata/en-US/images/phoneScreenshots/08_screenshot.png)
-Please see more [here](/metadata/en-US/phoneScreenshots/) or in [FDroid store][fdroid]
+Please see more [here](/metadata/en-US/images/phoneScreenshots/) or in [FDroid store][fdroid]
## Secure
diff --git a/images/icon.png b/assets/icon.png
similarity index 100%
rename from images/icon.png
rename to assets/icon.png
diff --git a/images/icon.svg b/assets/icon.svg
similarity index 100%
rename from images/icon.svg
rename to assets/icon.svg
diff --git a/images/icon_round.png b/assets/icon_round.png
similarity index 100%
rename from images/icon_round.png
rename to assets/icon_round.png
diff --git a/images/icon_round_small.png b/assets/icon_round_small.png
similarity index 100%
rename from images/icon_round_small.png
rename to assets/icon_round_small.png
diff --git a/images/icon_small.png b/assets/icon_small.png
similarity index 100%
rename from images/icon_small.png
rename to assets/icon_small.png
diff --git a/images/simple-email.svg b/assets/simple-email.svg
similarity index 100%
rename from images/simple-email.svg
rename to assets/simple-email.svg
diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt
index d32be039..319a9d77 100644
--- a/metadata/en-US/full_description.txt
+++ b/metadata/en-US/full_description.txt
@@ -1,11 +1,14 @@
-SimpleEmail is Free Software, minimalistic and privacy friendly email app.
+An Free Software, minimalistic and privacy friendly email app.
+'''Highlights'''
* Easy navigation
* No unnecessary settings
* No bells and whistles
+* Privacy friendly
* Simple design
-SimpleEmail starts a foreground service with a low priority status bar notification to make sure you'll never miss new email.
+SimpleEmail is minimalistic by design, so you can concentrate on reading and writing messages, it starts a foreground
+service with a low priority status bar notification to make sure you'll never miss new email.
This project has been forked from [[eu.faircode.email]].
diff --git a/metadata/en-US/images/icon.png b/metadata/en-US/images/icon.png
new file mode 100644
index 00000000..eb7c3726
Binary files /dev/null and b/metadata/en-US/images/icon.png differ
diff --git a/metadata/en-US/phoneScreenshots/01_screenshot.png b/metadata/en-US/images/phoneScreenshots/01_screenshot.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/01_screenshot.png
rename to metadata/en-US/images/phoneScreenshots/01_screenshot.png
diff --git a/metadata/en-US/phoneScreenshots/02_screenshot.png b/metadata/en-US/images/phoneScreenshots/02_screenshot.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/02_screenshot.png
rename to metadata/en-US/images/phoneScreenshots/02_screenshot.png
diff --git a/metadata/en-US/phoneScreenshots/03_screenshot.png b/metadata/en-US/images/phoneScreenshots/03_screenshot.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/03_screenshot.png
rename to metadata/en-US/images/phoneScreenshots/03_screenshot.png
diff --git a/metadata/en-US/phoneScreenshots/04_screenshot.png b/metadata/en-US/images/phoneScreenshots/04_screenshot.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/04_screenshot.png
rename to metadata/en-US/images/phoneScreenshots/04_screenshot.png
diff --git a/metadata/en-US/phoneScreenshots/05_screenshot.png b/metadata/en-US/images/phoneScreenshots/05_screenshot.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/05_screenshot.png
rename to metadata/en-US/images/phoneScreenshots/05_screenshot.png
diff --git a/metadata/en-US/phoneScreenshots/06_screenshot.png b/metadata/en-US/images/phoneScreenshots/06_screenshot.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/06_screenshot.png
rename to metadata/en-US/images/phoneScreenshots/06_screenshot.png
diff --git a/metadata/en-US/phoneScreenshots/07_screenshot.png b/metadata/en-US/images/phoneScreenshots/07_screenshot.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/07_screenshot.png
rename to metadata/en-US/images/phoneScreenshots/07_screenshot.png
diff --git a/metadata/en-US/phoneScreenshots/08_screenshot.png b/metadata/en-US/images/phoneScreenshots/08_screenshot.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/08_screenshot.png
rename to metadata/en-US/images/phoneScreenshots/08_screenshot.png
diff --git a/metadata/en-US/phoneScreenshots/09_screenshot.png b/metadata/en-US/images/phoneScreenshots/09_screenshot.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/09_screenshot.png
rename to metadata/en-US/images/phoneScreenshots/09_screenshot.png
diff --git a/metadata/en-US/phoneScreenshots/10_screenshot.png b/metadata/en-US/images/phoneScreenshots/10_screenshot.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/10_screenshot.png
rename to metadata/en-US/images/phoneScreenshots/10_screenshot.png
diff --git a/metadata/en-US/phoneScreenshots/11_screenshot.png b/metadata/en-US/images/phoneScreenshots/11_screenshot.png
similarity index 100%
rename from metadata/en-US/phoneScreenshots/11_screenshot.png
rename to metadata/en-US/images/phoneScreenshots/11_screenshot.png
diff --git a/metadata/es-ES/full_description.txt b/metadata/es-ES/full_description.txt
index 580c6e6f..6b5964f4 100644
--- a/metadata/es-ES/full_description.txt
+++ b/metadata/es-ES/full_description.txt
@@ -1,11 +1,15 @@
-SimpleEmail es una aplicación de correo amigable con la privacidad, minimalista y Software Libre.
+Una aplicación de correo amigable con la privacidad, minimalista y Software Libre.
+
+'''Destacado'''
* Fácil navegación
* No hay configuraciones innecesarias
-* No hay campanas y silbidos.
+* No hay campanas y silbidos
+* Amigable con la privacidad
* Diseño simple
-SimpleEmail inicia un servicio de primer plano con una notificación de barra de estado de baja prioridad para asegurarse de que nunca perderá un nuevo correo electrónico.
+SimpleEmail es minimalista por diseño, por lo que puede concentrarse en leer y escribir mensajes,
+Inicia un servicio con una notificación de baja prioridad para asegurarse de que nunca perderá un nuevo correo electrónico.
Este proyecto es un fork de [[eu.faircode.email]].