diff --git a/qt-ui/locationInformation.ui b/qt-ui/locationInformation.ui
index 8b7992439..30034a016 100644
--- a/qt-ui/locationInformation.ui
+++ b/qt-ui/locationInformation.ui
@@ -34,36 +34,6 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QLineEdit" name="diveSiteName"/>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Coordinates</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QLineEdit" name="diveSiteCoordinates"/>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Description</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QLineEdit" name="diveSiteDescription"/>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="label_4">
-     <property name="text">
-      <string>Notes</string>
-     </property>
-    </widget>
-   </item>
    <item row="5" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -77,7 +47,48 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="1" rowspan="2">
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="diveSiteCoordinates"/>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Description</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Notes</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Coordinates</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QToolButton" name="btnPickCoordinates">
+     <property name="text">
+      <string>Pick on the globe</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../subsurface.qrc">
+       <normaloff>:/geocode</normaloff>:/geocode</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="2">
+    <widget class="QLineEdit" name="diveSiteName"/>
+   </item>
+   <item row="3" column="1" colspan="2">
+    <widget class="QLineEdit" name="diveSiteDescription"/>
+   </item>
+   <item row="4" column="1" rowspan="2" colspan="2">
     <widget class="QPlainTextEdit" name="diveSiteNotes"/>
    </item>
   </layout>
@@ -90,6 +101,8 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../subsurface.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/qt-ui/locationinformation.cpp b/qt-ui/locationinformation.cpp
index 48d5035ab..aec20f936 100644
--- a/qt-ui/locationinformation.cpp
+++ b/qt-ui/locationinformation.cpp
@@ -89,6 +89,11 @@ void LocationInformationWidget::acceptChanges()
 	emit coordinatesChanged();
 }
 
+void LocationInformationWidget::on_btnPickCoordinates_clicked()
+{
+	qDebug() << "Sim, Deve haver o perdao";
+}
+
 void LocationInformationWidget::rejectChanges()
 {
 	resetState();
diff --git a/qt-ui/locationinformation.h b/qt-ui/locationinformation.h
index 3eff271c2..ef28ddafd 100644
--- a/qt-ui/locationinformation.h
+++ b/qt-ui/locationinformation.h
@@ -24,6 +24,7 @@ public slots:
 	void on_diveSiteDescription_textChanged(const QString& text);
 	void on_diveSiteName_textChanged(const QString& text);
 	void on_diveSiteNotes_textChanged();
+	void on_btnPickCoordinates_clicked();
 private slots:
 	void updateLabels();
 signals: