diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
index edefe1e9b..1917cb051 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@@ -80,6 +80,7 @@ class EventActivity : SimpleActivity() {
         updateCalDAVCalendar()
         updateLocation()
 
+        event_location_button.setOnClickListener { setupLocation() }
         event_start_date.setOnClickListener { setupStartDate() }
         event_start_time.setOnClickListener { setupStartTime() }
         event_end_date.setOnClickListener { setupEndDate() }
@@ -650,6 +651,10 @@ class EventActivity : SimpleActivity() {
         event_end_time.setTextColor(textColor)
     }
 
+    private fun setupLocation() {
+
+    }
+
     @SuppressLint("NewApi")
     private fun setupStartDate() {
         hideKeyboard()
@@ -750,5 +755,6 @@ class EventActivity : SimpleActivity() {
         event_reminder_image.applyColorFilter(textColor)
         event_type_image.applyColorFilter(textColor)
         event_caldav_calendar_image.applyColorFilter(textColor)
+        event_location_button.applyColorFilter(config.primaryColor)
     }
 }
diff --git a/app/src/main/res/drawable-hdpi/ic_map.png b/app/src/main/res/drawable-hdpi/ic_map.png
new file mode 100644
index 000000000..272d185ad
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_map.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_map.png b/app/src/main/res/drawable-xhdpi/ic_map.png
new file mode 100644
index 000000000..0c38abeec
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_map.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_map.png b/app/src/main/res/drawable-xxhdpi/ic_map.png
new file mode 100644
index 000000000..47db92938
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_map.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_map.png b/app/src/main/res/drawable-xxxhdpi/ic_map.png
new file mode 100644
index 000000000..11a1cdb4d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_map.png differ
diff --git a/app/src/main/res/layout/activity_event.xml b/app/src/main/res/layout/activity_event.xml
index ebb196339..bb5890335 100644
--- a/app/src/main/res/layout/activity_event.xml
+++ b/app/src/main/res/layout/activity_event.xml
@@ -14,7 +14,7 @@
 
         <com.simplemobiletools.commons.views.MyEditText
             android:id="@+id/event_title"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/activity_margin"
             android:layout_marginRight="@dimen/activity_margin"
@@ -29,12 +29,12 @@
 
         <com.simplemobiletools.commons.views.MyEditText
             android:id="@+id/event_location"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/event_title"
             android:layout_marginLeft="@dimen/activity_margin"
-            android:layout_marginRight="@dimen/activity_margin"
             android:layout_marginTop="@dimen/activity_margin"
+            android:layout_toLeftOf="@+id/event_location_button"
             android:hint="@string/location"
             android:inputType="textCapWords"
             android:maxLength="80"
@@ -43,9 +43,24 @@
             android:textCursorDrawable="@null"
             android:textSize="@dimen/day_text_size"/>
 
+        <ImageView
+            android:id="@+id/event_location_button"
+            style="@style/MyBorderlessBackgroundStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignBottom="@+id/event_location"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@+id/event_location"
+            android:layout_marginEnd="@dimen/activity_margin"
+            android:layout_marginRight="@dimen/activity_margin"
+            android:paddingLeft="@dimen/medium_margin"
+            android:paddingRight="@dimen/medium_margin"
+            android:src="@drawable/ic_map"/>
+
         <com.simplemobiletools.commons.views.MyEditText
             android:id="@+id/event_description"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/event_location"
             android:layout_marginLeft="@dimen/activity_margin"