diff --git a/webapp/components/buttons/ButtonNext.js b/webapp/components/buttons/ButtonNext.js
index 2b4627cebd..9ca7a0972e 100644
--- a/webapp/components/buttons/ButtonNext.js
+++ b/webapp/components/buttons/ButtonNext.js
@@ -4,7 +4,7 @@ import { Button } from './Button'
 
 export const ButtonNext = (props) => {
   const { label = 'common.next' } = props
-  return <Button {...props} iconClassName="icon-arrow-right icon-12px icon-left" label={label} />
+  return <Button {...props} iconClassName="icon-arrow-right icon-12px" label={label} />
 }
 
 ButtonNext.propTypes = {
diff --git a/webapp/components/buttons/ButtonPrevious.js b/webapp/components/buttons/ButtonPrevious.js
index 9d69c52aa6..d6dfbc4990 100644
--- a/webapp/components/buttons/ButtonPrevious.js
+++ b/webapp/components/buttons/ButtonPrevious.js
@@ -4,7 +4,7 @@ import { Button } from './Button'
 
 export const ButtonPrevious = (props) => {
   const { label = 'common.previous' } = props
-  return <Button {...props} iconClassName="icon-arrow-left icon-12px icon-left" label={label} />
+  return <Button {...props} iconClassName="icon-arrow-left icon-12px" label={label} />
 }
 
 ButtonPrevious.propTypes = {
diff --git a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePopUp.scss b/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePopUp.scss
index a9f965a2da..577ae3da03 100644
--- a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePopUp.scss
+++ b/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePopUp.scss
@@ -16,7 +16,7 @@
 
     button {
       margin: 0 0.4rem;
-      padding: 0.6rem 0.6rem;
+      padding: 0.4rem 0.6rem;
       white-space: nowrap;
     }
 
diff --git a/webapp/views/App/views/Data/MapView/MapView.js b/webapp/views/App/views/Data/MapView/MapView.js
index 3498e875f0..b4755727a2 100644
--- a/webapp/views/App/views/Data/MapView/MapView.js
+++ b/webapp/views/App/views/Data/MapView/MapView.js
@@ -12,7 +12,6 @@ import { useSurvey } from '@webapp/store/survey'
 
 import { useRandomColors } from '@webapp/components/hooks/useRandomColors'
 import { Map } from '@webapp/components/Map'
-import SurveyDefsLoader from '@webapp/components/survey/SurveyDefsLoader'
 
 import { SamplingPointDataLayer } from './SamplingPointDataLayer'
 import { CoordinateAttributeDataLayer } from './CoordinateAttributeDataLayer'
@@ -106,8 +105,4 @@ const MapWrapper = () => {
   )
 }
 
-export const MapView = () => (
-  <SurveyDefsLoader draft={false} requirePublish>
-    <MapWrapper />
-  </SurveyDefsLoader>
-)
+export const MapView = () => <MapWrapper />
diff --git a/webapp/views/App/views/Data/MapView/MapView.scss b/webapp/views/App/views/Data/MapView/MapView.scss
index 6625928ded..756589fa6c 100644
--- a/webapp/views/App/views/Data/MapView/MapView.scss
+++ b/webapp/views/App/views/Data/MapView/MapView.scss
@@ -30,6 +30,11 @@
 
           button {
             margin: 0;
+            height: 2rem;
+          }
+
+          .new-record-btn {
+            width: 20rem;
           }
         }
       }
diff --git a/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/SamplingPointDataItemPopup.js b/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/SamplingPointDataItemPopup.js
index 71ec38977a..195f3afe0d 100644
--- a/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/SamplingPointDataItemPopup.js
+++ b/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/SamplingPointDataItemPopup.js
@@ -83,6 +83,7 @@ ${itemCodes
         )}
         {canCreateRecord && !recordUuid && (
           <ButtonAdd
+            className="new-record-btn"
             label="mapView.createRecord"
             showLabel
             onClick={() => createRecordFromSamplingPointDataItem({ itemUuid, callback: onRecordCreate })}