diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/__snapshots__/edit_layer_panel.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/__snapshots__/edit_layer_panel.test.tsx.snap
index 24f15674a05043..a2ad6fa62dce68 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/__snapshots__/edit_layer_panel.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/__snapshots__/edit_layer_panel.test.tsx.snap
@@ -101,9 +101,10 @@ exports[`EditLayerPanel is rendered 1`] = `
               "renderSourceSettingsEditor": [Function],
               "showJoinEditor": [Function],
               "supportsElasticsearchFilters": [Function],
+              "supportsFitToBounds": [Function],
             }
           }
-          supportsFitToBounds={false}
+          supportsFitToBounds={true}
         />
         <div>
           mockSourceSettings
@@ -120,6 +121,7 @@ exports[`EditLayerPanel is rendered 1`] = `
                 "renderSourceSettingsEditor": [Function],
                 "showJoinEditor": [Function],
                 "supportsElasticsearchFilters": [Function],
+                "supportsFitToBounds": [Function],
               }
             }
             layerDisplayName="layer 1"
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.test.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.test.tsx
index 5b6f9c2ffc8349..73e831724e78e2 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.test.tsx
@@ -76,6 +76,9 @@ const mockLayer = {
   hasErrors: () => {
     return false;
   },
+  supportsFitToBounds: () => {
+    return true;
+  },
 } as unknown as ILayer;
 
 const defaultProps = {
diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap
index 42618d099ffcfe..5beaf12029d2f5 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap
@@ -24,10 +24,11 @@ exports[`TOCEntry is rendered 1`] = `
           "isVisible": [Function],
           "renderLegendDetails": [Function],
           "showAtZoomLevel": [Function],
+          "supportsFitToBounds": [Function],
         }
       }
       openLayerSettings={[Function]}
-      supportsFitToBounds={false}
+      supportsFitToBounds={true}
     />
     <div
       className="mapTocEntry__layerIcons"
@@ -39,6 +40,13 @@ exports[`TOCEntry is rendered 1`] = `
         onClick={[Function]}
         title="Hide layer"
       />
+      <EuiButtonIcon
+        aria-label="Fit to data"
+        iconType="expand"
+        key="fitToBounds"
+        onClick={[Function]}
+        title="Fit to data"
+      />
       <EuiButtonIcon
         aria-label="Edit layer settings"
         iconType="pencil"
@@ -99,10 +107,11 @@ exports[`TOCEntry props Should shade background when not selected layer 1`] = `
           "isVisible": [Function],
           "renderLegendDetails": [Function],
           "showAtZoomLevel": [Function],
+          "supportsFitToBounds": [Function],
         }
       }
       openLayerSettings={[Function]}
-      supportsFitToBounds={false}
+      supportsFitToBounds={true}
     />
     <div
       className="mapTocEntry__layerIcons"
@@ -114,6 +123,13 @@ exports[`TOCEntry props Should shade background when not selected layer 1`] = `
         onClick={[Function]}
         title="Hide layer"
       />
+      <EuiButtonIcon
+        aria-label="Fit to data"
+        iconType="expand"
+        key="fitToBounds"
+        onClick={[Function]}
+        title="Fit to data"
+      />
       <EuiButtonIcon
         aria-label="Edit layer settings"
         iconType="pencil"
@@ -174,10 +190,11 @@ exports[`TOCEntry props Should shade background when selected layer 1`] = `
           "isVisible": [Function],
           "renderLegendDetails": [Function],
           "showAtZoomLevel": [Function],
+          "supportsFitToBounds": [Function],
         }
       }
       openLayerSettings={[Function]}
-      supportsFitToBounds={false}
+      supportsFitToBounds={true}
     />
     <div
       className="mapTocEntry__layerIcons"
@@ -189,6 +206,13 @@ exports[`TOCEntry props Should shade background when selected layer 1`] = `
         onClick={[Function]}
         title="Hide layer"
       />
+      <EuiButtonIcon
+        aria-label="Fit to data"
+        iconType="expand"
+        key="fitToBounds"
+        onClick={[Function]}
+        title="Fit to data"
+      />
       <EuiButtonIcon
         aria-label="Edit layer settings"
         iconType="pencil"
@@ -249,10 +273,11 @@ exports[`TOCEntry props isReadOnly 1`] = `
           "isVisible": [Function],
           "renderLegendDetails": [Function],
           "showAtZoomLevel": [Function],
+          "supportsFitToBounds": [Function],
         }
       }
       openLayerSettings={[Function]}
-      supportsFitToBounds={false}
+      supportsFitToBounds={true}
     />
     <div
       className="mapTocEntry__layerIcons"
@@ -264,6 +289,13 @@ exports[`TOCEntry props isReadOnly 1`] = `
         onClick={[Function]}
         title="Hide layer"
       />
+      <EuiButtonIcon
+        aria-label="Fit to data"
+        iconType="expand"
+        key="fitToBounds"
+        onClick={[Function]}
+        title="Fit to data"
+      />
     </div>
   </div>
   <span
@@ -309,10 +341,11 @@ exports[`TOCEntry props should display layer details when isLegendDetailsOpen is
           "isVisible": [Function],
           "renderLegendDetails": [Function],
           "showAtZoomLevel": [Function],
+          "supportsFitToBounds": [Function],
         }
       }
       openLayerSettings={[Function]}
-      supportsFitToBounds={false}
+      supportsFitToBounds={true}
     />
     <div
       className="mapTocEntry__layerIcons"
@@ -324,6 +357,13 @@ exports[`TOCEntry props should display layer details when isLegendDetailsOpen is
         onClick={[Function]}
         title="Hide layer"
       />
+      <EuiButtonIcon
+        aria-label="Fit to data"
+        iconType="expand"
+        key="fitToBounds"
+        onClick={[Function]}
+        title="Fit to data"
+      />
       <EuiButtonIcon
         aria-label="Edit layer settings"
         iconType="pencil"
diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.test.tsx b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.test.tsx
index 2676ca45969150..86f78389fe9a89 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.test.tsx
@@ -46,6 +46,9 @@ const mockLayer = {
   hasLegendDetails: () => {
     return true;
   },
+  supportsFitToBounds: () => {
+    return true;
+  },
 } as unknown as ILayer;
 
 const defaultProps = {