diff --git a/packages/geo/src/lib/measure/measurer/measurer.component.html b/packages/geo/src/lib/measure/measurer/measurer.component.html
index cf81b0e91f..dbef156258 100644
--- a/packages/geo/src/lib/measure/measurer/measurer.component.html
+++ b/packages/geo/src/lib/measure/measurer/measurer.component.html
@@ -55,23 +55,23 @@
     </igo-measurer-item>
   </ng-container>
 
-  <mat-divider></mat-divider>
+  <div class="measure-store-buttons">
+    <button
+      mat-icon-button
+      [matTooltip]="'igo.geo.measure.actionbar.calculate.tooltip' | translate"
+      [disabled]="(selectedFeatures$ | async).length === 0"
+      (click)="onCalculateClick()">
+      <mat-icon>playlist_add</mat-icon>
+    </button>
 
-  <button
-    mat-icon-button
-    [matTooltip]="'igo.geo.measure.actionbar.calculate.tooltip' | translate"
-    [disabled]="(selectedFeatures$ | async).length === 0"
-    (click)="onCalculateClick()">
-    <mat-icon>playlist_add</mat-icon>
-  </button>
-
-  <button
-    mat-icon-button
-    [matTooltip]="'igo.geo.measure.actionbar.delete.tooltip' | translate"
-    [disabled]="(selectedFeatures$ | async).length === 0"
-    (click)="onDeleteClick()">
-    <mat-icon>delete</mat-icon>
-  </button>
+    <button
+      mat-icon-button
+      [matTooltip]="'igo.geo.measure.actionbar.delete.tooltip' | translate"
+      [disabled]="(selectedFeatures$ | async).length === 0"
+      (click)="onDeleteClick()">
+      <mat-icon>delete</mat-icon>
+    </button>
+  </div>
 
   <igo-entity-table
     #table
diff --git a/packages/geo/src/lib/measure/measurer/measurer.component.scss b/packages/geo/src/lib/measure/measurer/measurer.component.scss
index 384b76425d..2e52775e82 100644
--- a/packages/geo/src/lib/measure/measurer/measurer.component.scss
+++ b/packages/geo/src/lib/measure/measurer/measurer.component.scss
@@ -23,8 +23,12 @@ $slide-toggle-width: 60px;
   }
 }
 
-mat-divider {
-  width: 160px;
-  text-align: center;
-  margin: 10px auto;
+.measure-store-buttons {
+  width: 100%;
+  border-top: 1px solid #ddd;
+  border-bottom: 1px solid #ddd;
+}
+
+.measure-store-buttons button:first-of-type {
+  margin-left: 14px; 
 }
diff --git a/packages/geo/src/lib/measure/measurer/measurer.component.ts b/packages/geo/src/lib/measure/measurer/measurer.component.ts
index c400aa3d41..52e0d3e96a 100644
--- a/packages/geo/src/lib/measure/measurer/measurer.component.ts
+++ b/packages/geo/src/lib/measure/measurer/measurer.component.ts
@@ -73,6 +73,7 @@ export class MeasurerComponent implements OnInit, OnDestroy {
   public tableTemplate: EntityTableTemplate = {
     selection: true,
     selectMany: true,
+    selectionCheckbox: true,
     sort: true,
     columns: [
       {
diff --git a/packages/geo/src/lib/measure/measurer/measurer.module.ts b/packages/geo/src/lib/measure/measurer/measurer.module.ts
index e2e7025b7d..99cd6ace44 100644
--- a/packages/geo/src/lib/measure/measurer/measurer.module.ts
+++ b/packages/geo/src/lib/measure/measurer/measurer.module.ts
@@ -6,7 +6,6 @@ import {
   MatButtonToggleModule,
   MatIconModule,
   MatTooltipModule,
-  MatDividerModule,
   MatFormFieldModule,
   MatInputModule,
   MatSelectModule,
@@ -31,7 +30,6 @@ import { MeasurerDialogComponent } from './measurer-dialog.component';
     MatButtonToggleModule,
     MatIconModule,
     MatTooltipModule,
-    MatDividerModule,
     MatFormFieldModule,
     MatInputModule,
     MatSelectModule,