diff --git a/src/frontend/src/lib/env/aaguids.json b/src/frontend/src/lib/env/aaguids.json
index 93ea6fb5f..7bbc349ac 100644
--- a/src/frontend/src/lib/env/aaguids.json
+++ b/src/frontend/src/lib/env/aaguids.json
@@ -165,5 +165,17 @@
 	},
 	"cb6f6666-38ea-4873-9161-ff456a82d316": {
 		"name": "iPass Secure Auth"
+	},
+	"9c1f2b6e-4d3a-4f7c-8b21-5e6a7d8c9f01": {
+		"name": "Idira"
+	},
+	"9f8a3b2c-1d4e-4f6a-8b0c-2e1d3c4b5a69": {
+		"name": "U2 Secured"
+	},
+	"69840def-9dcf-4632-bf87-6ac2e451b4f5": {
+		"name": "Keyholm"
+	},
+	"35d5ea15-ab24-4416-bdd1-f204c9bce1b6": {
+		"name": "CyberFOX Password Manager"
 	}
 }
diff --git a/src/frontend/static/aaguids/35d5ea15-ab24-4416-bdd1-f204c9bce1b6-dark.svg b/src/frontend/static/aaguids/35d5ea15-ab24-4416-bdd1-f204c9bce1b6-dark.svg
new file mode 100644
index 000000000..b19bd52b0
--- /dev/null
+++ b/src/frontend/static/aaguids/35d5ea15-ab24-4416-bdd1-f204c9bce1b6-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="500" height="500" version="1.0" viewBox="0 0 375 375"><defs><clipPath id="a"><path d="M15 20.5h344.8v333.7H15Zm0 0"/></clipPath></defs><g clip-path="url(#a)"><path fill="#00ae92" fill-rule="evenodd" d="M172.3 117.6q15.2-1 30.4 0l.4-.7a242 242 0 0 1 61.7-80.3q9.5-8 20-14.8 1.5-.9 3-1.2c2.8-.6 6.7 1 7.6 5q.3 1.1.1 2.2l-.2 3.2a280 280 0 0 0 4 68.7q4 22 11.8 43 7.4 19.5 18.9 37.2a173 173 0 0 0 27.5 32.7c2.3 2.4 2.4 6 .2 8.6q-1 1.2-2.6 1.8l-9.2 4.4a439 439 0 0 0-82.4 53.3q-16.1 13.4-30.3 28.8-13.7 15-24.6 31.8l-1 1.6q-2.5 4.6-7 7.5a23 23 0 0 1-31.4-4.7L168 344q-1.7-3.1-3.8-6.1-9-13.5-20-25.7a305 305 0 0 0-32.3-31 414 414 0 0 0-85-54.9l-7.1-3.3a6.4 6.4 0 0 1-2.4-10.1l.8-.8a174 174 0 0 0 30.3-37.6 204 204 0 0 0 18-39A236 236 0 0 0 76.8 94a522 522 0 0 0 2.5-20.4 290 290 0 0 0 1-33.6l-.7-10.8-.1-2.4c0-2.6 2-5.5 5.3-6.2q3-.5 5.2 1l7.1 4.9q19.2 13.6 35 31 21 23.1 35.5 50.6 2.2 4.2 4.2 8.6zm34.3 203.2.8-1 5.6-7.2a291 291 0 0 1 28.7-30.3A378 378 0 0 1 278 253q29.5-21 62.2-37.3l1-.5-.8-.8a187 187 0 0 1-32.9-46.8 229 229 0 0 1-20-58.5q-1.1-5.1-2-10.4l-1.2-7.2a226 226 0 0 1-2.1-18.9l-.5-7.4a381 381 0 0 1-.4-24.3q0-.3-.2-.5l-1 .7A209 209 0 0 0 249 70.8a233 233 0 0 0-31.6 47.3q-.3.5-.4 1.2l3 .5a224 224 0 0 1 33.3 8.4q1.8.6 3.5 1.4 3.3 1.5 3.8 5 .2 1.8-.3 3.4c-.9 3-3.6 4.8-6.2 5q-1.2 0-2.2.2-6 1-11.5 2.8a89 89 0 0 0-25.7 13.8q-10.8 8.4-19.2 19l-2.4 3.2a7 7 0 0 1-7.2 2.5 7 7 0 0 1-4.2-2.6l-2.5-3.4q-8.9-11.3-20.5-19.9a88 88 0 0 0-24.8-12.7 62 62 0 0 0-13.4-3 6 6 0 0 1-3.7-1.7 9 9 0 0 1-2.8-4.8c-.3-3 1.2-5.8 4.1-7l.6-.2 6-2.2q15.6-5.1 31.7-7.5 1 0 1.7-.3v-.3q0-.4-.4-.9a226 226 0 0 0-63.4-77.3q-.2-.2-.5-.2v2.8q.2 8.6-.2 17.1-.1 4.5-.5 9.2a158 158 0 0 1-1.4 15.2 352 352 0 0 1-3.9 23.6q-2.2 10.8-5.4 21.4a227 227 0 0 1-14 36q-13.1 27-33.9 48.8l-.6.6 2 1q34.5 17.2 65.4 40 18.5 13.5 35.2 29.2a278 278 0 0 1 32 35.4q6.9-9.8 19-10 12.2.1 19.2 10Zm24-185.7a193 193 0 0 0-57.9-4.6 196 196 0 0 0-28.6 4.6l1 .4q13.8 5.8 25.6 15.2a118 118 0 0 1 16.7 16.1l4.5-5a129 129 0 0 1 20.7-17.2 112 112 0 0 1 11.8-6.6l6.3-3Zm0 0"/></g><path fill="#00ae92" fill-rule="evenodd" d="M270.8 180.4q-.7 3.9-2 7.3-5.2 12.7-17.4 19.7-6.5 3.7-13.9 5.4a77 77 0 0 1-10.7 1.9q-4.2.4-8.4.5h-.8l-.2.8q-1 4.8-1 9.6l.1 53-.1 2c-.6 3-3.4 5.2-6.6 5.2a6.6 6.6 0 0 1-6.6-5.2v-1.9l-.1-16.5v-37q0-9.3 3-18.1a50 50 0 0 1 16.7-23.4 67 67 0 0 1 16-9.2 93 93 0 0 1 26.1-6.6 92 92 0 0 1 10.6-.5c3 .6 5.5 3.2 5.5 6.4 0 3-2.3 5.8-5.4 6.4h-1.4l-3 .2zm-19.7 3.5q-6 1.8-11.6 4.6a47 47 0 0 0-10.6 7.2c1 3.8 5.6 7.3 10.4 7.8 5.7.7 10.5-2.2 12.8-6.5 2.5-4.5 1.6-10-1-13m-95 31.3h-.4l-3.9-.2a78 78 0 0 1-18.6-3 49 49 0 0 1-14.7-7.2 38 38 0 0 1-15-22l-.6-2.5h-.7l-3-.2c-3 0-6-2.3-6.4-5.8a6.5 6.5 0 0 1 5.4-7h2.6a111 111 0 0 1 26.4 4.3q9.8 3 18.5 8.3a54 54 0 0 1 15.3 14 49 49 0 0 1 8 17.1q1.7 7 1.7 14.3v53.4q0 1-.3 2c-.7 3-3.5 5.2-6.8 5-2.9 0-5.7-2-6.3-5.4V225q0-4.5-1-8.8zM145 195.8l-.7-.7q-1.5-1.3-3.1-2.4-8.2-5.8-18-8.7h-.5a12 12 0 0 0-.9 13.2c2.4 4 7 6.9 12.7 6.3 4.7-.4 9.2-3.8 10.5-7.7m0 0"/></svg>
\ No newline at end of file
diff --git a/src/frontend/static/aaguids/35d5ea15-ab24-4416-bdd1-f204c9bce1b6-light.svg b/src/frontend/static/aaguids/35d5ea15-ab24-4416-bdd1-f204c9bce1b6-light.svg
new file mode 100644
index 000000000..b19bd52b0
--- /dev/null
+++ b/src/frontend/static/aaguids/35d5ea15-ab24-4416-bdd1-f204c9bce1b6-light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="500" height="500" version="1.0" viewBox="0 0 375 375"><defs><clipPath id="a"><path d="M15 20.5h344.8v333.7H15Zm0 0"/></clipPath></defs><g clip-path="url(#a)"><path fill="#00ae92" fill-rule="evenodd" d="M172.3 117.6q15.2-1 30.4 0l.4-.7a242 242 0 0 1 61.7-80.3q9.5-8 20-14.8 1.5-.9 3-1.2c2.8-.6 6.7 1 7.6 5q.3 1.1.1 2.2l-.2 3.2a280 280 0 0 0 4 68.7q4 22 11.8 43 7.4 19.5 18.9 37.2a173 173 0 0 0 27.5 32.7c2.3 2.4 2.4 6 .2 8.6q-1 1.2-2.6 1.8l-9.2 4.4a439 439 0 0 0-82.4 53.3q-16.1 13.4-30.3 28.8-13.7 15-24.6 31.8l-1 1.6q-2.5 4.6-7 7.5a23 23 0 0 1-31.4-4.7L168 344q-1.7-3.1-3.8-6.1-9-13.5-20-25.7a305 305 0 0 0-32.3-31 414 414 0 0 0-85-54.9l-7.1-3.3a6.4 6.4 0 0 1-2.4-10.1l.8-.8a174 174 0 0 0 30.3-37.6 204 204 0 0 0 18-39A236 236 0 0 0 76.8 94a522 522 0 0 0 2.5-20.4 290 290 0 0 0 1-33.6l-.7-10.8-.1-2.4c0-2.6 2-5.5 5.3-6.2q3-.5 5.2 1l7.1 4.9q19.2 13.6 35 31 21 23.1 35.5 50.6 2.2 4.2 4.2 8.6zm34.3 203.2.8-1 5.6-7.2a291 291 0 0 1 28.7-30.3A378 378 0 0 1 278 253q29.5-21 62.2-37.3l1-.5-.8-.8a187 187 0 0 1-32.9-46.8 229 229 0 0 1-20-58.5q-1.1-5.1-2-10.4l-1.2-7.2a226 226 0 0 1-2.1-18.9l-.5-7.4a381 381 0 0 1-.4-24.3q0-.3-.2-.5l-1 .7A209 209 0 0 0 249 70.8a233 233 0 0 0-31.6 47.3q-.3.5-.4 1.2l3 .5a224 224 0 0 1 33.3 8.4q1.8.6 3.5 1.4 3.3 1.5 3.8 5 .2 1.8-.3 3.4c-.9 3-3.6 4.8-6.2 5q-1.2 0-2.2.2-6 1-11.5 2.8a89 89 0 0 0-25.7 13.8q-10.8 8.4-19.2 19l-2.4 3.2a7 7 0 0 1-7.2 2.5 7 7 0 0 1-4.2-2.6l-2.5-3.4q-8.9-11.3-20.5-19.9a88 88 0 0 0-24.8-12.7 62 62 0 0 0-13.4-3 6 6 0 0 1-3.7-1.7 9 9 0 0 1-2.8-4.8c-.3-3 1.2-5.8 4.1-7l.6-.2 6-2.2q15.6-5.1 31.7-7.5 1 0 1.7-.3v-.3q0-.4-.4-.9a226 226 0 0 0-63.4-77.3q-.2-.2-.5-.2v2.8q.2 8.6-.2 17.1-.1 4.5-.5 9.2a158 158 0 0 1-1.4 15.2 352 352 0 0 1-3.9 23.6q-2.2 10.8-5.4 21.4a227 227 0 0 1-14 36q-13.1 27-33.9 48.8l-.6.6 2 1q34.5 17.2 65.4 40 18.5 13.5 35.2 29.2a278 278 0 0 1 32 35.4q6.9-9.8 19-10 12.2.1 19.2 10Zm24-185.7a193 193 0 0 0-57.9-4.6 196 196 0 0 0-28.6 4.6l1 .4q13.8 5.8 25.6 15.2a118 118 0 0 1 16.7 16.1l4.5-5a129 129 0 0 1 20.7-17.2 112 112 0 0 1 11.8-6.6l6.3-3Zm0 0"/></g><path fill="#00ae92" fill-rule="evenodd" d="M270.8 180.4q-.7 3.9-2 7.3-5.2 12.7-17.4 19.7-6.5 3.7-13.9 5.4a77 77 0 0 1-10.7 1.9q-4.2.4-8.4.5h-.8l-.2.8q-1 4.8-1 9.6l.1 53-.1 2c-.6 3-3.4 5.2-6.6 5.2a6.6 6.6 0 0 1-6.6-5.2v-1.9l-.1-16.5v-37q0-9.3 3-18.1a50 50 0 0 1 16.7-23.4 67 67 0 0 1 16-9.2 93 93 0 0 1 26.1-6.6 92 92 0 0 1 10.6-.5c3 .6 5.5 3.2 5.5 6.4 0 3-2.3 5.8-5.4 6.4h-1.4l-3 .2zm-19.7 3.5q-6 1.8-11.6 4.6a47 47 0 0 0-10.6 7.2c1 3.8 5.6 7.3 10.4 7.8 5.7.7 10.5-2.2 12.8-6.5 2.5-4.5 1.6-10-1-13m-95 31.3h-.4l-3.9-.2a78 78 0 0 1-18.6-3 49 49 0 0 1-14.7-7.2 38 38 0 0 1-15-22l-.6-2.5h-.7l-3-.2c-3 0-6-2.3-6.4-5.8a6.5 6.5 0 0 1 5.4-7h2.6a111 111 0 0 1 26.4 4.3q9.8 3 18.5 8.3a54 54 0 0 1 15.3 14 49 49 0 0 1 8 17.1q1.7 7 1.7 14.3v53.4q0 1-.3 2c-.7 3-3.5 5.2-6.8 5-2.9 0-5.7-2-6.3-5.4V225q0-4.5-1-8.8zM145 195.8l-.7-.7q-1.5-1.3-3.1-2.4-8.2-5.8-18-8.7h-.5a12 12 0 0 0-.9 13.2c2.4 4 7 6.9 12.7 6.3 4.7-.4 9.2-3.8 10.5-7.7m0 0"/></svg>
\ No newline at end of file
diff --git a/src/frontend/static/aaguids/69840def-9dcf-4632-bf87-6ac2e451b4f5-dark.svg b/src/frontend/static/aaguids/69840def-9dcf-4632-bf87-6ac2e451b4f5-dark.svg
new file mode 100644
index 000000000..6340a0204
--- /dev/null
+++ b/src/frontend/static/aaguids/69840def-9dcf-4632-bf87-6ac2e451b4f5-dark.svg
@@ -0,0 +1,69 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="18 18 72 72" width="72" height="72" role="img" aria-label="Keyholm">
+  <title>Keyholm</title>
+  <defs>
+    <linearGradient id="grad0" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="108" y2="108">
+      <stop offset="0.0" stop-color="#5A8DC4"/>
+      <stop offset="0.28" stop-color="#5A8DC4"/>
+      <stop offset="0.62" stop-color="#3C6798"/>
+      <stop offset="1.0" stop-color="#122F52"/>
+    </linearGradient>
+    <clipPath id="clip1">
+      <path d="M108,0 L108,108 L0,108 Z"/>
+    </clipPath>
+    <clipPath id="clip2">
+      <path d="M34,37 L42,34 L52,37 L62,33.5 L72,36 L79,41 L82,48 L78,55 L81,62 L74,72 L64,74.5 L54,70 L44,73 L35,71 L28,64 L26,55 L29,47 L28,42 Z"/>
+    </clipPath>
+    <clipPath id="clip3">
+      <path d="M73.692,46.0319L75.2693,47.27L76.1001,50.3704L75.3531,52.2313ZM53.8109,54.6813L53.8107,60.5059L50.8986,65.5499L45.8544,68.4623L40.0298,68.4621L34.9858,65.55L32.0734,60.5058L32.0736,54.6812L34.9857,49.6373L40.0299,46.7248L45.8545,46.725L50.8984,49.6371ZM46.8638,53.6715L44.3779,52.2363L41.5067,52.2364L39.0201,53.6719L37.5849,56.1578L37.585,59.029L39.0205,61.5156L41.5063,62.9508L44.3776,62.9507L46.8642,61.5152L48.2994,59.0294L48.2993,56.1581ZM51.7987,51.8982L73.692,46.0319L75.3531,52.2313L53.4599,58.0976ZM59.4659,56.4883L63.7284,55.3461L64.663,58.8339L60.4004,59.976ZM65.2786,54.9308L69.5404,53.7888L71.3055,60.3763L67.0437,61.5182ZM71.0906,53.3734L75.3531,52.2313L76.5991,56.8812L72.3366,58.0233Z"/>
+    </clipPath>
+    <clipPath id="clip4">
+      <path d="M72.772,45.1119L74.3493,46.35L75.1801,49.4504L74.4331,51.3113ZM52.8909,53.7613L52.8907,59.5859L49.9786,64.6299L44.9344,67.5423L39.1098,67.5421L34.0658,64.63L31.1534,59.5858L31.1536,53.7612L34.0657,48.7173L39.1099,45.8048L44.9345,45.805L49.9784,48.7171ZM45.9438,52.7515L43.4579,51.3163L40.5867,51.3164L38.1001,52.7519L36.6649,55.2378L36.665,58.109L38.1005,60.5956L40.5863,62.0308L43.4576,62.0307L45.9442,60.5952L47.3794,58.1094L47.3793,55.2381ZM50.8787,50.9782L72.772,45.1119L74.4331,51.3113L52.5399,57.1776ZM58.5459,55.5683L62.8084,54.4261L63.743,57.9139L59.4804,59.056ZM64.3586,54.0108L68.6204,52.8688L70.3855,59.4563L66.1237,60.5982ZM70.1706,52.4534L74.4331,51.3113L75.6791,55.9612L71.4166,57.1033Z"/>
+    </clipPath>
+    <clipPath id="mask">
+      <path d="M50,0 C10,0 0,10 0,50 C0,90 10,100 50,100 C90,100 100,90 100,50 C100,10 90,0 50,0 Z" transform="translate(18 18) scale(0.72)"/>
+    </clipPath>
+  </defs>
+  <g clip-path="url(#mask)">
+    <path fill="url(#grad0)" d="M0,0 H108 V108 H0 Z"/>
+    <path fill="#6E9ECF" d="M37.41,27.93 L45.705,26.1525 L54,27.93 L62.295,26.271 L70.59,27.693 L77.7,29.826 L84.099,31.959 L88.839,39.543 L89.55,46.89 L87.891,54 L89.55,63.48 L87.18,68.931 L82.203,76.041 L77.7,79.122 L70.59,81.729 L62.295,80.544 L54,81.966 L45.705,80.544 L37.41,81.729 L31.722,78.885 L23.901,76.989 L20.583,68.457 L18.45,63.243 L19.161,54 L18.45,44.994 L20.82,38.121 L23.664,33.618 L31.248,27.456 Z"/>
+    <path fill="#8FBCE0" d="M38.39,29.47 L46.195,27.7975 L54,29.47 L61.805,27.909 L69.61,29.247 L76.3,31.254 L82.321,33.261 L86.781,40.397 L87.45,47.31 L85.889,54 L87.45,62.92 L85.22,68.049 L80.537,74.739 L76.3,77.638 L69.61,80.091 L61.805,78.976 L54,80.314 L46.195,78.976 L38.39,80.091 L33.038,77.415 L25.679,75.631 L22.557,67.603 L20.55,62.697 L21.219,54 L20.55,45.526 L22.78,39.059 L25.456,34.822 L32.592,29.024 Z"/>
+    <path fill="#E6D8B4" d="M39.37,31.01 L46.685,29.4425 L54,31.01 L61.315,29.547 L68.63,30.801 L74.9,32.682 L80.543,34.563 L84.723,41.251 L85.35,47.73 L83.887,54 L85.35,62.36 L83.26,67.167 L78.871,73.437 L74.9,76.154 L68.63,78.453 L61.315,77.408 L54,78.662 L46.685,77.408 L39.37,78.453 L34.354,75.945 L27.457,74.273 L24.531,66.749 L22.65,62.151 L23.277,54 L22.65,46.058 L24.74,39.997 L27.248,36.026 L33.936,30.592 Z"/>
+    <path fill="#FBF4E2" d="M40,32 L47,30.5 L54,32 L61,30.6 L68,31.8 L74,33.6 L79.4,35.4 L83.4,41.8 L84,48 L82.6,54 L84,62 L82,66.6 L77.8,72.6 L74,75.2 L68,77.4 L61,76.4 L54,77.6 L47,76.4 L40,77.4 L35.2,75 L28.6,73.4 L25.8,66.2 L24,61.8 L24.6,54 L24,46.4 L26,40.6 L28.4,36.8 L34.8,31.6 Z"/>
+    <g clip-path="url(#clip1)">
+      <path fill="#EDE1C2" d="M40,32 L47,30.5 L54,32 L61,30.6 L68,31.8 L74,33.6 L79.4,35.4 L83.4,41.8 L84,48 L82.6,54 L84,62 L82,66.6 L77.8,72.6 L74,75.2 L68,77.4 L61,76.4 L54,77.6 L47,76.4 L40,77.4 L35.2,75 L28.6,73.4 L25.8,66.2 L24,61.8 L24.6,54 L24,46.4 L26,40.6 L28.4,36.8 L34.8,31.6 Z"/>
+    </g>
+    <g clip-path="url(#clip2)">
+      <path fill="#0F5B3A" d="M24,31 H84 V77 H24 Z"/>
+      <path fill="#26A067" d="M24,34 L52,34 L44,50 L24,58 Z"/>
+      <path fill="#1A8052" d="M52,34 L81,34 L70,46 L44,50 Z"/>
+      <path fill="#146C44" d="M81,34 L81,46 L70,46 Z"/>
+      <path fill="#116040" d="M44,50 L70,46 L81,60 L58,66 Z"/>
+      <path fill="#0E5636" d="M27,58 L44,50 L58,66 L44,74 L27,74 Z"/>
+      <path fill="#0B4A2E" d="M58,66 L81,60 L81,74 L44,74 Z"/>
+    </g>
+    <g clip-path="url(#clip4)">
+      <path fill="#F2EAD0" d="M20,28 H88 V80 H20 Z"/>
+      <path fill="#FBF4E2" d="M24,34 L52,34 L44,50 L24,58 Z"/>
+      <path fill="#F8F1DC" d="M52,34 L81,34 L70,46 L44,50 Z"/>
+      <path fill="#F5EDD6" d="M81,34 L81,46 L70,46 Z"/>
+      <path fill="#F2EAD0" d="M44,50 L70,46 L81,60 L58,66 Z"/>
+      <path fill="#EFE6CA" d="M27,58 L44,50 L58,66 L44,74 L27,74 Z"/>
+      <path fill="#ECE3C4" d="M58,66 L81,60 L81,74 L44,74 Z"/>
+      <path fill="#07331F" fill-opacity="0.34" d="M16,24 H92 V84 H16 Z"/>
+      <g clip-path="url(#clip3)">
+        <path fill="#F2EAD0" d="M20,28 H88 V80 H20 Z"/>
+        <path fill="#FBF4E2" d="M24,34 L52,34 L44,50 L24,58 Z"/>
+        <path fill="#F8F1DC" d="M52,34 L81,34 L70,46 L44,50 Z"/>
+        <path fill="#F5EDD6" d="M81,34 L81,46 L70,46 Z"/>
+        <path fill="#F2EAD0" d="M44,50 L70,46 L81,60 L58,66 Z"/>
+        <path fill="#EFE6CA" d="M27,58 L44,50 L58,66 L44,74 L27,74 Z"/>
+        <path fill="#ECE3C4" d="M58,66 L81,60 L81,74 L44,74 Z"/>
+      </g>
+    </g>
+    <path fill="#EEE2C6" d="M39.75,33 V25.5 L41.25,24 H42.75 L44.25,25.5 V33 A1,1 0 0 1 43.25,34 H40.75 A1,1 0 0 1 39.75,33 Z M47.75,33 V25.5 L49.25,24 H50.75 L52.25,25.5 V33 A1,1 0 0 1 51.25,34 H48.75 A1,1 0 0 1 47.75,33 Z M55.75,33 V25.5 L57.25,24 H58.75 L60.25,25.5 V33 A1,1 0 0 1 59.25,34 H56.75 A1,1 0 0 1 55.75,33 Z M63.75,33 V25.5 L65.25,24 H66.75 L68.25,25.5 V33 A1,1 0 0 1 67.25,34 H64.75 A1,1 0 0 1 63.75,33 Z"/>
+    <path fill="#C8B692" d="M39.75,75 A1,1 0 0 1 40.75,74 H43.25 A1,1 0 0 1 44.25,75 V82.5 L42.75,84 H41.25 L39.75,82.5 Z M47.75,75 A1,1 0 0 1 48.75,74 H51.25 A1,1 0 0 1 52.25,75 V82.5 L50.75,84 H49.25 L47.75,82.5 Z M55.75,75 A1,1 0 0 1 56.75,74 H59.25 A1,1 0 0 1 60.25,75 V82.5 L58.75,84 H57.25 L55.75,82.5 Z M63.75,75 A1,1 0 0 1 64.75,74 H67.25 A1,1 0 0 1 68.25,75 V82.5 L66.75,84 H65.25 L63.75,82.5 Z"/>
+    <path fill="#EADCBC" d="M40.95,25.34 L41.25,25.2 H42.75 L43.05,25.34 V34 H40.95 Z M48.95,25.34 L49.25,25.2 H50.75 L51.05,25.34 V34 H48.95 Z M56.95,25.34 L57.25,25.2 H58.75 L59.05,25.34 V34 H56.95 Z M64.95,25.34 L65.25,25.2 H66.75 L67.05,25.34 V34 H64.95 Z M40.95,74 V82.66 L41.25,82.8 H42.75 L43.05,82.66 V74 Z M48.95,74 V82.66 L49.25,82.8 H50.75 L51.05,82.66 V74 Z M56.95,74 V82.66 L57.25,82.8 H58.75 L59.05,82.66 V74 Z M64.95,74 V82.66 L65.25,82.8 H66.75 L67.05,82.66 V74 Z"/>
+    <path fill="#FFFDF6" d="M39.75,25.9 L40.95,25.34 V34 H40.75 A1,1 0 0 1 39.75,33 Z M47.75,25.9 L48.95,25.34 V34 H48.75 A1,1 0 0 1 47.75,33 Z M55.75,25.9 L56.95,25.34 V34 H56.75 A1,1 0 0 1 55.75,33 Z M63.75,25.9 L64.95,25.34 V34 H64.75 A1,1 0 0 1 63.75,33 Z M40.75,74 A1,1 0 0 0 39.75,75 V82.1 L40.95,82.66 V74 Z M48.75,74 A1,1 0 0 0 47.75,75 V82.1 L48.95,82.66 V74 Z M56.75,74 A1,1 0 0 0 55.75,75 V82.1 L56.95,82.66 V74 Z M64.75,74 A1,1 0 0 0 63.75,75 V82.1 L64.95,82.66 V74 Z"/>
+    <path fill="#DCCDAE" d="M43.05,25.34 L44.25,25.9 V33 A1,1 0 0 1 43.25,34 H43.05 Z M51.05,25.34 L52.25,25.9 V33 A1,1 0 0 1 51.25,34 H51.05 Z M59.05,25.34 L60.25,25.9 V33 A1,1 0 0 1 59.25,34 H59.05 Z M67.05,25.34 L68.25,25.9 V33 A1,1 0 0 1 67.25,34 H67.05 Z M43.05,74 V82.66 L44.25,82.1 V75 A1,1 0 0 0 43.25,74 Z M51.05,74 V82.66 L52.25,82.1 V75 A1,1 0 0 0 51.25,74 Z M59.05,74 V82.66 L60.25,82.1 V75 A1,1 0 0 0 59.25,74 Z M67.05,74 V82.66 L68.25,82.1 V75 A1,1 0 0 0 67.25,74 Z"/>
+  </g>
+</svg>
diff --git a/src/frontend/static/aaguids/69840def-9dcf-4632-bf87-6ac2e451b4f5-light.svg b/src/frontend/static/aaguids/69840def-9dcf-4632-bf87-6ac2e451b4f5-light.svg
new file mode 100644
index 000000000..6340a0204
--- /dev/null
+++ b/src/frontend/static/aaguids/69840def-9dcf-4632-bf87-6ac2e451b4f5-light.svg
@@ -0,0 +1,69 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="18 18 72 72" width="72" height="72" role="img" aria-label="Keyholm">
+  <title>Keyholm</title>
+  <defs>
+    <linearGradient id="grad0" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="108" y2="108">
+      <stop offset="0.0" stop-color="#5A8DC4"/>
+      <stop offset="0.28" stop-color="#5A8DC4"/>
+      <stop offset="0.62" stop-color="#3C6798"/>
+      <stop offset="1.0" stop-color="#122F52"/>
+    </linearGradient>
+    <clipPath id="clip1">
+      <path d="M108,0 L108,108 L0,108 Z"/>
+    </clipPath>
+    <clipPath id="clip2">
+      <path d="M34,37 L42,34 L52,37 L62,33.5 L72,36 L79,41 L82,48 L78,55 L81,62 L74,72 L64,74.5 L54,70 L44,73 L35,71 L28,64 L26,55 L29,47 L28,42 Z"/>
+    </clipPath>
+    <clipPath id="clip3">
+      <path d="M73.692,46.0319L75.2693,47.27L76.1001,50.3704L75.3531,52.2313ZM53.8109,54.6813L53.8107,60.5059L50.8986,65.5499L45.8544,68.4623L40.0298,68.4621L34.9858,65.55L32.0734,60.5058L32.0736,54.6812L34.9857,49.6373L40.0299,46.7248L45.8545,46.725L50.8984,49.6371ZM46.8638,53.6715L44.3779,52.2363L41.5067,52.2364L39.0201,53.6719L37.5849,56.1578L37.585,59.029L39.0205,61.5156L41.5063,62.9508L44.3776,62.9507L46.8642,61.5152L48.2994,59.0294L48.2993,56.1581ZM51.7987,51.8982L73.692,46.0319L75.3531,52.2313L53.4599,58.0976ZM59.4659,56.4883L63.7284,55.3461L64.663,58.8339L60.4004,59.976ZM65.2786,54.9308L69.5404,53.7888L71.3055,60.3763L67.0437,61.5182ZM71.0906,53.3734L75.3531,52.2313L76.5991,56.8812L72.3366,58.0233Z"/>
+    </clipPath>
+    <clipPath id="clip4">
+      <path d="M72.772,45.1119L74.3493,46.35L75.1801,49.4504L74.4331,51.3113ZM52.8909,53.7613L52.8907,59.5859L49.9786,64.6299L44.9344,67.5423L39.1098,67.5421L34.0658,64.63L31.1534,59.5858L31.1536,53.7612L34.0657,48.7173L39.1099,45.8048L44.9345,45.805L49.9784,48.7171ZM45.9438,52.7515L43.4579,51.3163L40.5867,51.3164L38.1001,52.7519L36.6649,55.2378L36.665,58.109L38.1005,60.5956L40.5863,62.0308L43.4576,62.0307L45.9442,60.5952L47.3794,58.1094L47.3793,55.2381ZM50.8787,50.9782L72.772,45.1119L74.4331,51.3113L52.5399,57.1776ZM58.5459,55.5683L62.8084,54.4261L63.743,57.9139L59.4804,59.056ZM64.3586,54.0108L68.6204,52.8688L70.3855,59.4563L66.1237,60.5982ZM70.1706,52.4534L74.4331,51.3113L75.6791,55.9612L71.4166,57.1033Z"/>
+    </clipPath>
+    <clipPath id="mask">
+      <path d="M50,0 C10,0 0,10 0,50 C0,90 10,100 50,100 C90,100 100,90 100,50 C100,10 90,0 50,0 Z" transform="translate(18 18) scale(0.72)"/>
+    </clipPath>
+  </defs>
+  <g clip-path="url(#mask)">
+    <path fill="url(#grad0)" d="M0,0 H108 V108 H0 Z"/>
+    <path fill="#6E9ECF" d="M37.41,27.93 L45.705,26.1525 L54,27.93 L62.295,26.271 L70.59,27.693 L77.7,29.826 L84.099,31.959 L88.839,39.543 L89.55,46.89 L87.891,54 L89.55,63.48 L87.18,68.931 L82.203,76.041 L77.7,79.122 L70.59,81.729 L62.295,80.544 L54,81.966 L45.705,80.544 L37.41,81.729 L31.722,78.885 L23.901,76.989 L20.583,68.457 L18.45,63.243 L19.161,54 L18.45,44.994 L20.82,38.121 L23.664,33.618 L31.248,27.456 Z"/>
+    <path fill="#8FBCE0" d="M38.39,29.47 L46.195,27.7975 L54,29.47 L61.805,27.909 L69.61,29.247 L76.3,31.254 L82.321,33.261 L86.781,40.397 L87.45,47.31 L85.889,54 L87.45,62.92 L85.22,68.049 L80.537,74.739 L76.3,77.638 L69.61,80.091 L61.805,78.976 L54,80.314 L46.195,78.976 L38.39,80.091 L33.038,77.415 L25.679,75.631 L22.557,67.603 L20.55,62.697 L21.219,54 L20.55,45.526 L22.78,39.059 L25.456,34.822 L32.592,29.024 Z"/>
+    <path fill="#E6D8B4" d="M39.37,31.01 L46.685,29.4425 L54,31.01 L61.315,29.547 L68.63,30.801 L74.9,32.682 L80.543,34.563 L84.723,41.251 L85.35,47.73 L83.887,54 L85.35,62.36 L83.26,67.167 L78.871,73.437 L74.9,76.154 L68.63,78.453 L61.315,77.408 L54,78.662 L46.685,77.408 L39.37,78.453 L34.354,75.945 L27.457,74.273 L24.531,66.749 L22.65,62.151 L23.277,54 L22.65,46.058 L24.74,39.997 L27.248,36.026 L33.936,30.592 Z"/>
+    <path fill="#FBF4E2" d="M40,32 L47,30.5 L54,32 L61,30.6 L68,31.8 L74,33.6 L79.4,35.4 L83.4,41.8 L84,48 L82.6,54 L84,62 L82,66.6 L77.8,72.6 L74,75.2 L68,77.4 L61,76.4 L54,77.6 L47,76.4 L40,77.4 L35.2,75 L28.6,73.4 L25.8,66.2 L24,61.8 L24.6,54 L24,46.4 L26,40.6 L28.4,36.8 L34.8,31.6 Z"/>
+    <g clip-path="url(#clip1)">
+      <path fill="#EDE1C2" d="M40,32 L47,30.5 L54,32 L61,30.6 L68,31.8 L74,33.6 L79.4,35.4 L83.4,41.8 L84,48 L82.6,54 L84,62 L82,66.6 L77.8,72.6 L74,75.2 L68,77.4 L61,76.4 L54,77.6 L47,76.4 L40,77.4 L35.2,75 L28.6,73.4 L25.8,66.2 L24,61.8 L24.6,54 L24,46.4 L26,40.6 L28.4,36.8 L34.8,31.6 Z"/>
+    </g>
+    <g clip-path="url(#clip2)">
+      <path fill="#0F5B3A" d="M24,31 H84 V77 H24 Z"/>
+      <path fill="#26A067" d="M24,34 L52,34 L44,50 L24,58 Z"/>
+      <path fill="#1A8052" d="M52,34 L81,34 L70,46 L44,50 Z"/>
+      <path fill="#146C44" d="M81,34 L81,46 L70,46 Z"/>
+      <path fill="#116040" d="M44,50 L70,46 L81,60 L58,66 Z"/>
+      <path fill="#0E5636" d="M27,58 L44,50 L58,66 L44,74 L27,74 Z"/>
+      <path fill="#0B4A2E" d="M58,66 L81,60 L81,74 L44,74 Z"/>
+    </g>
+    <g clip-path="url(#clip4)">
+      <path fill="#F2EAD0" d="M20,28 H88 V80 H20 Z"/>
+      <path fill="#FBF4E2" d="M24,34 L52,34 L44,50 L24,58 Z"/>
+      <path fill="#F8F1DC" d="M52,34 L81,34 L70,46 L44,50 Z"/>
+      <path fill="#F5EDD6" d="M81,34 L81,46 L70,46 Z"/>
+      <path fill="#F2EAD0" d="M44,50 L70,46 L81,60 L58,66 Z"/>
+      <path fill="#EFE6CA" d="M27,58 L44,50 L58,66 L44,74 L27,74 Z"/>
+      <path fill="#ECE3C4" d="M58,66 L81,60 L81,74 L44,74 Z"/>
+      <path fill="#07331F" fill-opacity="0.34" d="M16,24 H92 V84 H16 Z"/>
+      <g clip-path="url(#clip3)">
+        <path fill="#F2EAD0" d="M20,28 H88 V80 H20 Z"/>
+        <path fill="#FBF4E2" d="M24,34 L52,34 L44,50 L24,58 Z"/>
+        <path fill="#F8F1DC" d="M52,34 L81,34 L70,46 L44,50 Z"/>
+        <path fill="#F5EDD6" d="M81,34 L81,46 L70,46 Z"/>
+        <path fill="#F2EAD0" d="M44,50 L70,46 L81,60 L58,66 Z"/>
+        <path fill="#EFE6CA" d="M27,58 L44,50 L58,66 L44,74 L27,74 Z"/>
+        <path fill="#ECE3C4" d="M58,66 L81,60 L81,74 L44,74 Z"/>
+      </g>
+    </g>
+    <path fill="#EEE2C6" d="M39.75,33 V25.5 L41.25,24 H42.75 L44.25,25.5 V33 A1,1 0 0 1 43.25,34 H40.75 A1,1 0 0 1 39.75,33 Z M47.75,33 V25.5 L49.25,24 H50.75 L52.25,25.5 V33 A1,1 0 0 1 51.25,34 H48.75 A1,1 0 0 1 47.75,33 Z M55.75,33 V25.5 L57.25,24 H58.75 L60.25,25.5 V33 A1,1 0 0 1 59.25,34 H56.75 A1,1 0 0 1 55.75,33 Z M63.75,33 V25.5 L65.25,24 H66.75 L68.25,25.5 V33 A1,1 0 0 1 67.25,34 H64.75 A1,1 0 0 1 63.75,33 Z"/>
+    <path fill="#C8B692" d="M39.75,75 A1,1 0 0 1 40.75,74 H43.25 A1,1 0 0 1 44.25,75 V82.5 L42.75,84 H41.25 L39.75,82.5 Z M47.75,75 A1,1 0 0 1 48.75,74 H51.25 A1,1 0 0 1 52.25,75 V82.5 L50.75,84 H49.25 L47.75,82.5 Z M55.75,75 A1,1 0 0 1 56.75,74 H59.25 A1,1 0 0 1 60.25,75 V82.5 L58.75,84 H57.25 L55.75,82.5 Z M63.75,75 A1,1 0 0 1 64.75,74 H67.25 A1,1 0 0 1 68.25,75 V82.5 L66.75,84 H65.25 L63.75,82.5 Z"/>
+    <path fill="#EADCBC" d="M40.95,25.34 L41.25,25.2 H42.75 L43.05,25.34 V34 H40.95 Z M48.95,25.34 L49.25,25.2 H50.75 L51.05,25.34 V34 H48.95 Z M56.95,25.34 L57.25,25.2 H58.75 L59.05,25.34 V34 H56.95 Z M64.95,25.34 L65.25,25.2 H66.75 L67.05,25.34 V34 H64.95 Z M40.95,74 V82.66 L41.25,82.8 H42.75 L43.05,82.66 V74 Z M48.95,74 V82.66 L49.25,82.8 H50.75 L51.05,82.66 V74 Z M56.95,74 V82.66 L57.25,82.8 H58.75 L59.05,82.66 V74 Z M64.95,74 V82.66 L65.25,82.8 H66.75 L67.05,82.66 V74 Z"/>
+    <path fill="#FFFDF6" d="M39.75,25.9 L40.95,25.34 V34 H40.75 A1,1 0 0 1 39.75,33 Z M47.75,25.9 L48.95,25.34 V34 H48.75 A1,1 0 0 1 47.75,33 Z M55.75,25.9 L56.95,25.34 V34 H56.75 A1,1 0 0 1 55.75,33 Z M63.75,25.9 L64.95,25.34 V34 H64.75 A1,1 0 0 1 63.75,33 Z M40.75,74 A1,1 0 0 0 39.75,75 V82.1 L40.95,82.66 V74 Z M48.75,74 A1,1 0 0 0 47.75,75 V82.1 L48.95,82.66 V74 Z M56.75,74 A1,1 0 0 0 55.75,75 V82.1 L56.95,82.66 V74 Z M64.75,74 A1,1 0 0 0 63.75,75 V82.1 L64.95,82.66 V74 Z"/>
+    <path fill="#DCCDAE" d="M43.05,25.34 L44.25,25.9 V33 A1,1 0 0 1 43.25,34 H43.05 Z M51.05,25.34 L52.25,25.9 V33 A1,1 0 0 1 51.25,34 H51.05 Z M59.05,25.34 L60.25,25.9 V33 A1,1 0 0 1 59.25,34 H59.05 Z M67.05,25.34 L68.25,25.9 V33 A1,1 0 0 1 67.25,34 H67.05 Z M43.05,74 V82.66 L44.25,82.1 V75 A1,1 0 0 0 43.25,74 Z M51.05,74 V82.66 L52.25,82.1 V75 A1,1 0 0 0 51.25,74 Z M59.05,74 V82.66 L60.25,82.1 V75 A1,1 0 0 0 59.25,74 Z M67.05,74 V82.66 L68.25,82.1 V75 A1,1 0 0 0 67.25,74 Z"/>
+  </g>
+</svg>
diff --git a/src/frontend/static/aaguids/9c1f2b6e-4d3a-4f7c-8b21-5e6a7d8c9f01-dark.svg b/src/frontend/static/aaguids/9c1f2b6e-4d3a-4f7c-8b21-5e6a7d8c9f01-dark.svg
new file mode 100644
index 000000000..d9e189b73
--- /dev/null
+++ b/src/frontend/static/aaguids/9c1f2b6e-4d3a-4f7c-8b21-5e6a7d8c9f01-dark.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="128" height="128"><title>CyberArk Identity</title>
+<path d="M0 0 C5.10238917 2.08581184 9.70099352 4.88473345 14.4296875 7.703125 C16.56358617 8.96390718 18.69770773 10.22431216 20.83203125 11.484375 C21.38173584 11.80986328 21.38173584 11.80986328 24.16357422 13.45703125 C27.57563757 15.46545673 31.00164893 17.44763934 34.43359375 19.421875 C34.98313721 19.73882324 34.98313721 19.73882324 37.76416016 21.34277344 C39.89070106 22.56832492 42.01923846 23.79041964 44.14990234 25.00878906 C44.62854736 25.28577637 44.62854736 25.28577637 47.05078125 26.6875 C47.89825928 27.17444336 48.7457373 27.66138672 49.61889648 28.16308594 C51.5546875 29.453125 51.5546875 29.453125 52.5546875 31.453125 C51.45769531 32.06800781 50.36070313 32.68289062 49.23046875 33.31640625 C47.77602015 34.13277417 46.32159427 34.94918256 44.8671875 35.765625 C44.14595703 36.16974609 43.42472656 36.57386719 42.68164062 36.99023438 C41.97587891 37.38662109 41.27011719 37.78300781 40.54296875 38.19140625 C39.89884033 38.55274658 39.25471191 38.91408691 38.59106445 39.28637695 C37.91906006 39.67140381 37.24705566 40.05643066 36.5546875 40.453125 C35.64170898 40.83339844 34.72873047 41.21367188 33.78808594 41.60546875 C33.05106445 42.21519531 32.31404297 42.82492188 31.5546875 43.453125 C31.38037515 46.27595614 31.48601475 48.50951182 31.83203125 51.27734375 C33.78522839 75.87493575 33.78522839 75.87493575 29.324646 82.19628906 C22.95536727 88.73224293 13.86626368 92.24144421 5.44970703 95.34448242 C2.5546875 96.453125 2.5546875 96.453125 -0.4453125 98.453125 C-0.87768555 100.88330078 -0.87768555 100.88330078 -0.95703125 103.8984375 C-0.99248047 104.97480469 -1.02792969 106.05117187 -1.06445312 107.16015625 C-1.08701172 108.28808594 -1.10957031 109.41601562 -1.1328125 110.578125 C-1.16697266 111.71378906 -1.20113281 112.84945312 -1.23632812 114.01953125 C-1.31900752 116.83063079 -1.38809187 119.64141053 -1.4453125 122.453125 C-4.98965677 121.10856802 -8.25330443 119.54084156 -11.55859375 117.6875 C-12.56212891 117.12546875 -13.56566406 116.5634375 -14.59960938 115.984375 C-15.64181641 115.3965625 -16.68402344 114.80875 -17.7578125 114.203125 C-18.72654297 113.66171875 -19.69527344 113.1203125 -20.69335938 112.5625 C-22.88509597 111.33127994 -25.05494387 110.06067926 -27.20751953 108.76220703 C-30.56036259 106.81870815 -33.99993735 105.40974696 -37.60107422 103.98388672 C-44.33622897 101.07965818 -50.66511317 98.17398865 -55.4453125 92.453125 C-59.02834113 82.94114035 -57.83151617 72.24470459 -57.09326172 62.28741455 C-56.84518529 58.58294983 -56.73763244 54.87448062 -56.6171875 51.1640625 C-56.36166752 43.91623853 -55.95387817 36.68807709 -55.4453125 29.453125 C-55.07186958 29.2465477 -55.07186958 29.2465477 -53.18202209 28.20114136 C-26.19154055 13.26237673 -26.19154055 13.26237673 -14.8828125 6.578125 C-12.90261487 5.41360135 -10.92216073 4.24951373 -8.94140625 3.0859375 C-8.11825928 2.60012207 -7.2951123 2.11430664 -6.44702148 1.61376953 C-2.64401789 -0.5913139 -2.64401789 -0.5913139 0 0 Z M-8.3828125 28.53125 C-8.94476318 28.8584906 -9.50671387 29.1857312 -10.08569336 29.52288818 C-11.87923903 30.57153083 -13.6619635 31.63725397 -15.4453125 32.703125 C-16.64520127 33.406028 -17.84571621 34.10786324 -19.046875 34.80859375 C-22.19963906 36.65916249 -25.34372647 38.51736016 -28.4453125 40.453125 C-29.2197168 40.84959229 -29.99412109 41.24605957 -30.79199219 41.65454102 C-33.49591469 44.59603497 -32.93427837 48.05844556 -32.8359375 51.83984375 C-32.83027771 52.65685257 -32.82461792 53.47386139 -32.81878662 54.31562805 C-32.79639947 56.92455703 -32.74620096 59.53211136 -32.6953125 62.140625 C-32.67525042 63.90948537 -32.65699914 65.67836727 -32.640625 67.44726562 C-32.5965273 71.78308156 -32.52748544 76.11787025 -32.4453125 80.453125 C-32.09488892 80.64217407 -32.09488892 80.64217407 -30.3215332 81.59887695 C-27.13297938 83.31993087 -23.94538792 85.04275971 -20.7578125 86.765625 C-20.20641602 87.06307617 -20.20641602 87.06307617 -17.41601562 88.56835938 C-16.34931641 89.14521484 -15.28261719 89.72207031 -14.18359375 90.31640625 C-13.20430908 90.84532471 -12.22502441 91.37424316 -11.21606445 91.91918945 C-9.35488333 92.94957107 -7.5193716 94.02761026 -5.71166992 95.14916992 C-3.4453125 96.453125 -3.4453125 96.453125 -1.4453125 96.453125 C-1.4453125 84.573125 -1.4453125 72.693125 -1.4453125 60.453125 C0.2046875 59.793125 1.8546875 59.133125 3.5546875 58.453125 C7.69871419 56.22613299 11.74334254 53.82700973 15.8046875 51.453125 C16.9184375 50.81117187 18.0321875 50.16921875 19.1796875 49.5078125 C19.70820312 49.19972656 19.70820312 49.19972656 22.3828125 47.640625 C22.8670166 47.35896484 22.8670166 47.35896484 25.31738281 45.93359375 C27.5546875 44.453125 27.5546875 44.453125 28.5546875 42.453125 C24.78659575 40.18625136 21.01456277 37.92612993 17.23876953 35.67211914 C15.95544407 34.90474819 14.67320442 34.13555828 13.39208984 33.36450195 C11.54809004 32.25509788 9.70025586 31.15234168 7.8515625 30.05078125 C7.29645996 29.71824341 7.29645996 29.71824341 4.48730469 28.03540039 C-1.1530768 24.99216759 -2.75588076 25.2152553 -8.3828125 28.53125 Z " fill="#255AFF" transform="translate(65.4453125,5.546875)"/>
+</svg>
diff --git a/src/frontend/static/aaguids/9c1f2b6e-4d3a-4f7c-8b21-5e6a7d8c9f01-light.svg b/src/frontend/static/aaguids/9c1f2b6e-4d3a-4f7c-8b21-5e6a7d8c9f01-light.svg
new file mode 100644
index 000000000..e1765a4bd
--- /dev/null
+++ b/src/frontend/static/aaguids/9c1f2b6e-4d3a-4f7c-8b21-5e6a7d8c9f01-light.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="48" height="48"><title>CyberArk Identity</title>
+<path d="M0 0 C2.03750252 1.10468213 4.01406854 2.27865408 5.99047852 3.48901367 C6.67883789 3.88862305 7.36719727 4.28823242 8.07641602 4.69995117 C9.81374678 5.74786497 11.4730076 6.92290881 13.11547852 8.11401367 C13.11547852 9.10401367 13.11547852 10.09401367 13.11547852 11.11401367 C12.14610352 11.54713867 11.17672852 11.98026367 10.17797852 12.42651367 C8.47485352 13.42260742 8.47485352 13.42260742 7.11547852 15.11401367 C6.88110352 18.27416992 6.88110352 18.27416992 6.92797852 21.98901367 C6.85375977 25.77416992 6.85375977 25.77416992 6.11547852 29.11401367 C3.40257723 31.24896779 0.77712077 32.35980749 -2.40405273 33.67260742 C-4.88452148 35.11401367 -4.88452148 35.11401367 -5.83374023 37.46166992 C-6.04839979 39.73846879 -6.10183552 41.83979697 -5.88452148 44.11401367 C-10.24785358 42.52356247 -14.13238533 40.37225445 -18.13452148 38.05151367 C-18.45291992 37.86943359 -18.45291992 37.86943359 -20.06420898 36.94799805 C-24.743779 34.25475615 -24.743779 34.25475615 -25.88452148 33.11401367 C-26.33269536 29.23026694 -26.39605314 25.33209424 -26.50952148 21.42651367 C-26.58041992 20.33661133 -26.65131836 19.24670898 -26.72436523 18.1237793 C-26.90755797 10.20310386 -26.90755797 10.20310386 -24.00146484 7.109375 C-21.69270997 5.56440079 -19.38787244 4.31279767 -16.88452148 3.11401367 C-16.44946289 2.83106445 -16.44946289 2.83106445 -14.24780273 1.39916992 C-13.90942383 1.19743164 -13.90942383 1.19743164 -12.19702148 0.17651367 C-11.5125293 -0.24500977 -10.82803711 -0.6665332 -10.12280273 -1.10083008 C-6.41344343 -2.40201894 -3.5134491 -1.65180811 0 0 Z M-14.68920898 11.87182617 C-17.64687363 14.8926438 -17.86043281 16.93195098 -18.13452148 21.11401367 C-17.86318759 25.32191309 -17.6547391 27.33974938 -14.65405273 30.35620117 C-8.42399517 34.11401367 -8.42399517 34.11401367 -5.88452148 34.11401367 C-5.88452148 29.49401367 -5.88452148 24.87401367 -5.88452148 20.11401367 C-4.23452148 19.45401367 -2.58452148 18.79401367 -0.88452148 18.11401367 C1.92797852 16.61401367 1.92797852 16.61401367 4.11547852 15.11401367 C4.11547852 14.45401367 4.11547852 13.79401367 4.11547852 13.11401367 C2.66010284 12.27552563 1.20107478 11.44337433 -0.25952148 10.61401367 C-1.07163086 10.14995117 -1.88374023 9.68588867 -2.72045898 9.20776367 C-7.20891106 6.93923194 -10.69545931 9.4383169 -14.68920898 11.87182617 Z " fill="#807B7A" transform="translate(29.884521484375,3.885986328125)"/>
+</svg>
diff --git a/src/frontend/static/aaguids/9f8a3b2c-1d4e-4f6a-8b0c-2e1d3c4b5a69-dark.svg b/src/frontend/static/aaguids/9f8a3b2c-1d4e-4f6a-8b0c-2e1d3c4b5a69-dark.svg
new file mode 100644
index 000000000..06b528dc5
--- /dev/null
+++ b/src/frontend/static/aaguids/9f8a3b2c-1d4e-4f6a-8b0c-2e1d3c4b5a69-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 86 86" width="86" height="86"><defs><linearGradient id="g" x1="0" y1="0" x2="1" y2="1"><stop offset="0" stop-color="#E14D2A"/><stop offset="1" stop-color="#FD841F"/></linearGradient></defs><g transform="translate(6,0)"><path d="M37 8 L64 19 V46 c0 20 -15 30 -27 37 c-12 -7 -27 -17 -27 -37 V19 Z" fill="url(#g)"/><path d="M26.62 52.24Q24.880000000000003 52.24 23.575000000000003 51.445Q22.270000000000003 50.65 21.550000000000004 49.239999999999995Q20.830000000000002 47.83 20.830000000000002 46.0V37.120000000000005H24.61V45.7Q24.61 47.38 25.435000000000002 48.22Q26.26 49.06 27.79 49.06Q29.53 49.06 30.490000000000002 47.905Q31.450000000000003 46.75 31.450000000000003 44.68V37.120000000000005H35.230000000000004V52.0H31.51V50.05H30.97Q30.61 50.8 29.62 51.519999999999996Q28.630000000000003 52.24 26.62 52.24Z M38.589999999999996 52.0V49.48Q38.589999999999996 47.29 39.31 45.835Q40.03 44.38 41.394999999999996 43.435Q42.76 42.49 44.739999999999995 41.89L46.75 41.26Q47.86 40.9 48.61 40.375Q49.36 39.85 49.765 39.1Q50.17 38.35 50.17 37.39V37.27Q50.17 35.769999999999996 49.15 34.885Q48.129999999999995 34.0 46.36 34.0Q44.62 34.0 43.55499999999999 34.945Q42.489999999999995 35.89 42.489999999999995 37.66V38.2H38.65V37.72Q38.65 35.44 39.67 33.85Q40.69 32.260000000000005 42.44499999999999 31.42Q44.199999999999996 30.580000000000002 46.36 30.580000000000002Q48.519999999999996 30.580000000000002 50.26 31.405Q52.0 32.230000000000004 53.004999999999995 33.715Q54.01 35.2 54.01 37.21V37.51Q54.01 39.519999999999996 53.185 40.915Q52.36 42.31 50.95 43.195Q49.54 44.08 47.739999999999995 44.65L45.82 45.25Q44.53 45.64 43.81 46.105000000000004Q43.089999999999996 46.57 42.80499999999999 47.125Q42.519999999999996 47.68 42.519999999999996 48.46V48.58H53.83V52.0Z" fill="#ffffff"/></g></svg>
\ No newline at end of file
diff --git a/src/frontend/static/aaguids/9f8a3b2c-1d4e-4f6a-8b0c-2e1d3c4b5a69-light.svg b/src/frontend/static/aaguids/9f8a3b2c-1d4e-4f6a-8b0c-2e1d3c4b5a69-light.svg
new file mode 100644
index 000000000..06b528dc5
--- /dev/null
+++ b/src/frontend/static/aaguids/9f8a3b2c-1d4e-4f6a-8b0c-2e1d3c4b5a69-light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 86 86" width="86" height="86"><defs><linearGradient id="g" x1="0" y1="0" x2="1" y2="1"><stop offset="0" stop-color="#E14D2A"/><stop offset="1" stop-color="#FD841F"/></linearGradient></defs><g transform="translate(6,0)"><path d="M37 8 L64 19 V46 c0 20 -15 30 -27 37 c-12 -7 -27 -17 -27 -37 V19 Z" fill="url(#g)"/><path d="M26.62 52.24Q24.880000000000003 52.24 23.575000000000003 51.445Q22.270000000000003 50.65 21.550000000000004 49.239999999999995Q20.830000000000002 47.83 20.830000000000002 46.0V37.120000000000005H24.61V45.7Q24.61 47.38 25.435000000000002 48.22Q26.26 49.06 27.79 49.06Q29.53 49.06 30.490000000000002 47.905Q31.450000000000003 46.75 31.450000000000003 44.68V37.120000000000005H35.230000000000004V52.0H31.51V50.05H30.97Q30.61 50.8 29.62 51.519999999999996Q28.630000000000003 52.24 26.62 52.24Z M38.589999999999996 52.0V49.48Q38.589999999999996 47.29 39.31 45.835Q40.03 44.38 41.394999999999996 43.435Q42.76 42.49 44.739999999999995 41.89L46.75 41.26Q47.86 40.9 48.61 40.375Q49.36 39.85 49.765 39.1Q50.17 38.35 50.17 37.39V37.27Q50.17 35.769999999999996 49.15 34.885Q48.129999999999995 34.0 46.36 34.0Q44.62 34.0 43.55499999999999 34.945Q42.489999999999995 35.89 42.489999999999995 37.66V38.2H38.65V37.72Q38.65 35.44 39.67 33.85Q40.69 32.260000000000005 42.44499999999999 31.42Q44.199999999999996 30.580000000000002 46.36 30.580000000000002Q48.519999999999996 30.580000000000002 50.26 31.405Q52.0 32.230000000000004 53.004999999999995 33.715Q54.01 35.2 54.01 37.21V37.51Q54.01 39.519999999999996 53.185 40.915Q52.36 42.31 50.95 43.195Q49.54 44.08 47.739999999999995 44.65L45.82 45.25Q44.53 45.64 43.81 46.105000000000004Q43.089999999999996 46.57 42.80499999999999 47.125Q42.519999999999996 47.68 42.519999999999996 48.46V48.58H53.83V52.0Z" fill="#ffffff"/></g></svg>
\ No newline at end of file