diff --git a/packages/geo/src/lib/filter/ogc-filter-form/ogc-filter-form.component.html b/packages/geo/src/lib/filter/ogc-filter-form/ogc-filter-form.component.html
index f9f5180cdf..ffbc66fb2e 100644
--- a/packages/geo/src/lib/filter/ogc-filter-form/ogc-filter-form.component.html
+++ b/packages/geo/src/lib/filter/ogc-filter-form/ogc-filter-form.component.html
@@ -30,7 +30,9 @@
   </div>
 
   <div class="igo-col igo-col-90 igo-col-100-m" *ngIf="(currentFilter.operator !== 'Intersects' && currentFilter.operator !== 'Contains' && currentFilter.operator !== 'Within')">
-    <mat-select [disabled]="!currentFilter.active" [(ngModel)]="currentFilter.operator" (selectionChange)="changeOperator(currentFilter)">
+    <mat-select 
+    tooltip-position="below" matTooltipShowDelay="500" [matTooltip]="'igo.geo.filter.selectOperator' | translate"
+    [disabled]="!currentFilter.active" [(ngModel)]="currentFilter.operator" (selectionChange)="changeOperator(currentFilter)">
       <mat-option *ngFor="let operator of ogcFilterOperators | keyvalue" [value]="operator.key">{{('igo.geo.operators.'+ operator.key) | translate}}</mat-option>
     </mat-select>
   </div>
@@ -164,7 +166,9 @@
 
   <!-- PropertySpatial  -->
   <div class="igo-col igo-col-90 igo-col-100-m" *ngIf="(currentFilter.operator === 'Intersects' || currentFilter.operator === 'Contains' || currentFilter.operator === 'Within')">
-    <mat-select [disabled]="!currentFilter.active" [(ngModel)]="currentFilter.operator" (selectionChange)="changeOperator(currentFilter)">
+    <mat-select  
+      matTooltipShowDelay="500" [matTooltip]="'igo.geo.filter.selectOperator' | translate" tooltip-position="below"
+      [disabled]="!currentFilter.active" [(ngModel)]="currentFilter.operator" (selectionChange)="changeOperator(currentFilter)">
       <mat-option *ngFor="let operator of ogcFilterOperators | keyvalue" [value]="operator.key">{{('igo.geo.operators.'+ operator.key) | translate}}</mat-option>
     </mat-select>
   </div>
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 cbb6a3b442..d2f004b223 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
@@ -23,6 +23,9 @@ <h4 (click)="toggleLegendOnClick()" matLine class="igo-layer-title" [matTooltip]
   </button>
 
   <button
+    tooltip-position="below"
+    matTooltipShowDelay="500"
+    [matTooltip]= "'igo.geo.layer.moreOptions' | translate"
     mat-icon-button
     color="primary"
     igoCollapse
diff --git a/packages/geo/src/locale/en.geo.json b/packages/geo/src/locale/en.geo.json
index c6ed092de9..4c19943997 100644
--- a/packages/geo/src/locale/en.geo.json
+++ b/packages/geo/src/locale/en.geo.json
@@ -92,7 +92,8 @@
         "filterBy": "Filter by",
         "advancedOgcFilters": "Advanced filters",
         "placeholder": "Enter a value",
-        "placeholderSnrc": "Ex: 21L14"
+        "placeholderSnrc": "Ex: 21L14",
+        "selectOperator" : "Select an operator"
       },
       "spatialSelector": {
         "fixedExtent": "Fixed extent",
@@ -105,11 +106,12 @@
         "hideLayer": "Hide Layer",
         "lowerLayer": "Bring layer backward",
         "loadingLegendText": "Loading legend",
-        "filterPlaceholder": "Filter",
+        "filterPlaceholder": "Filter the layers list",
         "noLegendText": "No legend available for this layer",
         "noLegendScale": "No legend available for this scale",
         "opacity": "Opacity",
         "raiseLayer": "Bring layer forward",
+        "moreOptions": "More options",
         "removeLayer": "Remove this layer from the map",
         "showFeaturesList": "Show features list",
         "showLayer": "Show Layer",
diff --git a/packages/geo/src/locale/fr.geo.json b/packages/geo/src/locale/fr.geo.json
index 9fd472fa5c..e615aeabc3 100644
--- a/packages/geo/src/locale/fr.geo.json
+++ b/packages/geo/src/locale/fr.geo.json
@@ -92,7 +92,8 @@
         "filterBy": "Filtrer par",
         "advancedOgcFilters": "Filtres avancés",
         "placeholder": "Saisir une valeur",
-        "placeholderSnrc": "Ex: 21L14"
+        "placeholderSnrc": "Ex: 21L14",
+        "selectOperator" : "Choisir un opérateur"
       },
       "spatialSelector": {
         "fixedExtent": "Étendue fixe",
@@ -105,21 +106,22 @@
         "hideLayer": "Masquer la couche",
         "lowerLayer": "Mettre en arrière",
         "loadingLegendText": "Chargement de la légende",
-        "filterPlaceholder": "Filtre",
+        "filterPlaceholder": "Filtre la liste de couches",
         "noLegendText": "Aucune légende disponible pour cette couche",
         "noLegendScale": "Aucune légende disponible pour cette échelle",
         "opacity": "Opacité",
         "raiseLayer": "Mettre en avant",
+        "moreOptions": "Options sur la couche",
         "removeLayer": "Retirer la couche de la carte",
         "showFeaturesList": "Afficher la liste des entités",
         "showLayer": "Afficher la couche",
         "subsetLayersListKeyword": "Limiter l'affichage de la liste selon le titre ou  par type (wms, wfs,...)",
         "deleteKeyword": "Supprimer le mot-clé",
         "subsetLayersListOnlyVisible": "Conserver les couches visibles",
-        "subsetLayersListOnlyInRange": "Conserver les couches qui sont dans la plage de résolution active",
-        "sortAlphabetically": "Trier la liste des couches alphabétiquement",
+        "subsetLayersListOnlyInRange": "Conserver les couches de la plage d'échelle active",
+        "sortAlphabetically": "Trier la liste des couches en ordre alphabétique",
         "sortMapOrder": "Replacer les couches selon l'ordre cartographique",
-        "resetLayersList": "Supprimer le filtre appliqué à la liste",
+        "resetLayersList": "Rétablir l'affichage de l'ensemble des couches",
         "trackFeature": "Suivre l'entité"
       },
       "download": {