diff --git a/src/frontend/src/lib/env/aaguids.json b/src/frontend/src/lib/env/aaguids.json
index f2aec9efa..67bcea325 100644
--- a/src/frontend/src/lib/env/aaguids.json
+++ b/src/frontend/src/lib/env/aaguids.json
@@ -138,5 +138,11 @@
 	},
 	"6bb49926-160a-4306-a100-4eb39ba6ac45": {
 		"name": "AVG Password Manager"
+	},
+	"da583154-ce16-4cdf-9fe6-1dba788c0998": {
+		"name": "Hey Be Safe"
+	},
+	"d2717a32-9851-48a8-9961-b264c97a411a": {
+		"name": "Fenko Vault"
 	}
 }
diff --git a/src/frontend/static/aaguids/d2717a32-9851-48a8-9961-b264c97a411a-dark.svg b/src/frontend/static/aaguids/d2717a32-9851-48a8-9961-b264c97a411a-dark.svg
new file mode 100644
index 000000000..aa454767c
--- /dev/null
+++ b/src/frontend/static/aaguids/d2717a32-9851-48a8-9961-b264c97a411a-dark.svg
@@ -0,0 +1,81 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-121 0 1260 1260">
+  <g transform="translate(0.000000,1260.000000) scale(0.100000,-0.100000)" stroke="none">
+    <g fill="#f3a020">
+        <path d="M4750 12129 c-398 -33 -721 -94 -1305 -249 -248 -66 -463 -122 -825
+-214 -162 -41 -338 -87 -390 -101 -52 -14 -102 -27 -110 -29 -254 -64 -870
+-223 -952 -247 -40 -11 -87 -24 -104 -28 -95 -24 -231 -107 -328 -200 -126
+-122 -205 -257 -249 -428 l-22 -88 0 -2830 0 -2830 23 -164 c35 -251 87 -484
+147 -662 14 -39 22 -75 20 -79 -3 -5 -2 -10 3 -12 4 -1 34 -68 66 -148 104
+-257 255 -523 432 -761 89 -119 96 -127 215 -258 136 -150 206 -214 394 -365
+39 -31 75 -59 80 -64 6 -4 44 -33 85 -63 41 -31 111 -82 155 -115 80 -59 157
+-113 290 -202 39 -26 72 -49 75 -52 14 -14 570 -384 667 -445 27 -16 104 -65
+173 -110 97 -63 370 -233 490 -306 8 -5 60 -37 115 -71 762 -471 900 -535
+1162 -545 180 -7 328 24 478 100 84 43 349 200 353 209 2 5 8 8 12 8 5 0 91
+50 192 110 221 134 180 109 378 231 90 56 170 102 177 102 7 0 10 3 8 6 -2 4
+59 45 136 91 76 47 139 88 139 93 0 4 5 7 11 7 6 0 25 10 42 23 17 12 39 27
+49 32 128 73 850 559 856 576 2 5 8 9 14 9 8 0 93 55 108 70 3 3 34 25 70 50
+294 202 618 481 795 685 103 120 279 360 336 460 191 337 265 499 337 732 81
+262 112 399 144 628 l23 170 0 2855 0 2855 -23 80 c-62 212 -194 399 -360 508
+-135 89 -178 104 -682 232 -444 114 -790 203 -850 219 -30 8 -163 42 -295 76
+-132 34 -274 70 -315 82 -41 11 -181 46 -310 79 -129 33 -269 69 -310 80 -439
+119 -793 181 -1175 209 -163 11 -494 11 -645 -1z"/>
+    </g>
+    <g fill="#12171d">
+        <path d="M2280 10500 c-15 -10 -87 -207 -126 -348 -161 -583 -104 -1204 166
+-1808 112 -252 207 -408 379 -628 140 -177 127 -145 134 -318 10 -250 40 -390
+138 -656 92 -251 184 -413 358 -632 94 -117 240 -265 346 -350 161 -128 384
+-260 556 -330 l57 -23 -58 -221 c-207 -796 -335 -1283 -451 -1721 -100 -376
+-101 -386 -49 -468 16 -25 48 -59 71 -74 l43 -28 617 -3 617 -3 11 33 c72 226
+4 501 -211 850 -125 202 -177 306 -216 428 -42 133 -54 207 -54 341 0 145 31
+269 103 417 111 226 247 365 594 609 68 48 150 122 255 229 86 88 185 185 221
+216 63 55 232 168 252 168 5 0 -18 -29 -51 -64 -89 -96 -149 -185 -198 -296
+-52 -118 -78 -213 -94 -345 -19 -143 -7 -262 51 -533 81 -383 90 -446 92 -637
+1 -188 -11 -296 -53 -490 -59 -272 -167 -513 -360 -807 l-78 -118 472 0 c259
+0 488 5 510 9 21 5 55 22 75 38 45 36 91 124 91 175 0 21 -47 215 -104 431
+-57 215 -145 550 -195 742 -276 1072 -277 1078 -285 1102 -5 17 -2 23 16 29
+62 19 295 144 407 217 359 237 613 526 802 912 144 295 228 644 229 948 0 58
+2 61 68 145 430 546 635 1055 683 1696 15 190 3 414 -31 603 -24 131 -96 388
+-138 488 l-29 70 -74 -1 c-207 -3 -523 -115 -787 -278 -211 -131 -444 -325
+-687 -571 l-150 -153 -30 20 c-66 43 -248 123 -385 169 -224 75 -484 119 -699
+119 -320 0 -699 -89 -998 -235 -73 -36 -135 -65 -137 -65 -3 0 -94 89 -203
+198 -369 369 -703 600 -1044 720 -135 48 -411 99 -439 82z m273 -294 c171 -44
+329 -124 562 -286 182 -127 352 -277 557 -492 275 -289 456 -498 658 -763 170
+-223 333 -426 369 -460 l32 -30 -8 45 c-4 25 -8 68 -8 95 l0 50 53 18 c29 9
+83 22 120 27 87 12 320 13 396 0 85 -14 166 -39 166 -51 0 -6 -23 -67 -50
+-136 -28 -69 -49 -130 -48 -135 2 -6 45 31 96 82 88 88 176 196 397 485 332
+434 822 958 1105 1181 94 74 320 219 420 269 100 50 232 100 304 115 74 15 74
+15 110 -118 56 -206 67 -285 73 -522 8 -356 -20 -548 -135 -895 -45 -138 -87
+-242 -134 -334 -127 -251 -332 -534 -554 -770 -101 -107 -351 -323 -415 -358
+-27 -14 -49 -30 -49 -35 0 -5 13 -62 30 -126 40 -160 60 -290 60 -394 l0 -87
+-32 -5 c-18 -3 -80 -10 -138 -16 -58 -6 -139 -18 -180 -26 -139 -28 -354 -125
+-515 -232 l-90 -60 -12 72 c-17 98 -35 140 -100 237 -75 111 -103 170 -103
+213 0 30 5 40 33 56 29 18 43 20 142 14 175 -9 250 27 312 152 43 88 63 101
+169 111 35 3 64 9 64 12 0 12 -112 75 -168 94 -30 10 -91 21 -136 24 -150 10
+-265 -28 -363 -119 -54 -51 -56 -52 -49 -23 26 113 140 264 251 331 l60 36
+-50 -7 c-278 -39 -469 -282 -452 -575 6 -110 32 -178 115 -299 36 -53 81 -130
+101 -171 33 -69 36 -83 36 -165 0 -112 -19 -155 -91 -204 -46 -31 -53 -33
+-114 -28 -58 4 -151 32 -189 56 -25 16 -3 57 54 100 104 79 113 166 22 200
+-81 31 -272 19 -322 -21 -51 -40 -23 -118 66 -183 51 -38 70 -75 49 -99 -13
+-17 -170 -56 -222 -56 -49 0 -121 49 -153 104 -67 114 -37 241 110 466 67 102
+85 137 100 198 19 70 19 221 1 288 -35 133 -147 274 -263 332 -63 32 -220 78
+-230 68 -7 -7 -12 -4 60 -40 111 -56 231 -209 253 -323 l6 -32 -45 44 c-117
+112 -262 148 -441 110 -67 -14 -171 -57 -211 -88 -18 -14 -14 -16 57 -27 102
+-17 128 -34 152 -100 27 -74 85 -131 159 -154 48 -15 76 -17 165 -11 l108 7
+32 -30 c52 -48 39 -107 -49 -227 -88 -119 -119 -193 -119 -287 0 -32 -4 -58
+-10 -58 -5 0 -47 26 -92 59 -157 110 -361 205 -508 235 -70 14 -225 33 -315
+39 l-40 2 1 130 c1 105 8 160 34 285 18 85 35 167 37 181 4 22 -3 31 -59 65
+-245 154 -590 525 -808 868 -202 320 -338 683 -396 1061 -26 165 -26 512 -1
+674 28 178 86 391 107 391 4 0 50 -11 103 -24z m2720 -4297 c42 -7 77 -16 77
+-19 0 -4 -33 -22 -72 -41 -70 -32 -78 -34 -188 -34 -106 0 -120 2 -177 29 -35
+16 -68 34 -73 42 -12 13 -12 13 140 34 75 10 182 6 293 -11z"/>
+        <path d="M2595 9960 c-9 -14 -42 -131 -55 -190 -18 -88 -24 -323 -11 -455 38
+-388 197 -830 401 -1115 141 -197 311 -381 460 -499 64 -51 241 -171 286 -194
+l31 -16 37 70 c72 141 206 300 351 417 39 32 39 32 26 69 -106 301 -412 836
+-689 1208 -235 314 -487 546 -720 664 -86 43 -110 52 -117 41z"/>
+        <path d="M7560 9957 c-192 -82 -312 -168 -506 -362 -208 -208 -265 -279 -509
+-640 -198 -292 -475 -825 -475 -914 0 -22 19 -47 91 -117 106 -104 218 -249
+272 -351 21 -40 42 -75 48 -78 5 -4 53 21 107 56 449 288 784 719 950 1224
+136 411 165 748 92 1071 -25 111 -35 126 -70 111z"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/frontend/static/aaguids/d2717a32-9851-48a8-9961-b264c97a411a-light.svg b/src/frontend/static/aaguids/d2717a32-9851-48a8-9961-b264c97a411a-light.svg
new file mode 100644
index 000000000..aa454767c
--- /dev/null
+++ b/src/frontend/static/aaguids/d2717a32-9851-48a8-9961-b264c97a411a-light.svg
@@ -0,0 +1,81 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-121 0 1260 1260">
+  <g transform="translate(0.000000,1260.000000) scale(0.100000,-0.100000)" stroke="none">
+    <g fill="#f3a020">
+        <path d="M4750 12129 c-398 -33 -721 -94 -1305 -249 -248 -66 -463 -122 -825
+-214 -162 -41 -338 -87 -390 -101 -52 -14 -102 -27 -110 -29 -254 -64 -870
+-223 -952 -247 -40 -11 -87 -24 -104 -28 -95 -24 -231 -107 -328 -200 -126
+-122 -205 -257 -249 -428 l-22 -88 0 -2830 0 -2830 23 -164 c35 -251 87 -484
+147 -662 14 -39 22 -75 20 -79 -3 -5 -2 -10 3 -12 4 -1 34 -68 66 -148 104
+-257 255 -523 432 -761 89 -119 96 -127 215 -258 136 -150 206 -214 394 -365
+39 -31 75 -59 80 -64 6 -4 44 -33 85 -63 41 -31 111 -82 155 -115 80 -59 157
+-113 290 -202 39 -26 72 -49 75 -52 14 -14 570 -384 667 -445 27 -16 104 -65
+173 -110 97 -63 370 -233 490 -306 8 -5 60 -37 115 -71 762 -471 900 -535
+1162 -545 180 -7 328 24 478 100 84 43 349 200 353 209 2 5 8 8 12 8 5 0 91
+50 192 110 221 134 180 109 378 231 90 56 170 102 177 102 7 0 10 3 8 6 -2 4
+59 45 136 91 76 47 139 88 139 93 0 4 5 7 11 7 6 0 25 10 42 23 17 12 39 27
+49 32 128 73 850 559 856 576 2 5 8 9 14 9 8 0 93 55 108 70 3 3 34 25 70 50
+294 202 618 481 795 685 103 120 279 360 336 460 191 337 265 499 337 732 81
+262 112 399 144 628 l23 170 0 2855 0 2855 -23 80 c-62 212 -194 399 -360 508
+-135 89 -178 104 -682 232 -444 114 -790 203 -850 219 -30 8 -163 42 -295 76
+-132 34 -274 70 -315 82 -41 11 -181 46 -310 79 -129 33 -269 69 -310 80 -439
+119 -793 181 -1175 209 -163 11 -494 11 -645 -1z"/>
+    </g>
+    <g fill="#12171d">
+        <path d="M2280 10500 c-15 -10 -87 -207 -126 -348 -161 -583 -104 -1204 166
+-1808 112 -252 207 -408 379 -628 140 -177 127 -145 134 -318 10 -250 40 -390
+138 -656 92 -251 184 -413 358 -632 94 -117 240 -265 346 -350 161 -128 384
+-260 556 -330 l57 -23 -58 -221 c-207 -796 -335 -1283 -451 -1721 -100 -376
+-101 -386 -49 -468 16 -25 48 -59 71 -74 l43 -28 617 -3 617 -3 11 33 c72 226
+4 501 -211 850 -125 202 -177 306 -216 428 -42 133 -54 207 -54 341 0 145 31
+269 103 417 111 226 247 365 594 609 68 48 150 122 255 229 86 88 185 185 221
+216 63 55 232 168 252 168 5 0 -18 -29 -51 -64 -89 -96 -149 -185 -198 -296
+-52 -118 -78 -213 -94 -345 -19 -143 -7 -262 51 -533 81 -383 90 -446 92 -637
+1 -188 -11 -296 -53 -490 -59 -272 -167 -513 -360 -807 l-78 -118 472 0 c259
+0 488 5 510 9 21 5 55 22 75 38 45 36 91 124 91 175 0 21 -47 215 -104 431
+-57 215 -145 550 -195 742 -276 1072 -277 1078 -285 1102 -5 17 -2 23 16 29
+62 19 295 144 407 217 359 237 613 526 802 912 144 295 228 644 229 948 0 58
+2 61 68 145 430 546 635 1055 683 1696 15 190 3 414 -31 603 -24 131 -96 388
+-138 488 l-29 70 -74 -1 c-207 -3 -523 -115 -787 -278 -211 -131 -444 -325
+-687 -571 l-150 -153 -30 20 c-66 43 -248 123 -385 169 -224 75 -484 119 -699
+119 -320 0 -699 -89 -998 -235 -73 -36 -135 -65 -137 -65 -3 0 -94 89 -203
+198 -369 369 -703 600 -1044 720 -135 48 -411 99 -439 82z m273 -294 c171 -44
+329 -124 562 -286 182 -127 352 -277 557 -492 275 -289 456 -498 658 -763 170
+-223 333 -426 369 -460 l32 -30 -8 45 c-4 25 -8 68 -8 95 l0 50 53 18 c29 9
+83 22 120 27 87 12 320 13 396 0 85 -14 166 -39 166 -51 0 -6 -23 -67 -50
+-136 -28 -69 -49 -130 -48 -135 2 -6 45 31 96 82 88 88 176 196 397 485 332
+434 822 958 1105 1181 94 74 320 219 420 269 100 50 232 100 304 115 74 15 74
+15 110 -118 56 -206 67 -285 73 -522 8 -356 -20 -548 -135 -895 -45 -138 -87
+-242 -134 -334 -127 -251 -332 -534 -554 -770 -101 -107 -351 -323 -415 -358
+-27 -14 -49 -30 -49 -35 0 -5 13 -62 30 -126 40 -160 60 -290 60 -394 l0 -87
+-32 -5 c-18 -3 -80 -10 -138 -16 -58 -6 -139 -18 -180 -26 -139 -28 -354 -125
+-515 -232 l-90 -60 -12 72 c-17 98 -35 140 -100 237 -75 111 -103 170 -103
+213 0 30 5 40 33 56 29 18 43 20 142 14 175 -9 250 27 312 152 43 88 63 101
+169 111 35 3 64 9 64 12 0 12 -112 75 -168 94 -30 10 -91 21 -136 24 -150 10
+-265 -28 -363 -119 -54 -51 -56 -52 -49 -23 26 113 140 264 251 331 l60 36
+-50 -7 c-278 -39 -469 -282 -452 -575 6 -110 32 -178 115 -299 36 -53 81 -130
+101 -171 33 -69 36 -83 36 -165 0 -112 -19 -155 -91 -204 -46 -31 -53 -33
+-114 -28 -58 4 -151 32 -189 56 -25 16 -3 57 54 100 104 79 113 166 22 200
+-81 31 -272 19 -322 -21 -51 -40 -23 -118 66 -183 51 -38 70 -75 49 -99 -13
+-17 -170 -56 -222 -56 -49 0 -121 49 -153 104 -67 114 -37 241 110 466 67 102
+85 137 100 198 19 70 19 221 1 288 -35 133 -147 274 -263 332 -63 32 -220 78
+-230 68 -7 -7 -12 -4 60 -40 111 -56 231 -209 253 -323 l6 -32 -45 44 c-117
+112 -262 148 -441 110 -67 -14 -171 -57 -211 -88 -18 -14 -14 -16 57 -27 102
+-17 128 -34 152 -100 27 -74 85 -131 159 -154 48 -15 76 -17 165 -11 l108 7
+32 -30 c52 -48 39 -107 -49 -227 -88 -119 -119 -193 -119 -287 0 -32 -4 -58
+-10 -58 -5 0 -47 26 -92 59 -157 110 -361 205 -508 235 -70 14 -225 33 -315
+39 l-40 2 1 130 c1 105 8 160 34 285 18 85 35 167 37 181 4 22 -3 31 -59 65
+-245 154 -590 525 -808 868 -202 320 -338 683 -396 1061 -26 165 -26 512 -1
+674 28 178 86 391 107 391 4 0 50 -11 103 -24z m2720 -4297 c42 -7 77 -16 77
+-19 0 -4 -33 -22 -72 -41 -70 -32 -78 -34 -188 -34 -106 0 -120 2 -177 29 -35
+16 -68 34 -73 42 -12 13 -12 13 140 34 75 10 182 6 293 -11z"/>
+        <path d="M2595 9960 c-9 -14 -42 -131 -55 -190 -18 -88 -24 -323 -11 -455 38
+-388 197 -830 401 -1115 141 -197 311 -381 460 -499 64 -51 241 -171 286 -194
+l31 -16 37 70 c72 141 206 300 351 417 39 32 39 32 26 69 -106 301 -412 836
+-689 1208 -235 314 -487 546 -720 664 -86 43 -110 52 -117 41z"/>
+        <path d="M7560 9957 c-192 -82 -312 -168 -506 -362 -208 -208 -265 -279 -509
+-640 -198 -292 -475 -825 -475 -914 0 -22 19 -47 91 -117 106 -104 218 -249
+272 -351 21 -40 42 -75 48 -78 5 -4 53 21 107 56 449 288 784 719 950 1224
+136 411 165 748 92 1071 -25 111 -35 126 -70 111z"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/frontend/static/aaguids/da583154-ce16-4cdf-9fe6-1dba788c0998-dark.svg b/src/frontend/static/aaguids/da583154-ce16-4cdf-9fe6-1dba788c0998-dark.svg
new file mode 100644
index 000000000..c6ea793a6
--- /dev/null
+++ b/src/frontend/static/aaguids/da583154-ce16-4cdf-9fe6-1dba788c0998-dark.svg
@@ -0,0 +1,23 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024" fill="none">
+  <rect width="1024" height="1024" fill="#0E4D5A"/>
+  <g transform="translate(64, 22) scale(14)">
+    <defs>
+      <linearGradient id="g" x1="0" y1="0" x2="0" y2="1">
+        <stop offset="0" stop-color="#F9A8D4"/>
+        <stop offset=".55" stop-color="#EC4899"/>
+        <stop offset="1" stop-color="#BE1865"/>
+      </linearGradient>
+      <radialGradient id="h" cx=".35" cy=".25" r=".5">
+        <stop offset="0" stop-color="#fff" stop-opacity=".55"/>
+        <stop offset="1" stop-color="#fff" stop-opacity="0"/>
+      </radialGradient>
+    </defs>
+    <path d="M32 56s-22-12-22-29c0-7 5-12 12-12 4 0 7.5 2 10 6 2.5-4 6-6 10-6 7 0 12 5 12 12 0 17-22 29-22 29z" fill="url(#g)"/>
+    <rect x="22" y="27" width="20" height="16" rx="3" fill="#fff" fill-opacity="0.16"/>
+    <rect x="22" y="27" width="20" height="16" rx="3" fill="none" stroke="#fff" stroke-width="2.5"/>
+    <path d="M26 27v-4a6 6 0 0 1 12 0v4" fill="none" stroke="#fff" stroke-width="2.5" stroke-linecap="round"/>
+    <circle cx="32" cy="34" r="1.75" fill="#fff"/>
+    <path d="M32 34v3.5" stroke="#fff" stroke-width="2" stroke-linecap="round"/>
+    <path d="M32 56s-22-12-22-29c0-7 5-12 12-12 4 0 7.5 2 10 6 2.5-4 6-6 10-6 7 0 12 5 12 12 0 17-22 29-22 29z" fill="url(#h)"/>
+  </g>
+</svg>
diff --git a/src/frontend/static/aaguids/da583154-ce16-4cdf-9fe6-1dba788c0998-light.svg b/src/frontend/static/aaguids/da583154-ce16-4cdf-9fe6-1dba788c0998-light.svg
new file mode 100644
index 000000000..c6ea793a6
--- /dev/null
+++ b/src/frontend/static/aaguids/da583154-ce16-4cdf-9fe6-1dba788c0998-light.svg
@@ -0,0 +1,23 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024" fill="none">
+  <rect width="1024" height="1024" fill="#0E4D5A"/>
+  <g transform="translate(64, 22) scale(14)">
+    <defs>
+      <linearGradient id="g" x1="0" y1="0" x2="0" y2="1">
+        <stop offset="0" stop-color="#F9A8D4"/>
+        <stop offset=".55" stop-color="#EC4899"/>
+        <stop offset="1" stop-color="#BE1865"/>
+      </linearGradient>
+      <radialGradient id="h" cx=".35" cy=".25" r=".5">
+        <stop offset="0" stop-color="#fff" stop-opacity=".55"/>
+        <stop offset="1" stop-color="#fff" stop-opacity="0"/>
+      </radialGradient>
+    </defs>
+    <path d="M32 56s-22-12-22-29c0-7 5-12 12-12 4 0 7.5 2 10 6 2.5-4 6-6 10-6 7 0 12 5 12 12 0 17-22 29-22 29z" fill="url(#g)"/>
+    <rect x="22" y="27" width="20" height="16" rx="3" fill="#fff" fill-opacity="0.16"/>
+    <rect x="22" y="27" width="20" height="16" rx="3" fill="none" stroke="#fff" stroke-width="2.5"/>
+    <path d="M26 27v-4a6 6 0 0 1 12 0v4" fill="none" stroke="#fff" stroke-width="2.5" stroke-linecap="round"/>
+    <circle cx="32" cy="34" r="1.75" fill="#fff"/>
+    <path d="M32 34v3.5" stroke="#fff" stroke-width="2" stroke-linecap="round"/>
+    <path d="M32 56s-22-12-22-29c0-7 5-12 12-12 4 0 7.5 2 10 6 2.5-4 6-6 10-6 7 0 12 5 12 12 0 17-22 29-22 29z" fill="url(#h)"/>
+  </g>
+</svg>