diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6622f4..ceeb636 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,12 +4,10 @@
 
 ### Features
 
-- ASAB WebUI submodule version bump [[9fc06df](https://github.com/TeskaLabs/asab-webui/commit/9fc06df046dcb114262cfd04506fb0dcef22325b)] commit (INDIGO Sprint 230804, [!29](https://github.com/TeskaLabs/seacat-auth-webui/pull/29))
+- ASAB WebUI submodule version bump [[fdc969f](https://github.com/TeskaLabs/asab-webui/commit/fdc969f8c6eb41a9c96abfa887d9ed54e9a4456f)] commit (INDIGO Sprint 230804, [!41](https://github.com/TeskaLabs/seacat-auth-webui/pull/41))
 
 ### Refactoring
 
-- Changed icons from Coreui.io icons to Atlas icons. (INDIGO Sprint 230804, [!29](https://github.com/TeskaLabs/seacat-auth-webui/pull/29))
-
 - Change visibility of username to readonly and focus on password input field after wrong password. (INDIGO Sprint 230623, [!35](https://github.com/TeskaLabs/seacat-auth-webui/pull/35))
 
 ## v23.29-alpha
diff --git a/asab-webui b/asab-webui
index 9fc06df..fdc969f 160000
--- a/asab-webui
+++ b/asab-webui
@@ -1 +1 @@
-Subproject commit 9fc06df046dcb114262cfd04506fb0dcef22325b
+Subproject commit fdc969f8c6eb41a9c96abfa887d9ed54e9a4456f
diff --git a/package.json b/package.json
index e4bbf75..8059359 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
 		"window": "^4.2.7"
 	},
 	"dependencies": {
-		"@vectopus/atlas-icons": "^0.0.7",
+		"@coreui/icons": "^1.0.1",
 		"axios": "^0.21.1",
 		"bootstrap": "4.6.0",
 		"core-js": "3",
diff --git a/public/media/flags/cz.svg b/public/media/flags/cz.svg
deleted file mode 100644
index fd712db..0000000
--- a/public/media/flags/cz.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="301" height="201" viewBox="0 0 301 201" xmlns="http://www.w3.org/2000/svg"><g fill-rule="nonzero" fill="none"><path fill="#D7141A" d="M.5.5h300v200H.5z"/><path fill="#FFF" d="M.5.5h300v100H.5z"/><path fill="#11457E" d="M150.5 100.5L.5.5v200z"/></g></svg>
\ No newline at end of file
diff --git a/public/media/flags/gb.svg b/public/media/flags/gb.svg
deleted file mode 100644
index 2cebcea..0000000
--- a/public/media/flags/gb.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="301" height="151" viewBox="0 0 301 151" xmlns="http://www.w3.org/2000/svg"><g fill-rule="nonzero" fill="none"><path fill="#FFF" d="M.5.5h299.843v149.983H.5z"/><path fill="#CF142B" d="M135.428 90.444v60.039h29.988V90.444h134.928V60.46H165.416V.5h-29.988v59.96H.5v29.984z"/><path fill="#00247D" d="M175.415 49.049V.5h97.08zM175.415 101.933v48.55h97.08zM125.428 101.933v48.55H28.349zM125.428 49.049V.5H28.349zM.501 14.442v36.051h72.087zM300.343 14.442v36.051h-72.087zM300.343 136.541V100.49h-72.087zM.501 136.541V100.49h72.087z"/><path fill="#CF142B" d="M300.343.5h-16.654L183.9 50.493h16.654L300.5.5M116.943 100.487h-16.654L.5 150.48h16.654l99.946-49.993M83.768 50.532h16.653L.5.5v8.385zM217.023 100.468h-16.654L300.29 150.5v-8.385z"/></g></svg>
\ No newline at end of file
diff --git a/public/media/flags/placeholder.svg b/public/media/flags/placeholder.svg
deleted file mode 100644
index 1b7e542..0000000
--- a/public/media/flags/placeholder.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" stroke-width="1.5" width="24" height="24" color="#000000"><defs><style>.cls-637b8d40f95e86b59c57a2c0-1{fill:none;stroke:currentColor;stroke-miterlimit:10;}</style></defs><g id="roll_brush" data-name="roll brush"><line class="cls-637b8d40f95e86b59c57a2c0-1" x1="23.5" y1="13.95" x2="17.74" y2="13.95"></line><line class="cls-637b8d40f95e86b59c57a2c0-1" x1="6.23" y1="13.95" x2="0.48" y2="13.95"></line><path class="cls-637b8d40f95e86b59c57a2c0-1" d="M17.74,11.07v5.76a5.89,5.89,0,0,1-.08,1,5.75,5.75,0,0,1-11.34,0,4.94,4.94,0,0,1-.09-1V11.07a5.12,5.12,0,0,1,.09-1A5.76,5.76,0,0,1,16.06,7a5.63,5.63,0,0,1,1.6,3.11A6.12,6.12,0,0,1,17.74,11.07Z"></path><path class="cls-637b8d40f95e86b59c57a2c0-1" d="M1.44,4.36v.81a4.91,4.91,0,0,0,1.4,3.44l0,0a4.93,4.93,0,0,0,3.51,1.47H17.63A4.91,4.91,0,0,0,21.1,8.67h0A4.91,4.91,0,0,0,22.54,5.2V4.36"></path><path class="cls-637b8d40f95e86b59c57a2c0-1" d="M17.66,17.78h0a4.81,4.81,0,0,1,3.38,1.4l.08.08a4.77,4.77,0,0,1,1.4,3.38v.9"></path><path class="cls-637b8d40f95e86b59c57a2c0-1" d="M1.44,23.54v-.87A4.78,4.78,0,0,1,2.8,19.33l.11-.11a4.78,4.78,0,0,1,3.41-1.44h0"></path><line class="cls-637b8d40f95e86b59c57a2c0-1" x1="11.99" y1="10.11" x2="11.99" y2="22.58"></line><line class="cls-637b8d40f95e86b59c57a2c0-1" x1="6.23" y1="10.11" x2="17.74" y2="10.11"></line><path class="cls-637b8d40f95e86b59c57a2c0-1" d="M13,1.48h0a2.88,2.88,0,0,1,2.88,2.88V6.79"></path><path class="cls-637b8d40f95e86b59c57a2c0-1" d="M8.15,6.79V4.36A2.88,2.88,0,0,1,11,1.48h0"></path></g></svg>
\ No newline at end of file
diff --git a/src/modules/auth/containers/LoginCard.js b/src/modules/auth/containers/LoginCard.js
index 8375c29..be029cb 100644
--- a/src/modules/auth/containers/LoginCard.js
+++ b/src/modules/auth/containers/LoginCard.js
@@ -799,7 +799,7 @@ function WebAuthnField(props) {
 		<div className="text-center">
 			<h6>
 				<Label for={props.factor.type} style={{display: "block"}}>
-					<span className="at-shield-star-win pr-1" />{t('LoginCard|You will be prompted to login with FIDO2/WebAuthn')}
+					<span className="cil-shield-alt pr-1" />{t('LoginCard|You will be prompted to login with FIDO2/WebAuthn')}
 				</Label>
 			</h6>
 
diff --git a/src/modules/auth/webauthn/WebAuthnScreen.js b/src/modules/auth/webauthn/WebAuthnScreen.js
index 92b928a..7782596 100644
--- a/src/modules/auth/webauthn/WebAuthnScreen.js
+++ b/src/modules/auth/webauthn/WebAuthnScreen.js
@@ -371,7 +371,7 @@ function TableRow (props) {
 					</>
 				:
 					<div className="div-key-wordwrap" title={obj?.name}>
-						<span className="at-shield-star-win pr-1" />{obj?.name}
+						<span className="cil-shield-alt pr-1" />{obj?.name}
 					</div>
 				}
 			</td>
@@ -416,7 +416,7 @@ function TableRow (props) {
 								onClick={(e) => editAuthenticatorName(e, obj?.id)}
 								disabled={props.isSubmitting || (props.globalEditMode == true)}
 							>
-								<span className="at-pencil-box"></span>
+								<span className="cil-color-border"></span>
 							</Button>
 							<Button
 								outline