diff --git a/images/themes/default/mActionAddAfsLayer.svg b/images/themes/default/mActionAddAfsLayer.svg
index 4b30113b9266..69f43060395f 100644
--- a/images/themes/default/mActionAddAfsLayer.svg
+++ b/images/themes/default/mActionAddAfsLayer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><linearGradient id="a"><stop offset="0" stop-color="#b2d234"/><stop offset=".961" stop-color="#009e46"/><stop offset="1" stop-color="#009e46"/></linearGradient><path d="M12 .784c7.116 3.533 6.1 16.778 0 19.427M.818 10.498h22.364M2.19 5.186c5.693.76 13.825.76 19.518 0M2.19 15.809c5.693-.759 13.825-.759 19.518 0M12 .784c-6.1 2.65-7.116 15.895 0 19.427" fill="none" stroke="#749fcf" stroke-width=".75162"/><path transform="matrix(.94419 0 0 .81716 16.86 -.787)" d="M6.966 13.81A12.112 12.157 0 0 1-5.147 25.965a12.112 12.157 0 0 1-12.112-12.157A12.112 12.157 0 0 1-5.147 1.653 12.112 12.157 0 0 1 6.966 13.809z" fill="none" stroke="#5488c4" stroke-width="1.284"/><path d="M5.491 5.445L9.885 16.53l4.831-10.982 3.973-.016" overflow="visible" fill="none" stroke="#172739" stroke-width=".97560276" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 1.42 -9.788)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#172739" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.19051 0 0 1.21859 5.718 1.298)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#172739" stroke-width=".936" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 10.522 -9.71)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#172739" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 14.618 -9.7)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#172739" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><g transform="matrix(.6923 0 0 .6923 1.846 1.846)"><rect y="19" x="19" width="13" ry="2.615" rx="2.615" height="13" fill="#5a8c5a"/><path d="M21.6 25.5h7.8M25.5 29.4v-7.8" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#fff" stroke-width="2.6" stroke-linecap="round" stroke-linejoin="round"/><path d="M20.3 25.5h10.4v-2.6c0-2.6-.65-2.6-5.2-2.6s-5.2 0-5.2 2.6v2.6z" opacity=".3" fill="#fcffff" fill-rule="evenodd"/></g><g><path d="M13.5 17a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0" fill="#fff"/><path d="M4.825 13.085c-.394.016-.771.068-1.147.124a5.088 5.088 0 0 0-1.802 3.731c.302.317.7 1.034 1.158 1.449.061-.027.127-.05.197-.072-.225-.261-.54-.607-.587-.767-.232-.78.037-1.512.617-1.57.52-.052.966-.825 1.333-1.331.754-1.043 1.913-.869 1.855-1.39-.067-.305-.248-.398-.478-.398-.346 0-.802.21-1.146.224" fill="#2b3b4d"/><path d="M3.45 18.255c-.075.021-.149.041-.219.062-.063.017-.112.042-.197.072a.549.549 0 0 0-.355.485c-.057.496.415.885.813.999.505.144.547-.025.812.333.185.25.22.713.315 1.018.053.17.125.34.21.506.36.168.744.295 1.144.375.1-.588.054-1.381.186-1.724.27-.702.422-1.012.058-1.737-.803-.226-1.046-.298-1.855-.464a1.854 1.854 0 0 0-.36-.05c-.144 0-.263.04-.552.125M8.42 14.185c-.237.338-1.067.43-1.334.81-.207.297.007.88-.173 1.217-.084.155-.045.605.056.751.32.465.851.207 1.251.374.488.204.544.769.948 1.182.405.414-.517 1.052.236 2.557.08.162.174.28.275.361.509-.316.957-.72 1.326-1.189.114-.76-.143-1.003.178-1.7.198-.428.538-1.171.904-1.675a5.09 5.09 0 0 0-1.676-3.557.825.825 0 0 1-.368.001 2.027 2.027 0 0 0-.372-.036c-.756 0-.982.52-1.251.904" fill="#2b3b4d"/><path d="M6.399 22.518c-.17-.097-.382-.247-.58-.378-.082.073-.148.18-.214.265.227.077.533.084.794.113m-.894-.606c-.362-.27-1.26-1.12-1.631-1.633-.137.08-.29.3-.487.337-.078.015-.253.036-.304.015-.052-.022.011-.131.067-.204.097-.126.238-.29.445-.45-.442-.647-.652-1.12-.953-1.9-.174.108-.3.204-.452.325-.05.04-.191.065-.26.004-.123-.11-.125-.306.049-.43.071-.05.425-.294.507-.363-.217-.626-.4-1.449-.447-1.875a5.088 5.088 0 0 1-.406.308c-.082.023-.138-.003-.161-.008-.083.886.012 1.86.276 2.74.453 1.514 1.723 2.958 3.438 3.494.04-.06.237-.287.32-.36m-3.52-6.634a137.74 137.74 0 0 1-.048-.776c-.24.523-.385.838-.452 1.45.169-.299.5-.674.5-.674m2.573-3.745c.995-.412 1.965-.638 3.084-.485.125.017.114.122-.018.124l-.158.004c-.901.014-2.227.3-2.913.688-.015.457.072 1.183.164 1.755.623-.262 1.587-.53 2.319-.61a8.55 8.55 0 0 0-1.048-.908c-.068-.048-.102-.13-.102-.237.01-.2.18-.224.273-.2.304-.06.607-.126 1.123-.11 2.18-.096 4.173 1.136 4.933 2.541 1.927 3.043 0 7.241-2.521 8.36-1.079.477-2.004.684-3.71.446-1.708-.238-3.105-1.072-4.19-2.826-1.336-2.161-.584-4.679-.396-5.207.805-1.895 2.123-2.899 3.16-3.335m-2.255 2.303c-.029.228.002.648.059 1.15.464-.414 1.36-.954 2.108-1.284-.086-.57-.178-1.48-.169-1.722-.692.38-1.453 1.143-2.01 1.926m.114 1.539c.066.452.283 1.426.478 1.92.464-.349 1.515-.996 2.11-1.258-.208-.757-.348-1.234-.465-1.998-.84.373-1.729.953-2.123 1.336m.66 2.357c.275.785.541 1.384.89 1.878.406-.353 1.24-.91 1.878-1.216-.21-.451-.514-1.294-.725-1.926-.821.403-1.435.796-2.043 1.264m1.15 2.221c.431.554 1.108 1.257 1.58 1.646.446-.358.95-.693 1.371-.897-.362-.561-.898-1.377-1.123-1.879-.804.356-1.261.655-1.829 1.13m1.858 1.89c.172.173.851.623.851.623a7.346 7.346 0 0 0 1.431-.105c-.224-.256-.786-1.05-.956-1.317a5.957 5.957 0 0 0-1.326.8m2.759.401c.229-.073.813-.338.934-.418.029-.47.024-1.004.005-1.323-.614 0-1.478.179-1.973.386.287.462.683.971 1.034 1.355m1.258-.592c.46-.287.894-.617 1.208-1.014-.27-.068-.875-.15-1.174-.13 0 0-.01.717-.034 1.144m1.353-1.198a1.74 1.74 0 0 0 .268-.379c.05-.436.052-1.33.033-1.591-.526-.213-1.34-.382-1.935-.426.194.709.29 1.75.305 2.09.285.03 1.005.175 1.329.306m.773-2.023c-.025.083-.17.166-.238.145.01.147-.024.875-.062 1.156.101-.208.294-.723.352-.941l.082-.32a5.143 5.143 0 0 0 .107-2.45c-.266-1.374-.763-1.864-.937-2.082-.443-.24-1.112-.458-1.112-.458.607.82.817 1.205 1.18 2.182.21.109.591.32.639.378.038.046.039.128-.081.126-.1 0-.293-.096-.443-.136.16.532.283 1.525.274 2.191 0 0 .263.127.239.21M11.2 13.551c-.84-1.029-2.744-1.904-4.862-1.772.473.312.867.782 1.212 1.17.53-.048 1.64.039 2.058.154-.071-.084-.158-.167-.181-.217-.06-.127.083-.154.198-.081.145.092.312.203.445.338.245.055.85.262 1.13.408m.539 4.637c-.037-.663-.138-1.55-.385-2.166-.652-.262-1.543-.425-2.326-.433.242.563.523 1.503.66 2.108.565.067 1.45.227 2.05.491m-1.833-4.744a9.883 9.883 0 0 0-2.087-.137c.435.602.754 1.126 1.053 1.873.807.02 1.903.26 2.353.436-.268-.714-.778-1.621-1.319-2.172M6.21 18.289a6.923 6.923 0 0 1 3.08-.61c-.29-1.005-.456-1.47-.703-2.081a7.914 7.914 0 0 0-3.106.776s.338 1.086.73 1.915m3.188-.189c-1.203-.014-2.253.273-2.97.626.303.654.905 1.52 1.13 1.878a6.227 6.227 0 0 1 1.137-.306c.326-.05.76-.098 1.056-.093-.054-.762-.143-1.276-.353-2.105m-4.054-2.139a9.58 9.58 0 0 1 3.083-.77 6.774 6.774 0 0 0-1.102-1.826 8.408 8.408 0 0 0-2.53.632c.108.575.313 1.27.549 1.964" fill="#2b3b4d"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="M12 .784c7.116 3.533 6.1 16.778 0 19.427M.818 10.498h22.364M2.19 5.186c5.693.76 13.825.76 19.518 0M2.19 15.809c5.693-.759 13.825-.759 19.518 0M12 .784c-6.1 2.65-7.116 15.895 0 19.427" fill="none" stroke="#749fcf" stroke-width=".752"/><path transform="matrix(.94419 0 0 .81716 16.86 -.787)" d="M6.966 13.81A12.112 12.157 0 0 1-5.147 25.965a12.112 12.157 0 0 1-12.112-12.157A12.112 12.157 0 0 1-5.147 1.653 12.112 12.157 0 0 1 6.966 13.809z" fill="none" stroke="#5488c4" stroke-width="1.284"/><path d="M5.491 5.445L9.885 16.53l4.831-10.982 3.973-.016" overflow="visible" fill="none" stroke="#2b3b4d" stroke-width=".976" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 1.42 -9.788)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.19051 0 0 1.21859 5.718 1.298)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".936" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 10.522 -9.71)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 14.618 -9.7)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><g transform="translate(1.846 1.846) scale(.6923)"><rect y="19" x="19" width="13" ry="2.615" rx="2.615" height="13" fill="#5a8c5a"/><path d="M21.6 25.5h7.8m-3.9 3.9v-7.8" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#fff" stroke-width="2.6" stroke-linecap="round" stroke-linejoin="round"/><path d="M20.3 25.5h10.4v-2.6c0-2.6-.65-2.6-5.2-2.6s-5.2 0-5.2 2.6v2.6z" opacity=".3" fill="#fcffff" fill-rule="evenodd"/></g><path d="M13.5 17a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0" fill="#fff"/><path d="M4.825 13.085c-.394.016-.771.068-1.147.124a5.088 5.088 0 0 0-1.802 3.731c.302.317.7 1.034 1.158 1.449.061-.027.127-.05.197-.072-.225-.261-.54-.607-.587-.767-.232-.78.037-1.512.617-1.57.52-.052.966-.825 1.333-1.331.754-1.043 1.913-.869 1.855-1.39-.067-.305-.248-.398-.478-.398-.346 0-.802.21-1.146.224" fill="#2b3b4d"/><path d="M3.45 18.255c-.075.021-.149.041-.219.062-.063.017-.112.042-.197.072a.549.549 0 0 0-.355.485c-.057.496.415.885.813.999.505.144.547-.025.812.333.185.25.22.713.315 1.018.053.17.125.34.21.506.36.168.744.295 1.144.375.1-.588.054-1.381.186-1.724.27-.702.422-1.012.058-1.737-.803-.226-1.046-.298-1.855-.464a1.854 1.854 0 0 0-.36-.05c-.144 0-.263.04-.552.125m4.97-4.07c-.237.338-1.067.43-1.334.81-.207.297.007.88-.173 1.217-.084.155-.045.605.056.751.32.465.851.207 1.251.374.488.204.544.769.948 1.182.405.414-.517 1.052.236 2.557.08.162.174.28.275.361.509-.316.957-.72 1.326-1.189.114-.76-.143-1.003.178-1.7.198-.428.538-1.171.904-1.675a5.09 5.09 0 0 0-1.676-3.557.825.825 0 0 1-.368.001 2.027 2.027 0 0 0-.372-.036c-.756 0-.982.52-1.251.904" fill="#2b3b4d"/><path d="M6.399 22.518c-.17-.097-.382-.247-.58-.378-.082.073-.148.18-.214.265.227.077.533.084.794.113m-.894-.606c-.362-.27-1.26-1.12-1.631-1.633-.137.08-.29.3-.487.337-.078.015-.253.036-.304.015-.052-.022.011-.131.067-.204.097-.126.238-.29.445-.45-.442-.647-.652-1.12-.953-1.9-.174.108-.3.204-.452.325-.05.04-.191.065-.26.004-.123-.11-.125-.306.049-.43.071-.05.425-.294.507-.363-.217-.626-.4-1.449-.447-1.875a5.088 5.088 0 0 1-.406.308c-.082.023-.138-.003-.161-.008-.083.886.012 1.86.276 2.74.453 1.514 1.723 2.958 3.438 3.494.04-.06.237-.287.32-.36m-3.52-6.634a137.74 137.74 0 0 1-.048-.776c-.24.523-.385.838-.452 1.45.169-.299.5-.674.5-.674m2.573-3.745c.995-.412 1.965-.638 3.084-.485.125.017.114.122-.018.124l-.158.004c-.901.014-2.227.3-2.913.688-.015.457.072 1.183.164 1.755.623-.262 1.587-.53 2.319-.61a8.55 8.55 0 0 0-1.048-.908c-.068-.048-.102-.13-.102-.237.01-.2.18-.224.273-.2.304-.06.607-.126 1.123-.11 2.18-.096 4.173 1.136 4.933 2.541 1.927 3.043 0 7.241-2.521 8.36-1.079.477-2.004.684-3.71.446-1.708-.238-3.105-1.072-4.19-2.826-1.336-2.161-.584-4.679-.396-5.207.805-1.895 2.123-2.899 3.16-3.335m-2.255 2.303c-.029.228.002.648.059 1.15.464-.414 1.36-.954 2.108-1.284-.086-.57-.178-1.48-.169-1.722-.692.38-1.453 1.143-2.01 1.926m.114 1.539c.066.452.283 1.426.478 1.92.464-.349 1.515-.996 2.11-1.258-.208-.757-.348-1.234-.465-1.998-.84.373-1.729.953-2.123 1.336m.66 2.357c.275.785.541 1.384.89 1.878.406-.353 1.24-.91 1.878-1.216-.21-.451-.514-1.294-.725-1.926-.821.403-1.435.796-2.043 1.264m1.15 2.221a12.08 12.08 0 0 0 1.58 1.646c.446-.358.95-.693 1.371-.897-.362-.561-.898-1.377-1.123-1.879-.804.356-1.261.655-1.829 1.13m1.858 1.89c.172.173.851.623.851.623a7.346 7.346 0 0 0 1.431-.105c-.224-.256-.786-1.05-.956-1.317a5.957 5.957 0 0 0-1.326.8m2.759.401c.229-.073.813-.338.934-.418.029-.47.024-1.004.005-1.323-.614 0-1.478.179-1.973.386a9.88 9.88 0 0 0 1.034 1.355m1.258-.592c.46-.287.894-.617 1.208-1.014-.27-.068-.875-.15-1.174-.13 0 0-.01.717-.034 1.144m1.353-1.198a1.74 1.74 0 0 0 .268-.379c.05-.436.052-1.33.033-1.591-.526-.213-1.34-.382-1.935-.426.194.709.29 1.75.305 2.09.285.03 1.005.175 1.329.306m.773-2.023c-.025.083-.17.166-.238.145.01.147-.024.875-.062 1.156.101-.208.294-.723.352-.941l.082-.32a5.143 5.143 0 0 0 .107-2.45c-.266-1.374-.763-1.864-.937-2.082-.443-.24-1.112-.458-1.112-.458.607.82.817 1.205 1.18 2.182.21.109.591.32.639.378.038.046.039.128-.081.126-.1 0-.293-.096-.443-.136.16.532.283 1.525.274 2.191 0 0 .263.127.239.21M11.2 13.551c-.84-1.029-2.744-1.904-4.862-1.772.473.312.867.782 1.212 1.17.53-.048 1.64.039 2.058.154-.071-.084-.158-.167-.181-.217-.06-.127.083-.154.198-.081.145.092.312.203.445.338.245.055.85.262 1.13.408m.539 4.637c-.037-.663-.138-1.55-.385-2.166-.652-.262-1.543-.425-2.326-.433.242.563.523 1.503.66 2.108.565.067 1.45.227 2.05.491m-1.833-4.744a9.883 9.883 0 0 0-2.087-.137c.435.602.754 1.126 1.053 1.873.807.02 1.903.26 2.353.436-.268-.714-.778-1.621-1.319-2.172M6.21 18.289a6.923 6.923 0 0 1 3.08-.61c-.29-1.005-.456-1.47-.703-2.081a7.914 7.914 0 0 0-3.106.776s.338 1.086.73 1.915m3.188-.189c-1.203-.014-2.253.273-2.97.626.303.654.905 1.52 1.13 1.878a6.227 6.227 0 0 1 1.137-.306c.326-.05.76-.098 1.056-.093-.054-.762-.143-1.276-.353-2.105m-4.054-2.139a9.58 9.58 0 0 1 3.083-.77 6.774 6.774 0 0 0-1.102-1.826 8.408 8.408 0 0 0-2.53.632c.108.575.313 1.27.549 1.964" fill="#2b3b4d"/></svg>
diff --git a/images/themes/default/mActionAddOgrLayer.svg b/images/themes/default/mActionAddOgrLayer.svg
index 954a6d1b7394..6e8040ff9b63 100644
--- a/images/themes/default/mActionAddOgrLayer.svg
+++ b/images/themes/default/mActionAddOgrLayer.svg
@@ -1,15 +1 @@
-<svg height="32" width="32" xmlns="http://www.w3.org/2000/svg">
-<g>
-<path d="m3.1572212 3.1572206l8.5503638 20.5920974 9.403384-20.4000556 7.731811-.0292578" style="fill:none;stroke:#415a75;stroke-width:1.78710628;stroke-linecap:round;stroke-linejoin:round;overflow:visible"/>
-<path d="m4.5 12.5a1 1 0 1 1 -2 0 1 1 0 1 1  2 0z" style="fill:#eeeeec;fill-rule:evenodd;stroke:#415a75;stroke-width:.78947365;stroke-linecap:round;stroke-linejoin:round;overflow:visible" transform="matrix(2.263668 0 0 2.263668 -4.7656167 -25.138629)"/>
-<path d="m4.5 12.5a1 1 0 1 1 -2 0 1 1 0 1 1  2 0z" style="fill:#eeeeec;fill-rule:evenodd;stroke:#415a75;stroke-width:1.05263162;stroke-linecap:round;stroke-linejoin:round;overflow:visible" transform="matrix(2.263668 0 0 2.263668 3.8127783 -5.6260389)"/>
-<path d="m4.5 12.5a1 1 0 1 1 -2 0 1 1 0 1 1  2 0z" style="fill:#eeeeec;fill-rule:evenodd;stroke:#415a75;stroke-width:.78947365;stroke-linecap:round;stroke-linejoin:round;overflow:visible" transform="matrix(2.263668 0 0 2.263668 12.949214 -24.994533)"/>
-<path d="m4.5 12.5a1 1 0 1 1 -2 0 1 1 0 1 1  2 0z" style="fill:#eeeeec;fill-rule:evenodd;stroke:#415a75;stroke-width:.78947365;stroke-linecap:round;stroke-linejoin:round;overflow:visible" transform="matrix(2.263668 0 0 2.263668 20.919941 -24.975845)"/>
-<g>
-<rect fill="#5a8c5a" height="13" rx="2.6149371" ry="2.6149368" width="13" x="19" y="19"/>
-<path d="m21.6 25.499999l7.8 0" style="fill:#fff;fill-rule:evenodd;stroke:#fff;stroke-width:2.5999999;stroke-linecap:round;stroke-linejoin:round;overflow:visible"/>
-<path d="m25.5 29.399999l0-7.799999" style="fill:#fff;fill-rule:evenodd;stroke:#fff;stroke-width:2.5999999;stroke-linecap:round;stroke-linejoin:round;overflow:visible"/>
-<path d="m20.3 25.499999h10.4c0 0 0 0 0-2.6 0-2.599999-.65-2.599999-5.2-2.599999-4.55 0-5.2 0-5.2 2.599999 0 2.6 0 2.6 0 2.6z" fill="#fcffff" fill-rule="evenodd" opacity=".3"/>
-</g>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="M2.575 2.575l6.351 15.296 6.985-15.153 5.744-.022" overflow="visible" fill="none" stroke="#2b3b4d" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M4.257 2.575a1.681 1.681 0 1 1-3.363 0 1.681 1.681 0 1 1 3.363 0zM10.629 17.07a1.681 1.681 0 1 1-3.363 0 1.681 1.681 0 1 1 3.363 0zM17.415 2.682a1.681 1.681 0 1 1-3.363 0 1.681 1.681 0 1 1 3.363 0zM23.336 2.696a1.681 1.681 0 1 1-3.363 0 1.681 1.681 0 1 1 3.363 0z" overflow="visible" fill="#eeeeec" fill-rule="evenodd" stroke="#2b3b4d" stroke-linecap="round" stroke-linejoin="round"/><g transform="matrix(.6923 0 0 .6923 1.846 1.846)"><rect y="19" x="19" width="13" ry="2.615" rx="2.615" height="13" fill="#5a8c5a"/><path d="M21.6 25.5h7.8M25.5 29.4v-7.8" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#fff" stroke-width="2.6" stroke-linecap="round" stroke-linejoin="round"/><path d="M20.3 25.5h10.4v-2.6c0-2.6-.65-2.6-5.2-2.6s-5.2 0-5.2 2.6v2.6z" opacity=".3" fill="#fcffff" fill-rule="evenodd"/></g></svg>
diff --git a/images/themes/default/mActionAddWfsLayer.svg b/images/themes/default/mActionAddWfsLayer.svg
index 03cbcb2739e0..2938aa2305b7 100644
--- a/images/themes/default/mActionAddWfsLayer.svg
+++ b/images/themes/default/mActionAddWfsLayer.svg
@@ -1,23 +1 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg">
-<g transform="translate(0 -8)">
-<g transform="matrix(.75161647 0 0 .75161647 -.02586348 7.9745661)">
-<path d="m16.000001 1.0775438c9.467477 4.6992805 8.114981 22.3215822 0 25.8460432" fill="none" stroke="#749fcf"/>
-<path d="m1.1225356 14.000566h29.7549294" fill="none" stroke="#749fcf"/>
-<path d="m2.9484075 6.9340877c7.5739815 1.0094969 18.3939565 1.0094969 25.9679385 0" fill="none" stroke="#749fcf"/>
-<path d="m2.9484075 21.067042c7.5739815-1.009496 18.3939565-1.009496 25.9679385 0" fill="none" stroke="#749fcf"/>
-<path d="m16.000001 1.0775438c-8.1149812 3.5244605-9.467478 21.1467632 0 25.8460432" fill="none" stroke="#749fcf"/>
-<path d="m6.9656949 13.809332c0 6.713955-5.4228716 12.15669-12.1123228 12.15669-6.6894511 0-12.1123231-5.442735-12.1123231-12.15669 0-6.7139549 5.422872-12.1566907 12.1123231-12.1566907 6.6894512 0 12.1123228 5.4427358 12.1123228 12.1566907z" fill="none" stroke="#5488c4" stroke-width="1.28353083" transform="matrix(1.2562074 0 0 1.0871977 22.465232 -1.0129089)"/>
-<path d="m7.3400991 7.2779254l5.8453019 14.7485086 6.428455-14.6109639 5.285714-.0209549" style="fill:none;stroke:#172739;stroke-width:1.29794168;stroke-linecap:round;stroke-linejoin:round;overflow:visible"/>
-<path d="m4.5 12.5c0 .552285-.4477153 1-1 1-.5522847 0-1-.447715-1-1 0-.552285.4477153-1 1-1 .5522847 0 1 .447715 1 1z" style="fill:#fff;fill-rule:evenodd;stroke:#172739;stroke-width:.94698602;stroke-linecap:round;stroke-linejoin:round;overflow:visible" transform="matrix(1.5475161 0 0 1.6212881 1.923793 -12.988176)"/>
-<path d="m4.5 12.5c0 .552285-.4477153 1-1 1-.5522847 0-1-.447715-1-1 0-.552285.4477153-1 1-1 .5522847 0 1 .447715 1 1z" style="fill:#fff;fill-rule:evenodd;stroke:#172739;stroke-width:.93603462;stroke-linecap:round;stroke-linejoin:round;overflow:visible" transform="matrix(1.5839392 0 0 1.6212881 7.641614 1.7603321)"/>
-<path d="m4.5 12.5c0 .552285-.4477153 1-1 1-.5522847 0-1-.447715-1-1 0-.552285.4477153-1 1-1 .5522847 0 1 .447715 1 1z" style="fill:#fff;fill-rule:evenodd;stroke:#172739;stroke-width:.94698602;stroke-linecap:round;stroke-linejoin:round;overflow:visible" transform="matrix(1.5475161 0 0 1.6212881 14.034218 -12.884972)"/>
-<path d="m4.5 12.5c0 .552285-.4477153 1-1 1-.5522847 0-1-.447715-1-1 0-.552285.4477153-1 1-1 .5522847 0 1 .447715 1 1z" style="fill:#fff;fill-rule:evenodd;stroke:#172739;stroke-width:.94698602;stroke-linecap:round;stroke-linejoin:round;overflow:visible" transform="matrix(1.5475161 0 0 1.6212881 19.483264 -12.871586)"/>
-</g>
-<g transform="matrix(.69230769 0 0 .69230769 1.8461539 9.8461539)">
-<rect fill="#5a8c5a" height="13" rx="2.6149371" ry="2.6149368" width="13" x="19" y="19"/>
-<path d="m21.6 25.499999l7.8 0" style="fill:#fff;fill-rule:evenodd;stroke:#fff;stroke-width:2.5999999;stroke-linecap:round;stroke-linejoin:round;overflow:visible"/>
-<path d="m25.5 29.399999l0-7.799999" style="fill:#fff;fill-rule:evenodd;stroke:#fff;stroke-width:2.5999999;stroke-linecap:round;stroke-linejoin:round;overflow:visible"/>
-<path d="m20.3 25.499999h10.4c0 0 0 0 0-2.6 0-2.599999-.65-2.599999-5.2-2.599999-4.55 0-5.2 0-5.2 2.599999 0 2.6 0 2.6 0 2.6z" fill="#fcffff" fill-rule="evenodd" opacity=".3"/>
-</g>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="M12 .784c7.116 3.533 6.1 16.778 0 19.427M.818 10.498h22.364M2.19 5.186c5.693.76 13.825.76 19.518 0M2.19 15.809c5.693-.759 13.825-.759 19.518 0M12 .784c-6.1 2.65-7.116 15.895 0 19.427" fill="none" stroke="#749fcf" stroke-width=".75162"/><path transform="matrix(.94419 0 0 .81716 16.86 -.787)" d="M6.966 13.81c0 6.713-5.423 12.156-12.113 12.156-6.69 0-12.112-5.443-12.112-12.157S-11.836 1.653-5.147 1.653c6.69 0 12.113 5.442 12.113 12.156z" fill="none" stroke="#5488c4" stroke-width="1.284"/><path d="M5.491 5.445L9.885 16.53l4.831-10.982 3.973-.016" overflow="visible" fill="none" stroke="#2b3b4d" stroke-width=".97560276" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 1.42 -9.788)" d="M4.5 12.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.19051 0 0 1.21859 5.718 1.298)" d="M4.5 12.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".936" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 10.522 -9.71)" d="M4.5 12.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 14.618 -9.7)" d="M4.5 12.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><g transform="matrix(.6923 0 0 .6923 1.846 1.846)"><rect y="19" x="19" width="13" ry="2.615" rx="2.615" height="13" fill="#5a8c5a"/><path d="M21.6 25.5h7.8M25.5 29.4v-7.8" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#fff" stroke-width="2.6" stroke-linecap="round" stroke-linejoin="round"/><path d="M20.3 25.5h10.4v-2.6c0-2.6-.65-2.6-5.2-2.6s-5.2 0-5.2 2.6v2.6z" opacity=".3" fill="#fcffff" fill-rule="evenodd"/></g></svg>
diff --git a/images/themes/default/mIconAfs.svg b/images/themes/default/mIconAfs.svg
index 263385170047..3a88f43b7bb6 100644
--- a/images/themes/default/mIconAfs.svg
+++ b/images/themes/default/mIconAfs.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><linearGradient id="a"><stop offset="0" stop-color="#b2d234"/><stop offset=".961" stop-color="#009e46"/><stop offset="1" stop-color="#009e46"/></linearGradient><path d="M12 2.287c7.116 3.532 6.1 16.777 0 19.426M.818 12h22.364M2.19 6.689c5.693.758 13.825.758 19.518 0M2.19 17.311c5.693-.758 13.825-.758 19.518 0M12 2.287C5.9 4.936 4.884 18.18 12 21.713" fill="none" stroke="#749fcf" stroke-width=".75162"/><path transform="matrix(.94419 0 0 .81716 16.86 .716)" d="M6.966 13.81A12.112 12.157 0 0 1-5.147 25.965a12.112 12.157 0 0 1-12.112-12.157A12.112 12.157 0 0 1-5.147 1.653 12.112 12.157 0 0 1 6.966 13.809z" fill="none" stroke="#5488c4" stroke-width="1.284"/><path d="M5.491 6.947l4.394 11.085 4.831-10.981 3.973-.016" overflow="visible" fill="none" stroke="#172739" stroke-width=".97560276" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 1.42 -8.285)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#172739" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.19051 0 0 1.21859 5.718 2.8)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#172739" stroke-width=".936" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 10.522 -8.208)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#172739" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 14.618 -8.198)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#172739" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><g><path d="M13.5 17a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0" fill="#fff"/><path d="M4.825 13.085c-.394.016-.771.068-1.147.124a5.088 5.088 0 0 0-1.802 3.731c.302.317.7 1.034 1.158 1.449.061-.027.127-.05.197-.072-.225-.261-.54-.607-.587-.767-.232-.78.037-1.512.617-1.57.52-.052.966-.825 1.333-1.331.754-1.043 1.913-.869 1.855-1.39-.067-.305-.248-.398-.478-.398-.346 0-.802.21-1.146.224" fill="#2b3b4d"/><path d="M3.45 18.255c-.075.021-.149.041-.219.062-.063.017-.112.042-.197.072a.549.549 0 0 0-.355.485c-.057.496.415.885.813.999.505.144.547-.025.812.333.185.25.22.713.315 1.018.053.17.125.34.21.506.36.168.744.295 1.144.375.1-.588.054-1.381.186-1.724.27-.702.422-1.012.058-1.737-.803-.226-1.046-.298-1.855-.464a1.854 1.854 0 0 0-.36-.05c-.144 0-.263.04-.552.125M8.42 14.185c-.237.338-1.067.43-1.334.81-.207.297.007.88-.173 1.217-.084.155-.045.605.056.751.32.465.851.207 1.251.374.488.204.544.769.948 1.182.405.414-.517 1.052.236 2.557.08.162.174.28.275.361.509-.316.957-.72 1.326-1.189.114-.76-.143-1.003.178-1.7.198-.428.538-1.171.904-1.675a5.09 5.09 0 0 0-1.676-3.557.825.825 0 0 1-.368.001 2.027 2.027 0 0 0-.372-.036c-.756 0-.982.52-1.251.904" fill="#2b3b4d"/><path d="M6.399 22.518c-.17-.097-.382-.247-.58-.378-.082.073-.148.18-.214.265.227.077.533.084.794.113m-.894-.606c-.362-.27-1.26-1.12-1.631-1.633-.137.08-.29.3-.487.337-.078.015-.253.036-.304.015-.052-.022.011-.131.067-.204.097-.126.238-.29.445-.45-.442-.647-.652-1.12-.953-1.9-.174.108-.3.204-.452.325-.05.04-.191.065-.26.004-.123-.11-.125-.306.049-.43.071-.05.425-.294.507-.363-.217-.626-.4-1.449-.447-1.875a5.088 5.088 0 0 1-.406.308c-.082.023-.138-.003-.161-.008-.083.886.012 1.86.276 2.74.453 1.514 1.723 2.958 3.438 3.494.04-.06.237-.287.32-.36m-3.52-6.634a137.74 137.74 0 0 1-.048-.776c-.24.523-.385.838-.452 1.45.169-.299.5-.674.5-.674m2.573-3.745c.995-.412 1.965-.638 3.084-.485.125.017.114.122-.018.124l-.158.004c-.901.014-2.227.3-2.913.688-.015.457.072 1.183.164 1.755.623-.262 1.587-.53 2.319-.61a8.55 8.55 0 0 0-1.048-.908c-.068-.048-.102-.13-.102-.237.01-.2.18-.224.273-.2.304-.06.607-.126 1.123-.11 2.18-.096 4.173 1.136 4.933 2.541 1.927 3.043 0 7.241-2.521 8.36-1.079.477-2.004.684-3.71.446-1.708-.238-3.105-1.072-4.19-2.826-1.336-2.161-.584-4.679-.396-5.207.805-1.895 2.123-2.899 3.16-3.335m-2.255 2.303c-.029.228.002.648.059 1.15.464-.414 1.36-.954 2.108-1.284-.086-.57-.178-1.48-.169-1.722-.692.38-1.453 1.143-2.01 1.926m.114 1.539c.066.452.283 1.426.478 1.92.464-.349 1.515-.996 2.11-1.258-.208-.757-.348-1.234-.465-1.998-.84.373-1.729.953-2.123 1.336m.66 2.357c.275.785.541 1.384.89 1.878.406-.353 1.24-.91 1.878-1.216-.21-.451-.514-1.294-.725-1.926-.821.403-1.435.796-2.043 1.264m1.15 2.221c.431.554 1.108 1.257 1.58 1.646.446-.358.95-.693 1.371-.897-.362-.561-.898-1.377-1.123-1.879-.804.356-1.261.655-1.829 1.13m1.858 1.89c.172.173.851.623.851.623a7.346 7.346 0 0 0 1.431-.105c-.224-.256-.786-1.05-.956-1.317a5.957 5.957 0 0 0-1.326.8m2.759.401c.229-.073.813-.338.934-.418.029-.47.024-1.004.005-1.323-.614 0-1.478.179-1.973.386.287.462.683.971 1.034 1.355m1.258-.592c.46-.287.894-.617 1.208-1.014-.27-.068-.875-.15-1.174-.13 0 0-.01.717-.034 1.144m1.353-1.198a1.74 1.74 0 0 0 .268-.379c.05-.436.052-1.33.033-1.591-.526-.213-1.34-.382-1.935-.426.194.709.29 1.75.305 2.09.285.03 1.005.175 1.329.306m.773-2.023c-.025.083-.17.166-.238.145.01.147-.024.875-.062 1.156.101-.208.294-.723.352-.941l.082-.32a5.143 5.143 0 0 0 .107-2.45c-.266-1.374-.763-1.864-.937-2.082-.443-.24-1.112-.458-1.112-.458.607.82.817 1.205 1.18 2.182.21.109.591.32.639.378.038.046.039.128-.081.126-.1 0-.293-.096-.443-.136.16.532.283 1.525.274 2.191 0 0 .263.127.239.21M11.2 13.551c-.84-1.029-2.744-1.904-4.862-1.772.473.312.867.782 1.212 1.17.53-.048 1.64.039 2.058.154-.071-.084-.158-.167-.181-.217-.06-.127.083-.154.198-.081.145.092.312.203.445.338.245.055.85.262 1.13.408m.539 4.637c-.037-.663-.138-1.55-.385-2.166-.652-.262-1.543-.425-2.326-.433.242.563.523 1.503.66 2.108.565.067 1.45.227 2.05.491m-1.833-4.744a9.883 9.883 0 0 0-2.087-.137c.435.602.754 1.126 1.053 1.873.807.02 1.903.26 2.353.436-.268-.714-.778-1.621-1.319-2.172M6.21 18.289a6.923 6.923 0 0 1 3.08-.61c-.29-1.005-.456-1.47-.703-2.081a7.914 7.914 0 0 0-3.106.776s.338 1.086.73 1.915m3.188-.189c-1.203-.014-2.253.273-2.97.626.303.654.905 1.52 1.13 1.878a6.227 6.227 0 0 1 1.137-.306c.326-.05.76-.098 1.056-.093-.054-.762-.143-1.276-.353-2.105m-4.054-2.139a9.58 9.58 0 0 1 3.083-.77 6.774 6.774 0 0 0-1.102-1.826 8.408 8.408 0 0 0-2.53.632c.108.575.313 1.27.549 1.964" fill="#2b3b4d"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="M12 2.287c7.116 3.532 6.1 16.777 0 19.426M.818 12h22.364M2.19 6.689c5.693.758 13.825.758 19.518 0M2.19 17.311c5.693-.758 13.825-.758 19.518 0M12 2.287C5.9 4.936 4.884 18.18 12 21.713" fill="none" stroke="#749fcf" stroke-width=".752"/><path transform="matrix(.94419 0 0 .81716 16.86 .716)" d="M6.966 13.81A12.112 12.157 0 0 1-5.147 25.965a12.112 12.157 0 0 1-12.112-12.157A12.112 12.157 0 0 1-5.147 1.653 12.112 12.157 0 0 1 6.966 13.809z" fill="none" stroke="#5488c4" stroke-width="1.284"/><path d="M5.491 6.947l4.394 11.085 4.831-10.981 3.973-.016" overflow="visible" fill="none" stroke="#2b3b4d" stroke-width=".976" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 1.42 -8.285)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.19051 0 0 1.21859 5.718 2.8)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".936" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 10.522 -8.208)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><path transform="matrix(1.16314 0 0 1.21859 14.618 -8.198)" d="M4.5 12.5a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round"/><path d="M13.5 17a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0" fill="#fff"/><path d="M4.825 13.085c-.394.016-.771.068-1.147.124a5.088 5.088 0 0 0-1.802 3.731c.302.317.7 1.034 1.158 1.449.061-.027.127-.05.197-.072-.225-.261-.54-.607-.587-.767-.232-.78.037-1.512.617-1.57.52-.052.966-.825 1.333-1.331.754-1.043 1.913-.869 1.855-1.39-.067-.305-.248-.398-.478-.398-.346 0-.802.21-1.146.224" fill="#2b3b4d"/><path d="M3.45 18.255c-.075.021-.149.041-.219.062-.063.017-.112.042-.197.072a.549.549 0 0 0-.355.485c-.057.496.415.885.813.999.505.144.547-.025.812.333.185.25.22.713.315 1.018.053.17.125.34.21.506.36.168.744.295 1.144.375.1-.588.054-1.381.186-1.724.27-.702.422-1.012.058-1.737-.803-.226-1.046-.298-1.855-.464a1.854 1.854 0 0 0-.36-.05c-.144 0-.263.04-.552.125m4.97-4.07c-.237.338-1.067.43-1.334.81-.207.297.007.88-.173 1.217-.084.155-.045.605.056.751.32.465.851.207 1.251.374.488.204.544.769.948 1.182.405.414-.517 1.052.236 2.557.08.162.174.28.275.361.509-.316.957-.72 1.326-1.189.114-.76-.143-1.003.178-1.7.198-.428.538-1.171.904-1.675a5.09 5.09 0 0 0-1.676-3.557.825.825 0 0 1-.368.001 2.027 2.027 0 0 0-.372-.036c-.756 0-.982.52-1.251.904" fill="#2b3b4d"/><path d="M6.399 22.518c-.17-.097-.382-.247-.58-.378-.082.073-.148.18-.214.265.227.077.533.084.794.113m-.894-.606c-.362-.27-1.26-1.12-1.631-1.633-.137.08-.29.3-.487.337-.078.015-.253.036-.304.015-.052-.022.011-.131.067-.204.097-.126.238-.29.445-.45-.442-.647-.652-1.12-.953-1.9-.174.108-.3.204-.452.325-.05.04-.191.065-.26.004-.123-.11-.125-.306.049-.43.071-.05.425-.294.507-.363-.217-.626-.4-1.449-.447-1.875a5.088 5.088 0 0 1-.406.308c-.082.023-.138-.003-.161-.008-.083.886.012 1.86.276 2.74.453 1.514 1.723 2.958 3.438 3.494.04-.06.237-.287.32-.36m-3.52-6.634a137.74 137.74 0 0 1-.048-.776c-.24.523-.385.838-.452 1.45.169-.299.5-.674.5-.674m2.573-3.745c.995-.412 1.965-.638 3.084-.485.125.017.114.122-.018.124l-.158.004c-.901.014-2.227.3-2.913.688-.015.457.072 1.183.164 1.755.623-.262 1.587-.53 2.319-.61a8.55 8.55 0 0 0-1.048-.908c-.068-.048-.102-.13-.102-.237.01-.2.18-.224.273-.2.304-.06.607-.126 1.123-.11 2.18-.096 4.173 1.136 4.933 2.541 1.927 3.043 0 7.241-2.521 8.36-1.079.477-2.004.684-3.71.446-1.708-.238-3.105-1.072-4.19-2.826-1.336-2.161-.584-4.679-.396-5.207.805-1.895 2.123-2.899 3.16-3.335m-2.255 2.303c-.029.228.002.648.059 1.15.464-.414 1.36-.954 2.108-1.284-.086-.57-.178-1.48-.169-1.722-.692.38-1.453 1.143-2.01 1.926m.114 1.539c.066.452.283 1.426.478 1.92.464-.349 1.515-.996 2.11-1.258-.208-.757-.348-1.234-.465-1.998-.84.373-1.729.953-2.123 1.336m.66 2.357c.275.785.541 1.384.89 1.878.406-.353 1.24-.91 1.878-1.216-.21-.451-.514-1.294-.725-1.926-.821.403-1.435.796-2.043 1.264m1.15 2.221a12.08 12.08 0 0 0 1.58 1.646c.446-.358.95-.693 1.371-.897-.362-.561-.898-1.377-1.123-1.879-.804.356-1.261.655-1.829 1.13m1.858 1.89c.172.173.851.623.851.623a7.346 7.346 0 0 0 1.431-.105c-.224-.256-.786-1.05-.956-1.317a5.957 5.957 0 0 0-1.326.8m2.759.401c.229-.073.813-.338.934-.418.029-.47.024-1.004.005-1.323-.614 0-1.478.179-1.973.386a9.88 9.88 0 0 0 1.034 1.355m1.258-.592c.46-.287.894-.617 1.208-1.014-.27-.068-.875-.15-1.174-.13 0 0-.01.717-.034 1.144m1.353-1.198a1.74 1.74 0 0 0 .268-.379c.05-.436.052-1.33.033-1.591-.526-.213-1.34-.382-1.935-.426.194.709.29 1.75.305 2.09.285.03 1.005.175 1.329.306m.773-2.023c-.025.083-.17.166-.238.145.01.147-.024.875-.062 1.156.101-.208.294-.723.352-.941l.082-.32a5.143 5.143 0 0 0 .107-2.45c-.266-1.374-.763-1.864-.937-2.082-.443-.24-1.112-.458-1.112-.458.607.82.817 1.205 1.18 2.182.21.109.591.32.639.378.038.046.039.128-.081.126-.1 0-.293-.096-.443-.136.16.532.283 1.525.274 2.191 0 0 .263.127.239.21M11.2 13.551c-.84-1.029-2.744-1.904-4.862-1.772.473.312.867.782 1.212 1.17.53-.048 1.64.039 2.058.154-.071-.084-.158-.167-.181-.217-.06-.127.083-.154.198-.081.145.092.312.203.445.338.245.055.85.262 1.13.408m.539 4.637c-.037-.663-.138-1.55-.385-2.166-.652-.262-1.543-.425-2.326-.433.242.563.523 1.503.66 2.108.565.067 1.45.227 2.05.491m-1.833-4.744a9.883 9.883 0 0 0-2.087-.137c.435.602.754 1.126 1.053 1.873.807.02 1.903.26 2.353.436-.268-.714-.778-1.621-1.319-2.172M6.21 18.289a6.923 6.923 0 0 1 3.08-.61c-.29-1.005-.456-1.47-.703-2.081a7.914 7.914 0 0 0-3.106.776s.338 1.086.73 1.915m3.188-.189c-1.203-.014-2.253.273-2.97.626.303.654.905 1.52 1.13 1.878a6.227 6.227 0 0 1 1.137-.306c.326-.05.76-.098 1.056-.093-.054-.762-.143-1.276-.353-2.105m-4.054-2.139a9.58 9.58 0 0 1 3.083-.77 6.774 6.774 0 0 0-1.102-1.826 8.408 8.408 0 0 0-2.53.632c.108.575.313 1.27.549 1.964" fill="#2b3b4d"/></svg>
diff --git a/images/themes/default/mIconWfs.svg b/images/themes/default/mIconWfs.svg
index c2efdef4034a..9f6645d5c060 100644
--- a/images/themes/default/mIconWfs.svg
+++ b/images/themes/default/mIconWfs.svg
@@ -1,15 +1 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(.75161647 0 0 .75161647 -.02586348 1.4769448)">
-<path d="m16.000001 1.0775438c9.467477 4.6992805 8.114981 22.3215822 0 25.8460432" fill="none" stroke="#749fcf"/>
-<path d="m1.1225356 14.000566h29.7549294" fill="none" stroke="#749fcf"/>
-<path d="m2.9484075 6.9340877c7.5739815 1.0094969 18.3939565 1.0094969 25.9679385 0" fill="none" stroke="#749fcf"/>
-<path d="m2.9484075 21.067042c7.5739815-1.009496 18.3939565-1.009496 25.9679385 0" fill="none" stroke="#749fcf"/>
-<path d="m16.000001 1.0775438c-8.1149812 3.5244605-9.467478 21.1467632 0 25.8460432" fill="none" stroke="#749fcf"/>
-<path d="m6.9656949 13.809332c0 6.713955-5.4228716 12.15669-12.1123228 12.15669-6.6894511 0-12.1123231-5.442735-12.1123231-12.15669 0-6.7139549 5.422872-12.1566907 12.1123231-12.1566907 6.6894512 0 12.1123228 5.4427358 12.1123228 12.1566907z" fill="none" stroke="#5488c4" stroke-width="1.28353083" transform="matrix(1.2562074 0 0 1.0871977 22.465232 -1.0129089)"/>
-<path d="m7.3400991 7.2779254l5.8453019 14.7485086 6.428455-14.6109639 5.285714-.0209549" style="fill:none;stroke:#172739;stroke-width:1.29794168;stroke-linecap:round;stroke-linejoin:round;overflow:visible"/>
-<path d="m4.5 12.5c0 .552285-.4477153 1-1 1-.5522847 0-1-.447715-1-1 0-.552285.4477153-1 1-1 .5522847 0 1 .447715 1 1z" style="fill:#fff;fill-rule:evenodd;stroke:#172739;stroke-width:.94698602;stroke-linecap:round;stroke-linejoin:round;overflow:visible" transform="matrix(1.5475161 0 0 1.6212881 1.923793 -12.988176)"/>
-<path d="m4.5 12.5c0 .552285-.4477153 1-1 1-.5522847 0-1-.447715-1-1 0-.552285.4477153-1 1-1 .5522847 0 1 .447715 1 1z" style="fill:#fff;fill-rule:evenodd;stroke:#172739;stroke-width:.93603462;stroke-linecap:round;stroke-linejoin:round;overflow:visible" transform="matrix(1.5839392 0 0 1.6212881 7.641614 1.7603321)"/>
-<path d="m4.5 12.5c0 .552285-.4477153 1-1 1-.5522847 0-1-.447715-1-1 0-.552285.4477153-1 1-1 .5522847 0 1 .447715 1 1z" style="fill:#fff;fill-rule:evenodd;stroke:#172739;stroke-width:.94698602;stroke-linecap:round;stroke-linejoin:round;overflow:visible" transform="matrix(1.5475161 0 0 1.6212881 14.034218 -12.884972)"/>
-<path d="m4.5 12.5c0 .552285-.4477153 1-1 1-.5522847 0-1-.447715-1-1 0-.552285.4477153-1 1-1 .5522847 0 1 .447715 1 1z" style="fill:#fff;fill-rule:evenodd;stroke:#172739;stroke-width:.94698602;stroke-linecap:round;stroke-linejoin:round;overflow:visible" transform="matrix(1.5475161 0 0 1.6212881 19.483264 -12.871586)"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="M12 2.287c7.116 3.532 6.1 16.777 0 19.426M.818 12h22.364M2.19 6.689c5.693.758 13.825.758 19.518 0M2.19 17.311c5.693-.758 13.825-.758 19.518 0M12 2.287C5.9 4.936 4.884 18.18 12 21.713" fill="none" stroke="#749fcf" stroke-width=".75162"/><path d="M6.966 13.81c0 6.713-5.423 12.156-12.113 12.156-6.69 0-12.112-5.443-12.112-12.157S-11.836 1.653-5.147 1.653c6.69 0 12.113 5.442 12.113 12.156z" fill="none" stroke="#5488c4" stroke-width="1.284" transform="matrix(.94419 0 0 .81716 16.86 .716)"/><path d="M5.491 6.947l4.394 11.085 4.831-10.981 3.973-.016" fill="none" stroke="#2b3b4d" stroke-width=".97560276" stroke-linecap="round" stroke-linejoin="round" overflow="visible"/><path d="M4.5 12.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" transform="matrix(1.16314 0 0 1.21859 1.42 -8.285)" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round" overflow="visible"/><path d="M4.5 12.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" transform="matrix(1.19051 0 0 1.21859 5.718 2.8)" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".936" stroke-linecap="round" stroke-linejoin="round" overflow="visible"/><path d="M4.5 12.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" transform="matrix(1.16314 0 0 1.21859 10.522 -8.208)" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round" overflow="visible"/><path d="M4.5 12.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" transform="matrix(1.16314 0 0 1.21859 14.618 -8.198)" fill="#fff" fill-rule="evenodd" stroke="#2b3b4d" stroke-width=".947" stroke-linecap="round" stroke-linejoin="round" overflow="visible"/></svg>