diff --git a/package.json b/package.json
index be1ca4f..b830b60 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-widget-geolocation",
-  "version": "5.1.7",
+  "version": "5.2.0",
   "description": "volto-widget-geolocation: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
diff --git a/src/components/manage/Widgets/GeolocationWidget.jsx b/src/components/manage/Widgets/GeolocationWidget.jsx
index 2d732a1..77cae3d 100644
--- a/src/components/manage/Widgets/GeolocationWidget.jsx
+++ b/src/components/manage/Widgets/GeolocationWidget.jsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { Grid, Button, Segment } from 'semantic-ui-react';
+import { Grid, Button } from 'semantic-ui-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { useSelector, useDispatch } from 'react-redux';
 import { FormFieldWrapper, Icon, SidebarPopup } from '@plone/volto/components';
@@ -199,29 +199,32 @@ const GeolocationWidget = (props) => {
                 />
               </Grid.Column>
             </Grid.Row>
-            <Grid.Row stretched>
-              <Segment attached className="actions">
-                <Button
-                  size="mini"
-                  basic
-                  primary
-                  floated="left"
-                  onClick={(event) => {
-                    setPopup(true);
-                    event.preventDefault();
-                  }}
-                >
-                  <Icon
-                    name={zoomSVG}
-                    size="30px"
-                    className="addSVG"
-                    title={intl.formatMessage(messages.search)}
-                  />
-                </Button>
-                <label className={'popup-label'}>
-                  {intl.formatMessage(messages.search)}
-                </label>
-              </Segment>
+            <Grid.Row stretched style={{ padding: '10px 0' }}>
+              <Grid.Column width="4">
+                <div className="wrapper">
+                  <label htmlFor="advanced-search-button ">
+                    {intl.formatMessage(messages.search)}
+                  </label>
+                </div>
+              </Grid.Column>
+              <Grid.Column width="8" className="search-grid-column">
+                <div class="add-item-button-wrapper">
+                  <Button
+                    className="icon advanced-search-button"
+                    onClick={(event) => {
+                      setPopup(true);
+                      event.preventDefault();
+                    }}
+                  >
+                    <Icon
+                      name={zoomSVG}
+                      size="16px"
+                      title={intl.formatMessage(messages.search)}
+                    />
+                    Search
+                  </Button>
+                </div>
+              </Grid.Column>
               <SidebarPopup open={isOpenPopup}>
                 <SearchGeoName
                   id={id}
diff --git a/src/components/manage/Widgets/ListResults.jsx b/src/components/manage/Widgets/ListResults.jsx
index 8234f98..4ce82bc 100644
--- a/src/components/manage/Widgets/ListResults.jsx
+++ b/src/components/manage/Widgets/ListResults.jsx
@@ -96,7 +96,7 @@ const ListResults = ({
                       <a
                         href={`https://www.geonames.org/${item.geonameId}`}
                         target="_blank"
-                        rel="noreferrer"
+                        rel="noreferrer noopener"
                       >
                         {item.geonameId}
                       </a>
diff --git a/src/components/manage/Widgets/public.less b/src/components/manage/Widgets/public.less
index b0de411..659a73f 100644
--- a/src/components/manage/Widgets/public.less
+++ b/src/components/manage/Widgets/public.less
@@ -3,12 +3,6 @@
   vertical-align: sub;
 }
 
-.ui.attached.segment.actions {
-  display: flex;
-  align-items: center;
-  gap: 1rem;
-}
-
 // Temporary style fix
 .geo-field-wrapper {
   > .ui.grid .row .twelve.column {