diff --git a/src/bootstrap.tsx b/src/bootstrap.tsx
index d0c8ff3ee..3af638abf 100644
--- a/src/bootstrap.tsx
+++ b/src/bootstrap.tsx
@@ -769,6 +769,7 @@ const renderApp = async () => {
               <ConfigProvider
                 locale={getConfigLang(i18n.language)}
                 theme={{
+                  cssVar: true,
                   token: {
                     colorPrimary: Color(style['--primaryColor']).isLight() ?
                       Color(style['--primaryColor']).darken(0.5).hex() :
diff --git a/src/components/EditFeatureDrawer/EditFeatureGeometryToolbar/index.less b/src/components/EditFeatureDrawer/EditFeatureGeometryToolbar/index.less
index adb9f3ef4..18cebe11b 100644
--- a/src/components/EditFeatureDrawer/EditFeatureGeometryToolbar/index.less
+++ b/src/components/EditFeatureDrawer/EditFeatureGeometryToolbar/index.less
@@ -3,13 +3,15 @@
   left: -45px;
   top: 50%;
   transform: translateY(-50%);
-  button {
-      background: var(--secondaryColor);
-      border-color: var(--secondaryColor);
 
-      &:hover {
-        background: var(--ant-primary-color-hover);
-        border-color: var(--ant-primary-color-hover);
-      }
+  .ant-btn-variant-solid.react-geo-togglebutton {
+    background: var(--secondaryColor);
+  }
+
+  .ant-btn-variant-solid {
+    &:disabled {
+      background: #f5f5f5;
+      border-color: #d9d9d9
     }
+  }
 }
diff --git a/src/components/EditFeatureDrawer/EditFeatureGeometryToolbar/index.tsx b/src/components/EditFeatureDrawer/EditFeatureGeometryToolbar/index.tsx
index f26484fbe..ef45699ec 100644
--- a/src/components/EditFeatureDrawer/EditFeatureGeometryToolbar/index.tsx
+++ b/src/components/EditFeatureDrawer/EditFeatureGeometryToolbar/index.tsx
@@ -77,6 +77,7 @@ export const EditFeatureGeometryToolbar: React.FC<EditFeatureGeometryToolbarProp
 
   const [editLayer, setEditLayer] = useState<OlLayerVector<OlSourceVector>>();
   const [, setRevision] = useState<number>(0);
+  const [selected, setSelected] = useState<string | undefined>(undefined);
 
   const gjFormat = useMemo(() => new OlFormatGeoJson(), []);
 
@@ -104,8 +105,8 @@ export const EditFeatureGeometryToolbar: React.FC<EditFeatureGeometryToolbarProp
     if (isModified && !formDirty) {
       dispatch(setFormDirty(true));
     }
-  // we only want to change formDirty state when the editHistory changes
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+    // we only want to change formDirty state when the editHistory changes
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [dispatch, editHistory.current.past]);
 
   useEffect(() => {
@@ -221,10 +222,16 @@ export const EditFeatureGeometryToolbar: React.FC<EditFeatureGeometryToolbarProp
         className="geometry-edit-tb"
         alignment="vertical"
       >
-        <ToggleGroup>
+        <ToggleGroup
+          selected={selected}
+          onChange={(_evt: any, value: string | undefined) => {
+            setSelected(value);
+          }}
+        >
           {
             allowedEditMode.includes('CREATE') ?
               <DrawButton
+                value="create"
                 icon={
                   <FontAwesomeIcon icon={faPencil} />
                 }
@@ -243,6 +250,7 @@ export const EditFeatureGeometryToolbar: React.FC<EditFeatureGeometryToolbarProp
           {
             allowedEditMode.includes('UPDATE') ?
               <ModifyButton
+                value="update"
                 icon={
                   <FontAwesomeIcon icon={faDrawPolygon} />
                 }
@@ -262,6 +270,7 @@ export const EditFeatureGeometryToolbar: React.FC<EditFeatureGeometryToolbarProp
           {
             allowedEditMode.includes('DELETE') ?
               <DeleteButton
+                value="delete"
                 icon={
                   <FontAwesomeIcon icon={faTrash} />
                 }