diff --git a/packages/geoadmin-log/src/Message.ts b/packages/geoadmin-log/src/Message.ts
index ad6e767c51..38310c33c6 100644
--- a/packages/geoadmin-log/src/Message.ts
+++ b/packages/geoadmin-log/src/Message.ts
@@ -3,22 +3,37 @@
 export class Message {
     msg: string
     params: Record<string, any>
-
+    /**
+     * Flag telling that the user has seen the error and closed it, to avoid seeing again
+     */
+    isAcknowledged: boolean
+    sourceId? : string
     /**
      * @param {string} msg Translation key message
      * @param {any} params Translation params to pass to i18n (used for message formatting)
      */
-    constructor(msg: string, params: Record<string, any> | null = null) {
+    constructor(msgParams: Record<string, any> ) {
+        const {
+            msg = 'unknown_message',
+            params = {},
+            isAcknowledged = false,
+            sourceId = undefined
+        } = msgParams
         this.msg = msg
-        this.params = params ?? {}
+        this.params = params
+        this.isAcknowledged = isAcknowledged
+        this.sourceId = sourceId
     }
 
+    // It is important that the Acknowledgement of the message is not part of the equality check.
+    // As this is used to stop new errors that have the same source to be dispatched.
     isEquals(object: Message) {
         return (
             object instanceof Message &&
             object.msg === this.msg &&
             Object.keys(this.params).length === Object.keys(object.params).length &&
-            Object.keys(this.params).every((key) => this.params[key] === object.params[key])
+            Object.keys(this.params).every((key) => this.params[key] === object.params[key]) &&
+            this.sourceId === object.sourceId
         )
     }
 }
diff --git a/packages/geoadmin-log/src/__test__/message.spec.js b/packages/geoadmin-log/src/__test__/message.spec.js
new file mode 100644
index 0000000000..681b9658c3
--- /dev/null
+++ b/packages/geoadmin-log/src/__test__/message.spec.js
@@ -0,0 +1,91 @@
+import { expect } from 'chai'
+import { ErrorMessage } from 'packages/geoadmin-log/src/Message'
+import { describe, it } from 'vitest'
+
+describe('Unit Tests for messages', () => {
+    describe('checking equality between messages', () => {
+        it('Ensure that errors with no sources are considered equal too when the rest is equal', () => {
+            const msg1 = new ErrorMessage({ msg: 'test text', params: {} })
+            const msg2 = new ErrorMessage({ msg: 'test text', params: {} })
+            const msg3 = new ErrorMessage({
+                msg: 'test text',
+                params: { key1: 'value1', key2: 'value2' },
+            })
+            const msg4 = new ErrorMessage({
+                msg: 'test text',
+                params: { key1: 'value1', key2: 'value2' },
+            })
+            expect(msg1.isEquals(msg1)).to.equal(true)
+            expect(msg1.isEquals(msg2)).to.equal(true)
+            expect(msg3.isEquals(msg3)).to.equal(true)
+            expect(msg3.isEquals(msg4)).to.equal(true)
+        })
+        it('detects equality and inequality between two messages', () => {
+            // messages without parameter
+            const simpleTextMsg1 = new ErrorMessage({
+                msg: 'test text',
+                params: {},
+                sourceId: 'test_source_12345',
+            })
+            const copyOfimpleTextMsg1 = new ErrorMessage({
+                msg: 'test text',
+                params: {},
+                sourceId: 'test_source_12345',
+            })
+            const simpleTextMsg1OtherSource = new ErrorMessage({
+                msg: 'test text',
+                params: {},
+                sourceId: 'test_source_02345',
+            })
+            const simpleTextMsg2 = new ErrorMessage({
+                msg: 'Another test text',
+                params: {},
+                sourceId: 'test_source_12345',
+            })
+
+            expect(simpleTextMsg1.isEquals(simpleTextMsg1)).to.be.true
+            expect(simpleTextMsg1.isEquals(copyOfimpleTextMsg1)).to.be.true
+            expect(simpleTextMsg1.isEquals(simpleTextMsg1OtherSource)).to.be.false // different source
+            expect(simpleTextMsg1.isEquals(simpleTextMsg2)).to.be.false // different msg
+
+            // messages with parameters
+            const paramMsg1 = new ErrorMessage({
+                msg: 'test text',
+                params: { key1: 'value1', key2: 'value2' },
+                sourceId: 'test_source_12345',
+            })
+            const copyOfParamMsg1 = new ErrorMessage({
+                msg: 'test text',
+                params: { key1: 'value1', key2: 'value2' },
+                sourceId: 'test_source_12345',
+            })
+            const paramMsg2 = new ErrorMessage({
+                msg: 'test text',
+                params: { key1: 'value2', key2: 'value2' },
+                sourceId: 'test_source_12345',
+            })
+
+            const paramMsg3 = new ErrorMessage({
+                msg: 'test text',
+                params: { key2: 'value1', key3: 'value2' },
+                sourceId: 'test_source_12345',
+            })
+            const paramMsg4 = new ErrorMessage({
+                msg: 'Another test text',
+                params: { key1: 'value1', key2: 'value2' },
+                sourceId: 'test_source_12345',
+            })
+            expect(simpleTextMsg1.isEquals(paramMsg1)).to.be.false // empty params vs params
+            expect(paramMsg1.isEquals(paramMsg1)).to.be.true
+            expect(paramMsg1.isEquals(copyOfParamMsg1)).to.be.true
+            expect(paramMsg1.isEquals(paramMsg4)).to.be.false // different text with params
+            expect(paramMsg1.isEquals(paramMsg2)).to.be.false // different values in params
+            expect(paramMsg1.isEquals(paramMsg3)).to.be.false // different keys in params
+        })
+        it('ensure that acknowledement of a message does not change equality', () => {
+            const msg1 = new ErrorMessage({ msg: 'test', params: {}, isAcknowledged: false })
+            const msg2 = new ErrorMessage({ msg: 'test', params: {}, isAcknowledged: true })
+            expect(msg1.isEquals(msg2)).to.be.true
+        })
+    })
+})
diff --git a/packages/mapviewer/src/App.vue b/packages/mapviewer/src/App.vue
index b98c0792d9..49eac03f39 100644
--- a/packages/mapviewer/src/App.vue
+++ b/packages/mapviewer/src/App.vue
@@ -23,7 +23,7 @@ const dispatcher = { dispatcher: 'App.vue' }
 
 let debouncedOnResize
 const showFeedbackPopup = computed(() => {
-    return store.state.ui.errors.size + store.state.ui.warnings.size > 0
+    return store.getters.getFirstError || store.getters.getFirstWarning
 })
 const showDebugToolbar = computed(() => !IS_TESTING_WITH_CYPRESS && store.getters.hasDevSiteWarning)
 
diff --git a/packages/mapviewer/src/api/errorQueues.api.js b/packages/mapviewer/src/api/errorQueues.api.js
index 4f2017bf86..b558592110 100644
--- a/packages/mapviewer/src/api/errorQueues.api.js
+++ b/packages/mapviewer/src/api/errorQueues.api.js
@@ -1,9 +1,12 @@
 import { ErrorMessage } from '@geoadmin/log/Message'
 
 export function getStandardErrorMessage(query, urlParamName) {
-    return new ErrorMessage('url_parameter_error', {
-        param: urlParamName,
-        value: query,
+    return new ErrorMessage({
+        msg: 'url_parameter_error',
+        params: {
+            param: urlParamName,
+            value: query,
+        },
     })
 }
 
diff --git a/packages/mapviewer/src/modules/drawing/DrawingModule.vue b/packages/mapviewer/src/modules/drawing/DrawingModule.vue
index 3f3ad2d273..3acf457ed8 100644
--- a/packages/mapviewer/src/modules/drawing/DrawingModule.vue
+++ b/packages/mapviewer/src/modules/drawing/DrawingModule.vue
@@ -138,8 +138,11 @@ watch(availableIconSets, () => {
             const icon = getIcon(iconArgs, null /*iconStyle*/, availableIconSets.value, () => {
                 store.dispatch('addWarnings', {
                     warnings: [
-                        new WarningMessage('kml_icon_set_not_found', {
-                            iconSetName: iconArgs.set,
+                        new WarningMessage({
+                            msg: 'kml_icon_set_not_found',
+                            params: {
+                                iconSetName: iconArgs.set,
+                            },
                         }),
                     ],
                     ...dispatcher,
diff --git a/packages/mapviewer/src/modules/infobox/components/styling/FeatureStyleEdit.vue b/packages/mapviewer/src/modules/infobox/components/styling/FeatureStyleEdit.vue
index 4ec98ea59a..ebdc5fe2d2 100644
--- a/packages/mapviewer/src/modules/infobox/components/styling/FeatureStyleEdit.vue
+++ b/packages/mapviewer/src/modules/infobox/components/styling/FeatureStyleEdit.vue
@@ -258,8 +258,8 @@ function mediaTypes() {
                         {{ t('modify_description') }}
                     </label>
                     <GeoadminTooltip
-                        :tooltip-content="t('display_on_map')"
                         v-if="isFeatureMarker || isFeatureText"
+                        :tooltip-content="t('display_on_map')"
                     >
                         <button
                             class="btn btn-sm btn-light d-flex align-items-center mb-2"
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumWMTSLayer.vue b/packages/mapviewer/src/modules/map/components/cesium/CesiumWMTSLayer.vue
index a15d3991a8..dbb7cead67 100644
--- a/packages/mapviewer/src/modules/map/components/cesium/CesiumWMTSLayer.vue
+++ b/packages/mapviewer/src/modules/map/components/cesium/CesiumWMTSLayer.vue
@@ -15,7 +15,10 @@ import { getWmtsXyzUrl } from '@/utils/layerUtils'
 const dispatcher = { dispatcher: 'CesiumWMTSLayer.vue' }
 
 const MAXIMUM_LEVEL_OF_DETAILS = 18
-const unsupportedProjectionError = new ErrorMessage('3d_unsupported_projection')
+const unsupportedProjectionError = new ErrorMessage({
+    msg: '3d_unsupported_projection',
+    sourceId: wmtsLayerConfig.id,
+})
 
 const { wmtsLayerConfig, zIndex, parentLayerOpacity } = defineProps({
     wmtsLayerConfig: {
@@ -59,6 +62,7 @@ const tileMatrixSet = computed(() => {
             error: unsupportedProjectionError,
             ...dispatcher,
         })
+        store.dispatch('addErrors', [unsupportedProjectionError], dispatcher)
     }
     return wmtsLayerConfig.tileMatrixSets
 })
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersKMLLayer.vue b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersKMLLayer.vue
index b75fbb590c..95dd1debb2 100644
--- a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersKMLLayer.vue
+++ b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersKMLLayer.vue
@@ -91,9 +91,12 @@ function iconUrlProxy(url) {
         (url) => {
             store.dispatch('addWarnings', {
                 warnings: [
-                    new WarningMessage('kml_icon_url_cors_issue', {
-                        layerName: layerName.value,
-                        url: url,
+                    new WarningMessage({
+                        msg: 'kml_icon_url_cors_issue',
+                        params: {
+                            layerName: layerName.value,
+                            url: url,
+                        },
                     }),
                 ],
                 ...dispatcher,
@@ -102,9 +105,12 @@ function iconUrlProxy(url) {
         (url) => {
             store.dispatch('addWarnings', {
                 warnings: [
-                    new WarningMessage('kml_icon_url_scheme_http', {
-                        layerName: layerName.value,
-                        url: url,
+                    new WarningMessage({
+                        msg: 'kml_icon_url_scheme_http',
+                        params: {
+                            layerName: layerName.value,
+                            url: url,
+                        },
                     }),
                 ],
                 ...dispatcher,
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileOnlineTab.vue b/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileOnlineTab.vue
index 3a63cdb4e0..29427a83c4 100644
--- a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileOnlineTab.vue
+++ b/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileOnlineTab.vue
@@ -83,7 +83,9 @@ async function loadFile() {
         await handleFileSource(fileUrl.value, false)
         if (!fileUrl.value.match(/^https:\/\//)) {
             store.dispatch('addWarnings', {
-                warnings: [new WarningMessage('import_http_external_file_warning', {})],
+                warnings: [
+                    new WarningMessage({ msg: 'import_http_external_file_warning', params: {} }),
+                ],
                 dispatcher: 'Import File Online Tab',
             })
         }
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/KMLParser.class.js b/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/KMLParser.class.js
index 93fa2d9bd3..bec9ae3929 100644
--- a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/KMLParser.class.js
+++ b/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/KMLParser.class.js
@@ -74,8 +74,12 @@ export class KMLParser extends FileParser {
 
         if (!isKmlFeaturesValid(kmlAsText)) {
             kmlLayer.addWarningMessage(
-                new WarningMessage('kml_malformed', {
-                    filename: kmlLayer.name ?? kmlLayer.id,
+                new WarningMessage({
+                    msg: 'kml_malformed',
+                    params: {
+                        filename: kmlLayer.name ?? kmlLayer.id,
+                    },
+                    sourceId: kmlLayer.id,
                 })
             )
         }
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/generateErrorMessageFromErrorType.utils.js b/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/generateErrorMessageFromErrorType.utils.js
index bb48708561..171f974001 100644
--- a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/generateErrorMessageFromErrorType.utils.js
+++ b/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/generateErrorMessageFromErrorType.utils.js
@@ -10,17 +10,28 @@ import UnknownProjectionError from '@/modules/menu/components/advancedTools/Impo
  * function).
  *
  * @param {Error} error An error raised by a FileParser, or the parseAll
+ * @param {AbstractLayer} layer The layer which originated the error
  * @returns {ErrorMessage}
  */
-export default function generateErrorMessageFromErrorType(error) {
+export default function generateErrorMessageFromErrorType(error, layer) {
     if (error instanceof AxiosError || /fetch/.test(error.message)) {
-        return new ErrorMessage('loading_error_network_failure')
+        return new ErrorMessage({
+            msg: 'loading_error_network_failure',
+            sourceId: layer?.id,
+        })
     } else if (error instanceof OutOfBoundsError) {
-        return new ErrorMessage('imported_file_out_of_bounds')
+        return new ErrorMessage({
+            msg: 'imported_file_out_of_bounds',
+            sourceId: layer?.id,
+        })
     } else if (error instanceof EmptyFileContentError) {
-        return new ErrorMessage('kml_gpx_file_empty')
+        return new ErrorMessage({ msg: 'kml_gpx_file_empty', sourceId: layer?.id })
     } else if (error instanceof UnknownProjectionError) {
-        return new ErrorMessage('unknown_projection_error', { epsg: error.epsg })
+        return new ErrorMessage({
+            msg: 'unknown_projection_error',
+            params: { epsg: error.epsg },
+            sourceId: layer?.id,
+        })
     }
-    return new ErrorMessage('invalid_import_file_error')
+    return new ErrorMessage({ msg: 'invalid_import_file_error', sourceId: layer?.id })
 }
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/useImportFile.composable.js b/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/useImportFile.composable.js
index fa54397bf2..97ab286189 100644
--- a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/useImportFile.composable.js
+++ b/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/useImportFile.composable.js
@@ -43,8 +43,12 @@ export default function useImportFile() {
                     projection.value.bounds.isInBounds(extent[2], extent[3])
                 if (!isLayerFullyInBound) {
                     layer.addWarningMessage(
-                        new WarningMessage('file_imported_partially_out_of_bounds', {
-                            filename: layer.name ?? layer.id,
+                        new WarningMessage({
+                            msg: 'file_imported_partially_out_of_bounds',
+                            params: {
+                                filename: layer.name ?? layer.id,
+                            },
+                            sourceId: layer.id,
                         })
                     )
                 }
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/MenuAdvancedToolsList.vue b/packages/mapviewer/src/modules/menu/components/advancedTools/MenuAdvancedToolsList.vue
index 4e94245079..607de98394 100644
--- a/packages/mapviewer/src/modules/menu/components/advancedTools/MenuAdvancedToolsList.vue
+++ b/packages/mapviewer/src/modules/menu/components/advancedTools/MenuAdvancedToolsList.vue
@@ -45,7 +45,7 @@ function onToggleCompareSlider() {
 
     if (hasNoVisibleLayer.value) {
         store.dispatch('addWarnings', {
-            warnings: [new WarningMessage('no_layers_info_compare')],
+            warnings: [new WarningMessage({ msg: 'no_layers_info_compare' })],
             ...dispatcher,
         })
     }
diff --git a/packages/mapviewer/src/router/storeSync/LayerParamConfig.class.js b/packages/mapviewer/src/router/storeSync/LayerParamConfig.class.js
index 57a725c216..83937d0609 100644
--- a/packages/mapviewer/src/router/storeSync/LayerParamConfig.class.js
+++ b/packages/mapviewer/src/router/storeSync/LayerParamConfig.class.js
@@ -185,13 +185,6 @@ function dispatchLayersFromUrlIntoStore(to, store, urlParamValue) {
             )
             if (layerObject) {
                 if (layerObject.type === LayerTypes.KML && layerObject.adminId) {
-                    promisesForAllDispatch.push(
-                        store.dispatch('setShowDrawingOverlay', {
-                            show: true,
-                            dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
-                        })
-                    )
-
                     promisesForAllDispatch.push(
                         store.dispatch('setIsVisitWithAdminId', {
                             value: true,
@@ -284,11 +277,17 @@ function validateUrlInput(store, query) {
         .filter((layer) => !store.getters.getLayerConfigById(layer.id))
         .forEach((layer) => {
             if (!layer.baseUrl) {
-                faultyLayers.push(new ErrorMessage('url_layer_error', { layer: layer.id }))
+                faultyLayers.push(
+                    new ErrorMessage({ msg: 'url_layer_error', params: { layer: layer.id } })
+                )
             } else if (!layer.baseUrl?.match(url_matcher)?.length > 0) {
                 localLayers.push(
-                    new WarningMessage('url_external_layer_no_scheme_warning', {
-                        layer: `${layer.type}|${layer.baseUrl}`,
+                    new WarningMessage({
+                        msg: 'url_external_layer_no_scheme_warning',
+                        params: {
+                            layer: `${layer.type}|${layer.baseUrl}`,
+                        },
+                        sourceId: layer.baseUrl,
                     })
                 )
             }
@@ -321,6 +320,7 @@ export default class LayerParamConfig extends AbstractParamConfig {
                 'setSelectedFeatures',
                 'addSelectedFeatures',
                 'updateLayer',
+                'updateLayers',
             ],
             setValuesInStore: dispatchLayersFromUrlIntoStore,
             extractValueFromStore: generateLayerUrlParamFromStoreValues,
diff --git a/packages/mapviewer/src/router/storeSync/TimeSliderParamConfig.class.js b/packages/mapviewer/src/router/storeSync/TimeSliderParamConfig.class.js
index 7b1eda465e..3981cd6e45 100644
--- a/packages/mapviewer/src/router/storeSync/TimeSliderParamConfig.class.js
+++ b/packages/mapviewer/src/router/storeSync/TimeSliderParamConfig.class.js
@@ -21,7 +21,7 @@ function dispatchTimeSliderFromUrlParam(to, store, urlParamValue) {
                 dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
             })
         )
-        if (store.getters.visibleLayers.some(layer => layer.hasMultipleTimestamps)) {
+        if (store.getters.visibleLayers.some((layer) => layer.hasMultipleTimestamps)) {
             promisesForAllDispatch.push(
                 store.dispatch('setTimeSliderActive', {
                     timeSliderActive: true,
@@ -52,7 +52,7 @@ function validateUrlInput(store, query) {
             validationObject.warnings = []
         }
         validationObject.warnings.push(
-            new WarningMessage('time_slider_no_time_layer_active_url_warning', {})
+            new WarningMessage({ msg: 'time_slider_no_time_layer_active_url_warning' })
         )
     }
     return validationObject
diff --git a/packages/mapviewer/src/store/modules/layers.store.js b/packages/mapviewer/src/store/modules/layers.store.js
index cca6b0a9a9..c00c0fe7cc 100644
--- a/packages/mapviewer/src/store/modules/layers.store.js
+++ b/packages/mapviewer/src/store/modules/layers.store.js
@@ -694,7 +694,7 @@ const actions = {
      * @param {ErrorMessage} error Error translation key to add
      * @param {string} dispatcher Action dispatcher name
      */
-    addLayerError({ commit, getters }, { layerId, isExternal, baseUrl, error, dispatcher }) {
+    addLayerError({ commit, store, getters }, { layerId, isExternal, baseUrl, error, dispatcher }) {
         const layers = getters.getLayersById(layerId, isExternal, baseUrl)
         if (layers.length === 0) {
             throw new Error(
@@ -805,8 +805,10 @@ const actions = {
                 clone.isLoading = false
 
                 // Always clean up the error messages before doing the check
-                const emptyFileErrorMessage = new ErrorMessage('kml_gpx_file_empty')
-                const outOfBoundsErrorMessage = new ErrorMessage('imported_file_out_of_bounds')
+                const emptyFileErrorMessage = new ErrorMessage({ msg: 'kml_gpx_file_empty' })
+                const outOfBoundsErrorMessage = new ErrorMessage({
+                    msg: 'imported_file_out_of_bounds',
+                })
                 clone.removeErrorMessage(emptyFileErrorMessage)
                 clone.removeErrorMessage(outOfBoundsErrorMessage)
 
diff --git a/packages/mapviewer/src/store/modules/ui.store.js b/packages/mapviewer/src/store/modules/ui.store.js
index 3e6d428168..74c0cbe060 100644
--- a/packages/mapviewer/src/store/modules/ui.store.js
+++ b/packages/mapviewer/src/store/modules/ui.store.js
@@ -316,6 +316,19 @@ export default {
         hideEmbedUI(state) {
             return state.hideEmbedUI
         },
+        getFirstError(state) {
+            return Array.from(state.errors).find((error) => !error.isAcknowledged)
+        },
+        getFirstWarning(state) {
+            return Array.from(state.warnings).find((warning) => !warning.isAcknowledged)
+        },
+        getNumberOfNonAcknowledgedErrors(state) {
+            return Array.from(state.errors).filter((error) => !error.isAcknowledged).length
+        },
+
+        getNumberOfNonAcknowledgedWarnings(state) {
+            return Array.from(state.warnings).filter((warning) => !warning.isAcknowledged).length
+        },
     },
     actions: {
         setSize({ commit, state }, { width, height, dispatcher }) {
@@ -453,14 +466,21 @@ export default {
             }
         },
 
-        removeError({ commit, state }, { error, dispatcher }) {
+        acknowledgedError({ commit, state }, { error, dispatcher }) {
             if (!(error instanceof ErrorMessage)) {
                 throw new Error(
                     `Error ${error} dispatched by ${dispatcher} is not of type ErrorMessage`
                 )
             }
             if (state.errors.has(error)) {
+                const acknowledgedError = new ErrorMessage({
+                    msg: error.msg,
+                    params: error.params,
+                    sourceId: error.sourceId,
+                    isAcknowledged: true,
+                })
                 commit('removeError', { error, dispatcher })
+                commit('addErrors', { errors: [acknowledgedError], dispatcher })
             }
         },
         addWarnings({ commit, state }, { warnings, dispatcher }) {
@@ -482,14 +502,21 @@ export default {
                 )
             }
         },
-        removeWarning({ commit, state }, { warning, dispatcher }) {
+        acknowledgeWarning({ commit, state }, { warning, dispatcher }) {
             if (!(warning instanceof WarningMessage)) {
                 throw new Error(
                     `Warning ${warning} dispatched by ${dispatcher} is not of type WarningMessage`
                 )
             }
             if (state.warnings.has(warning)) {
+                const acknowledgedWarning = new WarningMessage({
+                    msg: warning.msg,
+                    params: warning.params,
+                    sourceId: warning.sourceId,
+                    isAcknowledged: true,
+                })
                 commit('removeWarning', { warning, dispatcher })
+                commit('addWarnings', { warnings: [acknowledgedWarning], dispatcher })
             }
         },
         setShowDragAndDropOverlay({ commit }, { showDragAndDropOverlay, dispatcher }) {
diff --git a/packages/mapviewer/src/store/plugins/external-layers.plugin.js b/packages/mapviewer/src/store/plugins/external-layers.plugin.js
index 4dd19d5be3..4f79cf303e 100644
--- a/packages/mapviewer/src/store/plugins/external-layers.plugin.js
+++ b/packages/mapviewer/src/store/plugins/external-layers.plugin.js
@@ -112,13 +112,16 @@ async function updateExternalLayer(store, capabilities, layer, projection) {
         return updated
     } catch (error) {
         log.error(`Failed to update external layer ${layer.id}: `, error)
+        const errorMessage = new ErrorMessage({ msg: error.key ?? 'error', sourceId: layer.id })
         store.dispatch('addLayerError', {
             layerId: layer.id,
             isExternal: layer.isExternal,
             baseUrl: layer.baseUrl,
-            error: new ErrorMessage(error.key ?? 'error'),
+            error: errorMessage,
             ...dispatcher,
         })
+        store.dispatch('addErrors', [errorMessage], dispatcher)
+
         return null
     }
 }
diff --git a/packages/mapviewer/src/store/plugins/geolocation-management.plugin.js b/packages/mapviewer/src/store/plugins/geolocation-management.plugin.js
index d18c5cdb99..add1659c75 100644
--- a/packages/mapviewer/src/store/plugins/geolocation-management.plugin.js
+++ b/packages/mapviewer/src/store/plugins/geolocation-management.plugin.js
@@ -51,7 +51,7 @@ function setCenterIfInBounds(store, center) {
     } else {
         log.warn(`current geolocation is out of bounds: ${JSON.stringify(center)}`)
         store.dispatch('addErrors', {
-            errors: [new ErrorMessage('geoloc_out_of_bounds', null)],
+            errors: [new ErrorMessage({ msg: 'geoloc_out_of_bounds' })],
             ...dispatcher,
         })
     }
@@ -114,14 +114,14 @@ const handlePositionError = (error, store, state, options = {}) => {
                 ...dispatcher,
             })
             store.dispatch('addErrors', {
-                errors: [new ErrorMessage('geoloc_permission_denied')],
+                errors: [new ErrorMessage({ msg: 'geoloc_permission_denied' })],
                 ...dispatcher,
             })
             break
         case GeolocationPositionError.TIMEOUT:
             store.dispatch('setGeolocation', { active: false, ...dispatcher })
             store.dispatch('addErrors', {
-                errors: [new ErrorMessage('geoloc_time_out')],
+                errors: [new ErrorMessage({ msg: 'geoloc_time_out' })],
                 ...dispatcher,
             })
             break
@@ -135,7 +135,7 @@ const handlePositionError = (error, store, state, options = {}) => {
                 }
             } else {
                 store.dispatch('addErrors', {
-                    errors: [new ErrorMessage('geoloc_unknown')],
+                    errors: [new ErrorMessage({ msg: 'geoloc_unknown' })],
                     ...dispatcher,
                 })
                 if (reactivate) {
diff --git a/packages/mapviewer/src/store/plugins/load-geojson-style-and-data.plugin.js b/packages/mapviewer/src/store/plugins/load-geojson-style-and-data.plugin.js
index a32dd35880..987d22fcf7 100644
--- a/packages/mapviewer/src/store/plugins/load-geojson-style-and-data.plugin.js
+++ b/packages/mapviewer/src/store/plugins/load-geojson-style-and-data.plugin.js
@@ -92,7 +92,7 @@ function loadDataAndStyle(geoJsonLayer) {
                 )
                 const clone = geoJsonLayer.clone()
                 clone.isLoading = false
-                clone.addErrorMessage(new ErrorMessage('loading_error_network_failure'))
+                clone.addErrorMessage(new ErrorMessage({ msg: 'loading_error_network_failure' }))
                 return clone
             }),
     }
diff --git a/packages/mapviewer/src/store/plugins/load-gpx-data.plugin.js b/packages/mapviewer/src/store/plugins/load-gpx-data.plugin.js
index f0f6e5053c..3e64ec64b9 100644
--- a/packages/mapviewer/src/store/plugins/load-gpx-data.plugin.js
+++ b/packages/mapviewer/src/store/plugins/load-gpx-data.plugin.js
@@ -31,13 +31,18 @@ async function loadGpx(store, gpxLayer) {
         })
     } catch (error) {
         log.error(`Error while fetching GPX data for layer ${gpxLayer?.id}`, error)
+        const errorMessage = new ErrorMessage({
+            msg: 'loading_error_network_failure',
+            sourceId: gpxLayer.id,
+        })
         store.dispatch('addLayerError', {
             layerId: gpxLayer.id,
             isExternal: gpxLayer.isExternal,
             baseUrl: gpxLayer.baseUrl,
-            error: new ErrorMessage('loading_error_network_failure'),
+            error: errorMessage,
             ...dispatcher,
         })
+        store.dispatch('addErrors', [errorMessage], dispatcher)
     }
 }
 
diff --git a/packages/mapviewer/src/store/plugins/load-kml-kmz-data.plugin.js b/packages/mapviewer/src/store/plugins/load-kml-kmz-data.plugin.js
index fa5a35de42..69b8a421a5 100644
--- a/packages/mapviewer/src/store/plugins/load-kml-kmz-data.plugin.js
+++ b/packages/mapviewer/src/store/plugins/load-kml-kmz-data.plugin.js
@@ -34,6 +34,12 @@ async function loadMetadata(store, kmlLayer) {
             },
             ...dispatcher,
         })
+        if (kmlLayer.adminId) {
+            store.dispatch('setShowDrawingOverlay', {
+                show: true,
+                ...dispatcher,
+            })
+        }
     } catch (error) {
         log.error(`Error while fetching KML metadata for layer ${kmlLayer?.id}`, error)
     }
@@ -95,15 +101,20 @@ async function loadData(store, kmlLayer) {
     }
     if (!mimeType && !loadedContent) {
         log.error('[load-kml-kmz-data] could not get content for KML', kmlLayer.kmlFileUrl)
+        const errorMessage = new ErrorMessage({
+            msg: kmlLayer.isExternal
+                ? 'loading_error_network_failure'
+                : 'loading_error_file_deleted',
+            sourceId: kmlLayer.id,
+        })
         store.dispatch('addLayerError', {
             layerId: kmlLayer.id,
             isExternal: kmlLayer.isExternal,
             baseUrl: kmlLayer.baseUrl,
-            error: new ErrorMessage(
-                kmlLayer.isExternal ? 'loading_error_network_failure' : 'loading_error_file_deleted'
-            ),
+            error: errorMessage,
             ...dispatcher,
         })
+        store.dispatch('addErrors', { errors: [errorMessage] }, dispatcher)
         // stopping there, there won't be anything to do with this file
         return
     }
@@ -142,13 +153,15 @@ async function loadData(store, kmlLayer) {
         log.error(
             `[load-kml-kmz-data] Error while fetching KML data for layer ${kmlLayer?.id}: ${error}`
         )
+        const errorMessage = generateErrorMessageFromErrorType(error, kmlLayer)
         store.dispatch('addLayerError', {
             layerId: kmlLayer.id,
             isExternal: kmlLayer.isExternal,
             baseUrl: kmlLayer.baseUrl,
-            error: generateErrorMessageFromErrorType(error),
+            error: errorMessage,
             ...dispatcher,
         })
+        store.dispatch('addErrors', { errors: [errorMessage], dispatcher })
     }
 }
 
diff --git a/packages/mapviewer/src/utils/components/ErrorWindow.vue b/packages/mapviewer/src/utils/components/ErrorWindow.vue
index f3752707a4..840edb5460 100644
--- a/packages/mapviewer/src/utils/components/ErrorWindow.vue
+++ b/packages/mapviewer/src/utils/components/ErrorWindow.vue
@@ -23,7 +23,7 @@ const store = useStore()
 const showBody = ref(true)
 const hasDevSiteWarning = computed(() => store.getters.hasDevSiteWarning)
 
-const errorCount = computed(() => store.state.ui.errors.size)
+const errorCount = computed(() => store.getters.getNumberOfNonAcknowledgedErrors)
 
 const { t } = useI18n()
 
@@ -33,7 +33,7 @@ const emit = defineEmits(['close'])
 <template>
     <div
         v-show="!hide"
-        class="simple-window card bg-danger text-white fw-bold"
+        class="simple-window card bg-danger fw-bold text-white"
         :class="{ 'dev-disclaimer-present': hasDevSiteWarning }"
         data-cy="error-window"
     >
@@ -43,7 +43,7 @@ const emit = defineEmits(['close'])
         >
             <span
                 v-if="title"
-                class="me-auto text-truncate"
+                class="text-truncate me-auto"
             >
                 {{ t(title) }}
                 <span v-if="errorCount > 1">({{ errorCount }})</span>
diff --git a/packages/mapviewer/src/utils/components/FeedbackPopup.vue b/packages/mapviewer/src/utils/components/FeedbackPopup.vue
index e56245e267..905cf479e6 100644
--- a/packages/mapviewer/src/utils/components/FeedbackPopup.vue
+++ b/packages/mapviewer/src/utils/components/FeedbackPopup.vue
@@ -7,18 +7,8 @@ import ErrorWindow from '@/utils/components/ErrorWindow.vue'
 import WarningWindow from '@/utils/components/WarningWindow.vue'
 const store = useStore()
 const { t } = useI18n()
-const error = computed(() => {
-    if (store.state.ui.errors.size > 0) {
-        return store.state.ui.errors.values().next().value
-    }
-    return null
-})
-const warning = computed(() => {
-    if (store.state.ui.warnings.size > 0) {
-        return store.state.ui.warnings.values().next().value
-    }
-    return null
-})
+const error = computed(() => store.getters.getFirstError)
+const warning = computed(() => store.getters.getFirstWarning)
 </script>
 
 <template>
@@ -26,7 +16,7 @@ const warning = computed(() => {
         <ErrorWindow
             v-if="error"
             title="error"
-            @close="store.dispatch('removeError', { error, ...dispatcher })"
+            @close="store.dispatch('acknowledgedError', { error, ...dispatcher })"
         >
             <div>
                 {{ t(error.msg, error.params) }}
@@ -35,7 +25,7 @@ const warning = computed(() => {
         <WarningWindow
             v-if="warning"
             title="warning"
-            @close="store.dispatch('removeWarning', { warning, ...dispatcher })"
+            @close="store.dispatch('acknowledgeWarning', { warning, ...dispatcher })"
         >
             <div>{{ t(warning.msg, warning.params) }}</div>
         </WarningWindow>
diff --git a/packages/mapviewer/src/utils/components/WarningWindow.vue b/packages/mapviewer/src/utils/components/WarningWindow.vue
index 18d716f720..3e7916e3d8 100644
--- a/packages/mapviewer/src/utils/components/WarningWindow.vue
+++ b/packages/mapviewer/src/utils/components/WarningWindow.vue
@@ -23,7 +23,7 @@ const store = useStore()
 const showBody = ref(true)
 const hasDevSiteWarning = computed(() => store.getters.hasDevSiteWarning)
 
-const warningCount = computed(() => store.state.ui.warnings.size)
+const warningCount = computed(() => store.getters.getNumberOfNonAcknowledgedWarnings)
 
 const { t } = useI18n()
 
@@ -43,7 +43,7 @@ const emit = defineEmits(['close'])
         >
             <span
                 v-if="title"
-                class="me-auto text-truncate"
+                class="text-truncate me-auto"
             >
                 {{ t(title) }}
                 <span v-if="warningCount > 1">({{ warningCount }})</span>
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/geolocation.cy.js b/packages/mapviewer/tests/cypress/tests-e2e/geolocation.cy.js
index a5ed49d7ad..60b00b3ab1 100644
--- a/packages/mapviewer/tests/cypress/tests-e2e/geolocation.cy.js
+++ b/packages/mapviewer/tests/cypress/tests-e2e/geolocation.cy.js
@@ -140,12 +140,12 @@ describe('Geolocation cypress', () => {
                 // null island
                 cy.goToMapView({}, true, { latitude: 0, longitude: 0 })
                 getGeolocationButtonAndClickIt()
-                testErrorMessage('geoloc_out_of_bounds')
+                testErrorMessage('geoloc_out_of_bounds', true)
 
                 // Java island
                 cy.goToMapView({}, true, { latitude: -7.71, longitude: 110.37 })
                 getGeolocationButtonAndClickIt()
-                testErrorMessage('geoloc_out_of_bounds')
+                testErrorMessage('geoloc_out_of_bounds', false)
             })
         }
     )
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/legacyParamImport.cy.js b/packages/mapviewer/tests/cypress/tests-e2e/legacyParamImport.cy.js
index 96c12dd0d6..ad587d3a12 100644
--- a/packages/mapviewer/tests/cypress/tests-e2e/legacyParamImport.cy.js
+++ b/packages/mapviewer/tests/cypress/tests-e2e/legacyParamImport.cy.js
@@ -122,7 +122,7 @@ describe('Test on legacy param import', () => {
         const kmlServiceFilePath = `${kmlServiceBasePath}/files/${kmlId}`
         beforeEach(() => {
             // serving a dummy KML so that we don't get a 404
-            cy.intercept(`**${kmlServiceFilePath}`, '<kml />').as('get-kml')
+            cy.intercept(`**${kmlServiceFilePath}`, '<kml></kml>').as('get-kml')
             cy.intercept(`**${kmlServiceAdminPath}?admin_id=${adminId}`, (request) => {
                 request.reply({
                     id: kmlId,
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/utils.js b/packages/mapviewer/tests/cypress/tests-e2e/utils.js
index ad08fe8a6c..c687eccb74 100644
--- a/packages/mapviewer/tests/cypress/tests-e2e/utils.js
+++ b/packages/mapviewer/tests/cypress/tests-e2e/utils.js
@@ -14,7 +14,7 @@ export function getGeolocationButtonAndClickIt() {
     cy.get(geolocationButtonSelector).should('be.visible').click()
 }
 
-export function testErrorMessage(message) {
+export function testErrorMessage(message, shouldErrorMessageBeShown = true) {
     const geolocationButtonSelector = '[data-cy="geolocation-button"]'
     // move the mouse away from the button because the tooltip covers the
     // error message
@@ -28,10 +28,14 @@ export function testErrorMessage(message) {
 
         const error = errors.values().next().value
         expect(error.msg).to.eq(message)
+        // When we are checking an acknowledged error, it should not appear in the UI (and won't be added to the set)
+        expect(error.isAcknowledged).to.eq(!shouldErrorMessageBeShown)
     })
     // Check error in UI
-    cy.get('[data-cy="error-window"]').should('be.visible')
-    cy.get('[data-cy="error-window-close"]').should('be.visible').click() // close the error window
+    if (shouldErrorMessageBeShown) {
+        cy.get('[data-cy="error-window"]').should('be.visible')
+        cy.get('[data-cy="error-window-close"]').should('be.visible').click() // close the error window
+    }
 }
 
 export function checkStorePosition(storeString, x, y) {