diff --git a/app/build.gradle b/app/build.gradle
index bed86433e..d6f193b47 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,6 +40,7 @@ dependencies {
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.jakewharton:butterknife:8.0.1'
     compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0'
+    compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     apt 'com.jakewharton:butterknife-compiler:8.0.1'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c9dafe240..e9b855d60 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -115,7 +115,8 @@
         </activity>
 
         <activity
-            android:name=".activities.EditActivity">
+            android:name=".activities.EditActivity"
+            android:label="@string/editor">
             <intent-filter>
                 <action android:name="action_nextgen_edit"/>
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
index fa82e43ca..f43178097 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
@@ -1,5 +1,17 @@
 package com.simplemobiletools.gallery.activities
 
-class EditActivity : SimpleActivity() {
+import android.os.Bundle
+import com.simplemobiletools.gallery.R
+import com.theartofdev.edmodo.cropper.CropImageView
+import kotlinx.android.synthetic.main.activity_edit.*
 
+class EditActivity : SimpleActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_edit)
+
+        crop_image_view.apply {
+            guidelines = CropImageView.Guidelines.OFF
+        }
+    }
 }
diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml
new file mode 100644
index 000000000..0a2338991
--- /dev/null
+++ b/app/src/main/res/layout/activity_edit.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/black">
+
+    <com.theartofdev.edmodo.cropper.CropImageView
+        android:id="@+id/crop_image_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</RelativeLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 952d61109..25e3a39d5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -31,6 +31,7 @@
     <string name="cancel">Abbrechen</string>
     <string name="set_as_wallpaper">Als Hintergrundbild setzen</string>
     <string name="set_as_wallpaper_failed">Setzen des Hintergrundbildes fehlgeschlagen</string>
+    <string name="editor">Editor</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 Ordner gelöscht</item>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 69499529f..aed54f4c2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -31,6 +31,7 @@
     <string name="cancel">Cancelar</string>
     <string name="set_as_wallpaper">Establecer como fondo de pantalla</string>
     <string name="set_as_wallpaper_failed">Error al establecer fondo de pantalla</string>
+    <string name="editor">Editor</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 carpeta eliminada</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8ab87c30c..74afb4d86 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -31,6 +31,7 @@
     <string name="cancel">Cancel</string>
     <string name="set_as_wallpaper">Set as Wallpaper</string>
     <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
+    <string name="editor">Editor</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 cartella eliminata</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c56006f95..9eaeaaded 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -31,6 +31,7 @@
     <string name="cancel">Cancel</string>
     <string name="set_as_wallpaper">Set as Wallpaper</string>
     <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
+    <string name="editor">Editor</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 フォルダーを削除しました</item>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 084cb2dc1..122e1db31 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -31,6 +31,7 @@
     <string name="cancel">Cancelar</string>
     <string name="set_as_wallpaper">Definir como fundo de ecrã</string>
     <string name="set_as_wallpaper_failed">Falha ao definir como fundo de ecrã</string>
+    <string name="editor">Editor</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 pasta eliminada</item>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 6d80191f2..9e11a9bc4 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -31,6 +31,7 @@
     <string name="cancel">Cancel</string>
     <string name="set_as_wallpaper">Set as Wallpaper</string>
     <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
+    <string name="editor">Editor</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 mapp borttagen</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c7b1e8c97..f9f120a78 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,7 @@
     <string name="cancel">Cancel</string>
     <string name="set_as_wallpaper">Set as Wallpaper</string>
     <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
+    <string name="editor">Editor</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 folder deleted</item>