--- a/src/pyams_gis/widget/templates/geoarea-input.pt	Thu Feb 15 16:35:05 2018 +0100
+++ b/src/pyams_gis/widget/templates/geoarea-input.pt	Mon Feb 19 10:41:53 2018 +0100
@@ -5,18 +5,18 @@
 		tal:attributes="class view/fieldset_class | default;
 						data-ams-plugin-pyams_gis-src extension:resource_path('pyams_gis:pyams_gis')"
 		data-ams-plugin-pyams_gis-async="false">
-		<div class="col-md-7 pull-right">
-			<button class="btn pull-right" tal:attributes="href string:#modal_dialog_${name}"
+		<div class="col-md-6 pull-right">
+			<button class="btn" tal:attributes="href string:#modal_dialog_${name}" data-toggle="modal">
+				<i class="fa fa-fw fa-lg fa-map-marker hint opaque align-base"
+				   data-ams-hint-gravity="se" data-ams-hint-offset="10"
+				   title="Select area from map" i18n:attributes="title"></i>
+			</button>
+			<button class="btn" tal:attributes="href string:#modal_dialog_${name}"
 				data-ams-click-handler="PyAMS_GIS.area.clear">
 				<i class="fa fa-fw fa-lg fa-trash hint opaque align-base"
 				   data-ams-hint-gravity="se" data-ams-hint-offset="10"
 				   title="Remove area settings" i18n:attributes="title"></i>
 			</button>
-			<button class="btn pull-right" tal:attributes="href string:#modal_dialog_${name}" data-toggle="modal">
-				<i class="fa fa-fw fa-lg fa-map-marker hint opaque align-base"
-				   data-ams-hint-gravity="se" data-ams-hint-offset="10"
-				   title="Select area from map" i18n:attributes="title"></i>
-			</button>
 			<div id="modal_dialog" class="modal fade"
 				 tal:attributes="id string:modal_dialog_${name}"
 				 data-ams-events-handlers='{"show.bs.modal": "PyAMS_GIS.area.init"}'>

--- a/src/pyams_gis/widget/templates/geopoint-input.pt	Thu Feb 15 16:35:05 2018 +0100
+++ b/src/pyams_gis/widget/templates/geopoint-input.pt	Mon Feb 19 10:41:53 2018 +0100
@@ -6,17 +6,17 @@
 						data-ams-plugin-pyams_gis-src extension:resource_path('pyams_gis:pyams_gis');"
 		data-ams-plugin-pyams_gis-async="false">
 		<div class="col-md-7 pull-right">
+			<button class="btn" tal:attributes="href string:#modal_dialog_${name}" data-toggle="modal">
+				<i class="fa fa-fw fa-lg fa-map-marker hint opaque align-base"
+				   data-ams-hint-gravity="se" data-ams-hint-offset="10"
+				   title="Select location from map" i18n:attributes="title"></i>
+			</button>
 			<button class="btn" tal:attributes="href string:#modal_dialog_${name}"
 				data-ams-click-handler="PyAMS_GIS.position.clear">
 				<i class="fa fa-fw fa-lg fa-trash hint opaque align-base"
 				   data-ams-hint-gravity="se" data-ams-hint-offset="10"
 				   title="Remove position settings" i18n:attributes="title"></i>
 			</button>
-			<button class="btn" tal:attributes="href string:#modal_dialog_${name}" data-toggle="modal">
-				<i class="fa fa-fw fa-lg fa-map-marker hint opaque align-base"
-				   data-ams-hint-gravity="se" data-ams-hint-offset="10"
-				   title="Select location from map" i18n:attributes="title"></i>
-			</button>
 			<div id="modal_dialog" class="modal fade"
 				 tal:attributes="id string:modal_dialog_${name}"
 				 data-ams-events-handlers='{"show.bs.modal": "PyAMS_GIS.position.init"}'>