diff --git a/.babelrc b/.babelrc
index a14d6b62..368a96df 100644
--- a/.babelrc
+++ b/.babelrc
@@ -13,7 +13,7 @@
       "@babel/plugin-syntax-jsx",
       "@babel/plugin-transform-modules-commonjs",
       ["@babel/plugin-transform-runtime", { "regenerator": true }],
-      "@babel/plugin-proposal-class-properties",
-      "@babel/plugin-proposal-object-rest-spread"
+      "@babel/plugin-transform-class-properties",
+      "@babel/plugin-transform-object-rest-spread"
     ]
   }
diff --git a/babel.config.js b/babel.config.js
index fa274ac8..909f5b18 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -10,8 +10,8 @@ module.exports = {
     require('@babel/preset-typescript'),
   ],
   plugins: [
-    require('@babel/plugin-proposal-class-properties'),
-    require('@babel/plugin-proposal-object-rest-spread'),
+    require('@babel/plugin-transform-class-properties'),
+    require('@babel/plugin-transform-object-rest-spread'),
     ['@babel/plugin-transform-modules-commonjs', { allowTopLevelThis: true }],
     [require('@babel/plugin-transform-runtime'), { regenerator: true }],
   ],
diff --git a/cypress/e2e/documentsLayer.cy.js b/cypress/e2e/documentsLayer.cy.js
index 79059d16..2355f468 100644
--- a/cypress/e2e/documentsLayer.cy.js
+++ b/cypress/e2e/documentsLayer.cy.js
@@ -36,9 +36,9 @@ describe('Documents layer', () => {
     cy.get(`button[testSubj="styleTab"]`).click();
     cy.contains('Fill color').click();
     cy.get(`button[aria-label="Select #E7664C as the color"]`).click();
-    cy.contains('Border color').click();
+    cy.wait(1000).contains('Border color').click();
     cy.get(`button[aria-label="Select #DA8B45 as the color"]`).click();
-    cy.get(`button[testSubj="settingsTab"]`).click();
+    cy.wait(1000).get(`button[testSubj="settingsTab"]`).click();
     cy.get('[name="layerName"]').clear().type('Documents layer 1');
     cy.get(`button[data-test-subj="updateButton"]`).click();
     cy.get('[data-test-subj="layerControlPanel"]').should('contain', 'Documents layer 1');
diff --git a/public/components/__snapshots__/vector_upload_options.test.tsx.snap b/public/components/__snapshots__/vector_upload_options.test.tsx.snap
index 0c36eed6..b2cfd5f8 100644
--- a/public/components/__snapshots__/vector_upload_options.test.tsx.snap
+++ b/public/components/__snapshots__/vector_upload_options.test.tsx.snap
@@ -75,7 +75,11 @@ Object {
                           viewBox="0 0 16 16"
                           width="16"
                           xmlns="http://www.w3.org/2000/svg"
-                        />
+                        >
+                          <path
+                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                          />
+                        </svg>
                         <div
                           class="euiFilePicker__promptText"
                         >
@@ -166,7 +170,7 @@ Object {
                   Map name guidleines:
                   <ul>
                     <li>
-                       Map name prefix must contain 1-250 characters. 
+                       Map name prefix must contain 1-250 characters.
                     </li>
                     <li>
                        Map name prefix must start with a-z.
@@ -294,7 +298,11 @@ Object {
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
-                      />
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
                       <div
                         class="euiFilePicker__promptText"
                       >
@@ -385,7 +393,7 @@ Object {
                 Map name guidleines:
                 <ul>
                   <li>
-                     Map name prefix must contain 1-250 characters. 
+                     Map name prefix must contain 1-250 characters.
                   </li>
                   <li>
                      Map name prefix must start with a-z.
diff --git a/public/components/toolbar/spatial_filter/__snapshots__/filter-by_shape.test.tsx.snap b/public/components/toolbar/spatial_filter/__snapshots__/filter-by_shape.test.tsx.snap
index fc92ba44..c6ba9cc3 100644
--- a/public/components/toolbar/spatial_filter/__snapshots__/filter-by_shape.test.tsx.snap
+++ b/public/components/toolbar/spatial_filter/__snapshots__/filter-by_shape.test.tsx.snap
@@ -73,7 +73,11 @@ exports[`render polygon renders filter by polygon option 1`] = `
           viewBox="0 0 16 16"
           width={16}
           xmlns="http://www.w3.org/2000/svg"
-        />
+        >
+          <path
+            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+          />
+        </svg>
       </button>
     </div>
   </div>
diff --git a/public/components/vector_upload_options.tsx b/public/components/vector_upload_options.tsx
index 9cb34aac..89ce3d59 100644
--- a/public/components/vector_upload_options.tsx
+++ b/public/components/vector_upload_options.tsx
@@ -373,7 +373,7 @@ const VectorUploadOptions = (props: RegionMapOptionsProps) => {
         <EuiText size="xs" color="subdued" aria-label="map-name-guidelines-text">
           Map name guidleines:
           <ul>
-            <li> Map name prefix must contain 1-250 characters. </li>
+            <li> Map name prefix must contain 1-250 characters.</li>
             <li> Map name prefix must start with a-z.</li>
             <li> Valid characters are a-z, 0-9, - and _ .</li>
             <li>