diff --git a/packages/geo/src/lib/layer/layer-item/layer-item.component.html b/packages/geo/src/lib/layer/layer-item/layer-item.component.html
index a295f7b5e7..9b1a641049 100644
--- a/packages/geo/src/lib/layer/layer-item/layer-item.component.html
+++ b/packages/geo/src/lib/layer/layer-item/layer-item.component.html
@@ -50,6 +50,7 @@ <h4 (click)="toggleLegendOnClick()" matLine class="igo-layer-title" [matTooltip]
 </button>
 
   <button *ngIf="!selectionMode"
+    class="actions-button"
     tooltip-position="below"
     matTooltipShowDelay="500"
     [matTooltip]= "'igo.geo.layer.moreOptions' | translate"
diff --git a/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.html b/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.html
index 031e07ccd8..a349023063 100644
--- a/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.html
+++ b/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.html
@@ -21,7 +21,7 @@
       <div [matTooltip]="sortAlpha ?
       ('igo.geo.layer.sortMapOrder' | translate) :
       ('igo.geo.layer.sortAlphabetically' | translate)" matTooltipShowDelay="500">
-        <button [color]="sortAlpha ? 'warn' : 'primary'" mat-icon-button (click)="toggleSortAlpha()">
+        <button class="sort-alpha" [color]="sortAlpha ? 'warn' : 'primary'" mat-icon-button (click)="toggleSortAlpha()">
           <mat-icon [svgIcon]="sortAlpha ? 'sort-ascending' : 'sort-alphabetical-ascending'"></mat-icon>
         </button>
       </div>
@@ -29,7 +29,7 @@
        <div [matTooltip]="onlyVisible ?
         ('igo.geo.layer.resetLayersList' | translate) :
         ('igo.geo.layer.subsetLayersListOnlyVisible' | translate)" matTooltipShowDelay="500">
-         <button mat-icon-button [disabled]="layersAreAllVisible && !onlyVisible"
+         <button class="only-visible" mat-icon-button [disabled]="layersAreAllVisible && !onlyVisible"
            [color]="onlyVisible ? 'warn' : 'primary'" (click)="toggleOnlyVisible()">
            <mat-icon
              matBadge
@@ -44,7 +44,7 @@
        <div [matTooltip]="selectionMode ?
         ('igo.geo.layer.deactivateSelectionMode' | translate) :
         ('igo.geo.layer.activateSelectionMode' | translate)" matTooltipShowDelay="500">
-         <button mat-icon-button
+         <button class="selection-mode" mat-icon-button
            color="primary" (click)="toggleSelectionMode()">
            <mat-icon [svgIcon]="selectionMode ? 'checkbox-multiple-marked-outline' : 'checkbox-multiple-blank-outline'"></mat-icon>
          </button>
diff --git a/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.scss b/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.scss
index c9bfbe4a48..2a781d1c70 100644
--- a/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.scss
+++ b/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.scss
@@ -2,3 +2,7 @@ mat-form-field.inputFilter {
   width: calc(100% - 100px);
   max-width: 200px;
 }
+
+.selection-mode {
+  margin-left: 5px;
+}
diff --git a/packages/geo/src/lib/layer/layer-list/layer-list.component.html b/packages/geo/src/lib/layer/layer-list/layer-list.component.html
index 323a4bdfce..203d81ff30 100644
--- a/packages/geo/src/lib/layer/layer-list/layer-list.component.html
+++ b/packages/geo/src/lib/layer/layer-list/layer-list.component.html
@@ -42,6 +42,7 @@
   <ng-content select="[igoLayerItemToolbar]"></ng-content>
     <!-- <label>{{ 'igo.geo.layer.opacity' | translate }} </label> -->
     <button
+      class="opacity-button"
       color="primary"
       mat-icon-button
       tooltip-position="below"
@@ -71,6 +72,7 @@
     </mat-menu>
 
     <button
+      class="up-button"
       color="primary"
       mat-icon-button
       tooltip-position="below"
@@ -83,6 +85,7 @@
     </button>
 
     <button
+      class="down-button"
       mat-icon-button
       color="primary"
       tooltip-position="below"
@@ -95,6 +98,7 @@
     </button>
 
     <button
+      class="delete-button"
       mat-icon-button
       color="warn"
       tooltip-position="below"
@@ -124,6 +128,7 @@
 
     <!-- <label>{{ 'igo.geo.layer.opacity' | translate }} </label> -->
     <button
+      class="opacity-button"
       color="primary"
       mat-icon-button
       tooltip-position="below"
@@ -154,6 +159,7 @@
     </mat-menu>
 
     <button
+      class="up-button"
       color="primary"
       mat-icon-button
       tooltip-position="below"
@@ -166,6 +172,7 @@
     </button>
 
     <button
+      class="down-button"
       mat-icon-button
       color="primary"
       tooltip-position="below"
@@ -178,6 +185,7 @@
     </button>
 
     <button
+      class="eye-button"
       mat-icon-button
       color="primary"
       tooltip-position="below"
@@ -189,6 +197,7 @@
     </button>
 
     <button
+      class="delete-button"
       mat-icon-button
       color="warn"
       tooltip-position="below"
diff --git a/packages/integration/src/lib/map/map-tools/map-tools.component.html b/packages/integration/src/lib/map/map-tools/map-tools.component.html
index 69a7b793fb..a4ddacbbad 100644
--- a/packages/integration/src/lib/map/map-tools/map-tools.component.html
+++ b/packages/integration/src/lib/map/map-tools/map-tools.component.html
@@ -19,10 +19,10 @@
       <ng-template #igoLayerItemToolbar let-layer="layer">
         <!-- <igo-download-button [layer]="layer"></igo-download-button> -->
         <igo-workspace-button [layer]="layer"></igo-workspace-button>
-        <igo-export-button [layer]="layer" (click)="activateExport(layer)"></igo-export-button>
-        <igo-ogc-filter-button [header]="ogcButton" [layer]="layer"
+        <igo-export-button *ngIf="isExportButton(layer)" [layer]="layer" (click)="activateExport(layer)"></igo-export-button>
+        <igo-ogc-filter-button *ngIf="isOGCFilterButton(layer)" [header]="ogcButton" [layer]="layer"
         (click)="activateOgcFilter()"></igo-ogc-filter-button>
-        <igo-time-filter-button [header]="timeButton" [layer]="layer"
+        <igo-time-filter-button *ngIf="isTimeFilterButton(layer)" [header]="timeButton" [layer]="layer"
           (click)="activateTimeFilter()"></igo-time-filter-button>
         <igo-track-feature-button [trackFeature]="true" [layer]="layer"></igo-track-feature-button>
         <igo-metadata-button [layer]="layer"></igo-metadata-button>
diff --git a/packages/integration/src/lib/map/map-tools/map-tools.component.ts b/packages/integration/src/lib/map/map-tools/map-tools.component.ts
index c947f3c0cf..571f5cd820 100644
--- a/packages/integration/src/lib/map/map-tools/map-tools.component.ts
+++ b/packages/integration/src/lib/map/map-tools/map-tools.component.ts
@@ -15,7 +15,8 @@ import {
   SearchSourceService,
   sourceCanSearch,
   Layer,
-  ExportOptions
+  ExportOptions,
+  VectorLayer
 } from '@igo2/geo';
 
 import { LayerListToolState } from '../layer-list-tool.state';
@@ -287,4 +288,26 @@ export class MapToolsComponent implements OnInit, OnDestroy {
   contextEmit() {
     this.toolState.toolbox.activateTool('contextManager');
   }
+
+  isTimeFilterButton(layer): boolean {
+    const options = layer.dataSource.options;
+    return this.timeButton && options.timeFilterable && options.timeFilter;
+  }
+
+  isOGCFilterButton(layer): boolean {
+    const options = layer.dataSource.options;
+    return this.ogcButton && options.ogcFilters && options.ogcFilters.enabled &&
+    (options.ogcFilters.pushButtons || options.ogcFilters.editable);
+  }
+
+  isExportButton(layer: Layer): boolean {
+    if (
+      (layer instanceof VectorLayer && layer.exportable === true) ||
+      (layer.dataSource.options.download && layer.dataSource.options.download.url) ||
+      (layer.options.workspace?.enabled && layer.options.workspace?.workspaceId !== layer.id))
+      {
+          return true;
+      }
+    return false;
+  }
 }