diff --git a/app/react/edge/components/edge-agent-async.svg b/app/react/edge/components/edge-agent-async.svg
index fa1a0b9ee..5ac438b92 100644
--- a/app/react/edge/components/edge-agent-async.svg
+++ b/app/react/edge/components/edge-agent-async.svg
@@ -1,6 +1,6 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_566_495341)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.8878 1.14478C17.8878 1.02052 17.9886 0.919784 18.1128 0.919784L21.1025 0.919784L20.6034 0.420659C20.5155 0.332791 20.5155 0.190329 20.6034 0.102461C20.6913 0.0145931 20.8337 0.0145931 20.9216 0.102461L21.8048 0.985685C21.847 1.02788 21.8707 1.08511 21.8707 1.14478C21.8707 1.20446 21.847 1.26169 21.8048 1.30388L20.9216 2.18711C20.8337 2.27498 20.6913 2.27498 20.6034 2.18711C20.5155 2.09924 20.5155 1.95678 20.6034 1.86891L21.1025 1.36978L18.1128 1.36978C17.9886 1.36978 17.8878 1.26905 17.8878 1.14478ZM21.8719 3.75998C21.8719 3.88424 21.7712 3.98498 21.6469 3.98498L18.6572 3.98498L19.1563 4.48411C19.2442 4.57197 19.2442 4.71444 19.1563 4.8023C19.0684 4.89017 18.926 4.89017 18.8381 4.8023L17.9549 3.91908C17.9127 3.87688 17.889 3.81965 17.889 3.75998C17.889 3.70031 17.9127 3.64308 17.9549 3.60088L18.8381 2.71766C18.926 2.62979 19.0684 2.62979 19.1563 2.71766C19.2442 2.80552 19.2442 2.94799 19.1563 3.03585L18.6572 3.53498L21.6469 3.53498C21.7712 3.53498 21.8719 3.63572 21.8719 3.75998ZM12.0029 2.5332C9.42495 2.5332 7.25537 4.27581 6.60571 6.64735C4.65797 7.09904 3.20686 8.84425 3.20686 10.9291C3.20686 13.3567 5.17475 15.3245 7.60226 15.3245H7.96694V19.0776C7.96694 19.2239 7.84831 19.3426 7.70198 19.3426H6.09254C5.90054 18.3678 5.0412 17.6326 4.01015 17.6326C2.83795 17.6326 1.8877 18.5829 1.8877 19.7551C1.8877 20.9273 2.83795 21.8775 4.01015 21.8775C4.95661 21.8775 5.75837 21.258 6.03208 20.4024H7.70198C8.43366 20.4024 9.02681 19.8093 9.02681 19.0776V15.3245H11.4749V19.8209C10.5573 20.055 9.87878 20.887 9.87878 21.8776C9.87878 23.0498 10.829 24 12.0012 24C13.1734 24 14.1237 23.0498 14.1237 21.8776C14.1237 20.8897 13.4487 20.0594 12.5348 19.8228V15.3245H14.9261V19.0776C14.9261 19.8093 15.5193 20.4024 16.251 20.4024H17.9681C18.2418 21.258 19.0436 21.8775 19.99 21.8775C21.1622 21.8775 22.1125 20.9273 22.1125 19.7551C22.1125 18.5829 21.1622 17.6326 19.99 17.6326C18.959 17.6326 18.0997 18.3678 17.9077 19.3426H16.251C16.1046 19.3426 15.986 19.2239 15.986 19.0776V15.3245H16.4035C18.831 15.3245 20.7989 13.3567 20.7989 10.9291C20.7989 8.84425 19.3478 7.09904 17.4 6.64736C16.7504 4.27582 14.5808 2.5332 12.0029 2.5332ZM8.05038 7.4731C8.36278 5.57283 10.0143 4.123 12.0029 4.123C13.9915 4.123 15.643 5.57283 15.9554 7.4731C16.014 7.83001 16.3063 8.10231 16.6664 8.13566C18.0922 8.26771 19.2091 9.46846 19.2091 10.9291C19.2091 12.4786 17.953 13.7347 16.4035 13.7347H7.60226C6.05278 13.7347 4.79667 12.4786 4.79667 10.9291C4.79667 9.46846 5.91353 8.26771 7.33932 8.13566C7.69948 8.10231 7.99171 7.83001 8.05038 7.4731ZM12.002 8.28697C11.0562 8.28697 10.1435 8.63556 9.43858 9.2661C9.30224 9.38805 9.09285 9.37638 8.9709 9.24004C8.84896 9.1037 8.86062 8.89431 8.99697 8.77237C9.82338 8.0332 10.8932 7.62455 12.002 7.62455C13.1108 7.62455 14.1806 8.0332 15.007 8.77237C15.1434 8.89431 15.155 9.1037 15.0331 9.24004C14.9111 9.37638 14.7018 9.38805 14.5654 9.2661C13.8605 8.63556 12.9478 8.28697 12.002 8.28697ZM12.002 9.71836C11.3599 9.71836 10.7434 9.97011 10.2849 10.4196C10.1543 10.5476 9.94456 10.5455 9.81651 10.4149C9.68847 10.2843 9.69056 10.0746 9.82119 9.94651C10.4036 9.37568 11.1865 9.05594 12.002 9.05594C12.8175 9.05594 13.6004 9.37568 14.1828 9.94651C14.3134 10.0746 14.3155 10.2843 14.1875 10.4149C14.0594 10.5455 13.8497 10.5476 13.7191 10.4196C13.2606 9.97011 12.6441 9.71836 12.002 9.71836ZM12.002 11.0908C11.7243 11.0908 11.4577 11.1997 11.2594 11.3941C11.1287 11.5221 10.919 11.52 10.791 11.3894C10.6629 11.2587 10.665 11.049 10.7957 10.921C11.1178 10.6052 11.5509 10.4284 12.002 10.4284C12.4531 10.4284 12.8862 10.6052 13.2083 10.921C13.339 11.049 13.3411 11.2587 13.213 11.3894C13.085 11.52 12.8753 11.5221 12.7446 11.3941C12.5463 11.1997 12.2797 11.0908 12.002 11.0908ZM11.6708 12.132C11.6708 11.9491 11.8191 11.8008 12.002 11.8008H12.0048C12.1877 11.8008 12.336 11.9491 12.336 12.132C12.336 12.3149 12.1877 12.4632 12.0048 12.4632H12.002C11.8191 12.4632 11.6708 12.3149 11.6708 12.132ZM4.01015 20.8177C4.597 20.8177 5.07274 20.3419 5.07274 19.7551C5.07274 19.1682 4.597 18.6925 4.01015 18.6925C3.4233 18.6925 2.94756 19.1682 2.94756 19.7551C2.94756 20.3419 3.4233 20.8177 4.01015 20.8177ZM13.0638 21.8776C13.0638 22.4644 12.5881 22.9402 12.0012 22.9402C11.4144 22.9402 10.9386 22.4644 10.9386 21.8776C10.9386 21.2907 11.4144 20.815 12.0012 20.815C12.5881 20.815 13.0638 21.2907 13.0638 21.8776ZM19.99 20.8177C20.5769 20.8177 21.0526 20.3419 21.0526 19.7551C21.0526 19.1682 20.5769 18.6925 19.99 18.6925C19.4032 18.6925 18.9275 19.1682 18.9275 19.7551C18.9275 20.3419 19.4032 20.8177 19.99 20.8177Z" fill="#0086C9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.8878 1.14478C17.8878 1.02052 17.9886 0.919784 18.1128 0.919784L21.1025 0.919784L20.6034 0.420659C20.5155 0.332791 20.5155 0.190329 20.6034 0.102461C20.6913 0.0145931 20.8337 0.0145931 20.9216 0.102461L21.8048 0.985685C21.847 1.02788 21.8707 1.08511 21.8707 1.14478C21.8707 1.20446 21.847 1.26169 21.8048 1.30388L20.9216 2.18711C20.8337 2.27498 20.6913 2.27498 20.6034 2.18711C20.5155 2.09924 20.5155 1.95678 20.6034 1.86891L21.1025 1.36978L18.1128 1.36978C17.9886 1.36978 17.8878 1.26905 17.8878 1.14478ZM21.8719 3.75998C21.8719 3.88424 21.7712 3.98498 21.6469 3.98498L18.6572 3.98498L19.1563 4.48411C19.2442 4.57197 19.2442 4.71444 19.1563 4.8023C19.0684 4.89017 18.926 4.89017 18.8381 4.8023L17.9549 3.91908C17.9127 3.87688 17.889 3.81965 17.889 3.75998C17.889 3.70031 17.9127 3.64308 17.9549 3.60088L18.8381 2.71766C18.926 2.62979 19.0684 2.62979 19.1563 2.71766C19.2442 2.80552 19.2442 2.94799 19.1563 3.03585L18.6572 3.53498L21.6469 3.53498C21.7712 3.53498 21.8719 3.63572 21.8719 3.75998ZM12.0029 2.5332C9.42495 2.5332 7.25537 4.27581 6.60571 6.64735C4.65797 7.09904 3.20686 8.84425 3.20686 10.9291C3.20686 13.3567 5.17475 15.3245 7.60226 15.3245H7.96694V19.0776C7.96694 19.2239 7.84831 19.3426 7.70198 19.3426H6.09254C5.90054 18.3678 5.0412 17.6326 4.01015 17.6326C2.83795 17.6326 1.8877 18.5829 1.8877 19.7551C1.8877 20.9273 2.83795 21.8775 4.01015 21.8775C4.95661 21.8775 5.75837 21.258 6.03208 20.4024H7.70198C8.43366 20.4024 9.02681 19.8093 9.02681 19.0776V15.3245H11.4749V19.8209C10.5573 20.055 9.87878 20.887 9.87878 21.8776C9.87878 23.0498 10.829 24 12.0012 24C13.1734 24 14.1237 23.0498 14.1237 21.8776C14.1237 20.8897 13.4487 20.0594 12.5348 19.8228V15.3245H14.9261V19.0776C14.9261 19.8093 15.5193 20.4024 16.251 20.4024H17.9681C18.2418 21.258 19.0436 21.8775 19.99 21.8775C21.1622 21.8775 22.1125 20.9273 22.1125 19.7551C22.1125 18.5829 21.1622 17.6326 19.99 17.6326C18.959 17.6326 18.0997 18.3678 17.9077 19.3426H16.251C16.1046 19.3426 15.986 19.2239 15.986 19.0776V15.3245H16.4035C18.831 15.3245 20.7989 13.3567 20.7989 10.9291C20.7989 8.84425 19.3478 7.09904 17.4 6.64736C16.7504 4.27582 14.5808 2.5332 12.0029 2.5332ZM8.05038 7.4731C8.36278 5.57283 10.0143 4.123 12.0029 4.123C13.9915 4.123 15.643 5.57283 15.9554 7.4731C16.014 7.83001 16.3063 8.10231 16.6664 8.13566C18.0922 8.26771 19.2091 9.46846 19.2091 10.9291C19.2091 12.4786 17.953 13.7347 16.4035 13.7347H7.60226C6.05278 13.7347 4.79667 12.4786 4.79667 10.9291C4.79667 9.46846 5.91353 8.26771 7.33932 8.13566C7.69948 8.10231 7.99171 7.83001 8.05038 7.4731ZM12.002 8.28697C11.0562 8.28697 10.1435 8.63556 9.43858 9.2661C9.30224 9.38805 9.09285 9.37638 8.9709 9.24004C8.84896 9.1037 8.86062 8.89431 8.99697 8.77237C9.82338 8.0332 10.8932 7.62455 12.002 7.62455C13.1108 7.62455 14.1806 8.0332 15.007 8.77237C15.1434 8.89431 15.155 9.1037 15.0331 9.24004C14.9111 9.37638 14.7018 9.38805 14.5654 9.2661C13.8605 8.63556 12.9478 8.28697 12.002 8.28697ZM12.002 9.71836C11.3599 9.71836 10.7434 9.97011 10.2849 10.4196C10.1543 10.5476 9.94456 10.5455 9.81651 10.4149C9.68847 10.2843 9.69056 10.0746 9.82119 9.94651C10.4036 9.37568 11.1865 9.05594 12.002 9.05594C12.8175 9.05594 13.6004 9.37568 14.1828 9.94651C14.3134 10.0746 14.3155 10.2843 14.1875 10.4149C14.0594 10.5455 13.8497 10.5476 13.7191 10.4196C13.2606 9.97011 12.6441 9.71836 12.002 9.71836ZM12.002 11.0908C11.7243 11.0908 11.4577 11.1997 11.2594 11.3941C11.1287 11.5221 10.919 11.52 10.791 11.3894C10.6629 11.2587 10.665 11.049 10.7957 10.921C11.1178 10.6052 11.5509 10.4284 12.002 10.4284C12.4531 10.4284 12.8862 10.6052 13.2083 10.921C13.339 11.049 13.3411 11.2587 13.213 11.3894C13.085 11.52 12.8753 11.5221 12.7446 11.3941C12.5463 11.1997 12.2797 11.0908 12.002 11.0908ZM11.6708 12.132C11.6708 11.9491 11.8191 11.8008 12.002 11.8008H12.0048C12.1877 11.8008 12.336 11.9491 12.336 12.132C12.336 12.3149 12.1877 12.4632 12.0048 12.4632H12.002C11.8191 12.4632 11.6708 12.3149 11.6708 12.132ZM4.01015 20.8177C4.597 20.8177 5.07274 20.3419 5.07274 19.7551C5.07274 19.1682 4.597 18.6925 4.01015 18.6925C3.4233 18.6925 2.94756 19.1682 2.94756 19.7551C2.94756 20.3419 3.4233 20.8177 4.01015 20.8177ZM13.0638 21.8776C13.0638 22.4644 12.5881 22.9402 12.0012 22.9402C11.4144 22.9402 10.9386 22.4644 10.9386 21.8776C10.9386 21.2907 11.4144 20.815 12.0012 20.815C12.5881 20.815 13.0638 21.2907 13.0638 21.8776ZM19.99 20.8177C20.5769 20.8177 21.0526 20.3419 21.0526 19.7551C21.0526 19.1682 20.5769 18.6925 19.99 18.6925C19.4032 18.6925 18.9275 19.1682 18.9275 19.7551C18.9275 20.3419 19.4032 20.8177 19.99 20.8177Z" fill="currentColor"/>
 </g>
 <defs>
 <clipPath id="clip0_566_495341">
diff --git a/app/react/edge/components/edge-agent-standard.svg b/app/react/edge/components/edge-agent-standard.svg
index 8590d5130..adb1baca0 100644
--- a/app/react/edge/components/edge-agent-standard.svg
+++ b/app/react/edge/components/edge-agent-standard.svg
@@ -1,6 +1,6 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_566_495340)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.60571 6.64736C7.25537 4.27582 9.42495 2.5332 12.0029 2.5332C14.5808 2.5332 16.7504 4.27582 17.4 6.64736C19.3478 7.09905 20.7989 8.84425 20.7989 10.9292C20.7989 13.3567 18.831 15.3246 16.4035 15.3246H15.986V19.0776C15.986 19.2239 16.1046 19.3426 16.251 19.3426H17.9077C18.0997 18.3678 18.959 17.6326 19.99 17.6326C21.1622 17.6326 22.1125 18.5829 22.1125 19.7551C22.1125 20.9273 21.1622 21.8775 19.99 21.8775C19.0436 21.8775 18.2418 21.258 17.9681 20.4024H16.251C15.5193 20.4024 14.9261 19.8093 14.9261 19.0776V15.3246H12.5348V19.8228C13.4487 20.0594 14.1237 20.8897 14.1237 21.8776C14.1237 23.0498 13.1734 24 12.0012 24C10.829 24 9.87878 23.0498 9.87878 21.8776C9.87878 20.8871 10.5573 20.055 11.4749 19.8209V15.3246H9.02681V19.0776C9.02681 19.8093 8.43366 20.4024 7.70198 20.4024H6.03208C5.75837 21.258 4.95661 21.8775 4.01015 21.8775C2.83795 21.8775 1.8877 20.9273 1.8877 19.7551C1.8877 18.5829 2.83795 17.6326 4.01015 17.6326C5.0412 17.6326 5.90054 18.3678 6.09254 19.3426H7.70198C7.84831 19.3426 7.96694 19.2239 7.96694 19.0776V15.3246H7.60226C5.17475 15.3246 3.20686 13.3567 3.20686 10.9292C3.20686 8.84426 4.65797 7.09905 6.60571 6.64736ZM12.0029 4.12301C10.0143 4.12301 8.36278 5.57284 8.05038 7.4731C7.99171 7.83001 7.69948 8.10231 7.33932 8.13567C5.91353 8.26772 4.79667 9.46847 4.79667 10.9292C4.79667 12.4786 6.05278 13.7347 7.60226 13.7347H16.4035C17.953 13.7347 19.2091 12.4786 19.2091 10.9292C19.2091 9.46847 18.0922 8.26772 16.6664 8.13567C16.3063 8.10231 16.014 7.83001 15.9554 7.4731C15.643 5.57284 13.9915 4.12301 12.0029 4.12301ZM9.43858 9.26611C10.1435 8.63557 11.0562 8.28697 12.002 8.28697C12.9478 8.28697 13.8605 8.63557 14.5654 9.26611C14.7018 9.38806 14.9111 9.37639 15.0331 9.24005C15.155 9.1037 15.1434 8.89432 15.007 8.77237C14.1806 8.0332 13.1108 7.62455 12.002 7.62455C10.8932 7.62455 9.82338 8.0332 8.99697 8.77237C8.86062 8.89432 8.84896 9.1037 8.9709 9.24005C9.09285 9.37639 9.30224 9.38806 9.43858 9.26611ZM10.2849 10.4196C10.7434 9.97012 11.3599 9.71837 12.002 9.71837C12.6441 9.71837 13.2606 9.97012 13.7191 10.4196C13.8497 10.5476 14.0594 10.5455 14.1875 10.4149C14.3155 10.2843 14.3134 10.0746 14.1828 9.94652C13.6004 9.37569 12.8175 9.05595 12.002 9.05595C11.1865 9.05595 10.4036 9.37569 9.82119 9.94652C9.69056 10.0746 9.68847 10.2843 9.81651 10.4149C9.94456 10.5455 10.1543 10.5476 10.2849 10.4196ZM11.2594 11.3941C11.4577 11.1997 11.7243 11.0908 12.002 11.0908C12.2797 11.0908 12.5463 11.1997 12.7446 11.3941C12.8753 11.5221 13.085 11.52 13.213 11.3894C13.3411 11.2587 13.339 11.049 13.2083 10.921C12.8862 10.6052 12.4531 10.4284 12.002 10.4284C11.5509 10.4284 11.1178 10.6052 10.7957 10.921C10.665 11.049 10.6629 11.2587 10.791 11.3894C10.919 11.52 11.1287 11.5221 11.2594 11.3941ZM12.002 11.8008C11.8191 11.8008 11.6708 11.9491 11.6708 12.132C11.6708 12.3149 11.8191 12.4632 12.002 12.4632H12.0048C12.1877 12.4632 12.336 12.3149 12.336 12.132C12.336 11.9491 12.1877 11.8008 12.0048 11.8008H12.002ZM5.07274 19.7551C5.07274 20.3419 4.597 20.8177 4.01015 20.8177C3.4233 20.8177 2.94756 20.3419 2.94756 19.7551C2.94756 19.1682 3.4233 18.6925 4.01015 18.6925C4.597 18.6925 5.07274 19.1682 5.07274 19.7551ZM12.0012 22.9402C12.5881 22.9402 13.0638 22.4644 13.0638 21.8776C13.0638 21.2907 12.5881 20.815 12.0012 20.815C11.4144 20.815 10.9386 21.2907 10.9386 21.8776C10.9386 22.4644 11.4144 22.9402 12.0012 22.9402ZM21.0526 19.7551C21.0526 20.3419 20.5769 20.8177 19.99 20.8177C19.4032 20.8177 18.9275 20.3419 18.9275 19.7551C18.9275 19.1682 19.4032 18.6925 19.99 18.6925C20.5769 18.6925 21.0526 19.1682 21.0526 19.7551Z" fill="#0086C9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.60571 6.64736C7.25537 4.27582 9.42495 2.5332 12.0029 2.5332C14.5808 2.5332 16.7504 4.27582 17.4 6.64736C19.3478 7.09905 20.7989 8.84425 20.7989 10.9292C20.7989 13.3567 18.831 15.3246 16.4035 15.3246H15.986V19.0776C15.986 19.2239 16.1046 19.3426 16.251 19.3426H17.9077C18.0997 18.3678 18.959 17.6326 19.99 17.6326C21.1622 17.6326 22.1125 18.5829 22.1125 19.7551C22.1125 20.9273 21.1622 21.8775 19.99 21.8775C19.0436 21.8775 18.2418 21.258 17.9681 20.4024H16.251C15.5193 20.4024 14.9261 19.8093 14.9261 19.0776V15.3246H12.5348V19.8228C13.4487 20.0594 14.1237 20.8897 14.1237 21.8776C14.1237 23.0498 13.1734 24 12.0012 24C10.829 24 9.87878 23.0498 9.87878 21.8776C9.87878 20.8871 10.5573 20.055 11.4749 19.8209V15.3246H9.02681V19.0776C9.02681 19.8093 8.43366 20.4024 7.70198 20.4024H6.03208C5.75837 21.258 4.95661 21.8775 4.01015 21.8775C2.83795 21.8775 1.8877 20.9273 1.8877 19.7551C1.8877 18.5829 2.83795 17.6326 4.01015 17.6326C5.0412 17.6326 5.90054 18.3678 6.09254 19.3426H7.70198C7.84831 19.3426 7.96694 19.2239 7.96694 19.0776V15.3246H7.60226C5.17475 15.3246 3.20686 13.3567 3.20686 10.9292C3.20686 8.84426 4.65797 7.09905 6.60571 6.64736ZM12.0029 4.12301C10.0143 4.12301 8.36278 5.57284 8.05038 7.4731C7.99171 7.83001 7.69948 8.10231 7.33932 8.13567C5.91353 8.26772 4.79667 9.46847 4.79667 10.9292C4.79667 12.4786 6.05278 13.7347 7.60226 13.7347H16.4035C17.953 13.7347 19.2091 12.4786 19.2091 10.9292C19.2091 9.46847 18.0922 8.26772 16.6664 8.13567C16.3063 8.10231 16.014 7.83001 15.9554 7.4731C15.643 5.57284 13.9915 4.12301 12.0029 4.12301ZM9.43858 9.26611C10.1435 8.63557 11.0562 8.28697 12.002 8.28697C12.9478 8.28697 13.8605 8.63557 14.5654 9.26611C14.7018 9.38806 14.9111 9.37639 15.0331 9.24005C15.155 9.1037 15.1434 8.89432 15.007 8.77237C14.1806 8.0332 13.1108 7.62455 12.002 7.62455C10.8932 7.62455 9.82338 8.0332 8.99697 8.77237C8.86062 8.89432 8.84896 9.1037 8.9709 9.24005C9.09285 9.37639 9.30224 9.38806 9.43858 9.26611ZM10.2849 10.4196C10.7434 9.97012 11.3599 9.71837 12.002 9.71837C12.6441 9.71837 13.2606 9.97012 13.7191 10.4196C13.8497 10.5476 14.0594 10.5455 14.1875 10.4149C14.3155 10.2843 14.3134 10.0746 14.1828 9.94652C13.6004 9.37569 12.8175 9.05595 12.002 9.05595C11.1865 9.05595 10.4036 9.37569 9.82119 9.94652C9.69056 10.0746 9.68847 10.2843 9.81651 10.4149C9.94456 10.5455 10.1543 10.5476 10.2849 10.4196ZM11.2594 11.3941C11.4577 11.1997 11.7243 11.0908 12.002 11.0908C12.2797 11.0908 12.5463 11.1997 12.7446 11.3941C12.8753 11.5221 13.085 11.52 13.213 11.3894C13.3411 11.2587 13.339 11.049 13.2083 10.921C12.8862 10.6052 12.4531 10.4284 12.002 10.4284C11.5509 10.4284 11.1178 10.6052 10.7957 10.921C10.665 11.049 10.6629 11.2587 10.791 11.3894C10.919 11.52 11.1287 11.5221 11.2594 11.3941ZM12.002 11.8008C11.8191 11.8008 11.6708 11.9491 11.6708 12.132C11.6708 12.3149 11.8191 12.4632 12.002 12.4632H12.0048C12.1877 12.4632 12.336 12.3149 12.336 12.132C12.336 11.9491 12.1877 11.8008 12.0048 11.8008H12.002ZM5.07274 19.7551C5.07274 20.3419 4.597 20.8177 4.01015 20.8177C3.4233 20.8177 2.94756 20.3419 2.94756 19.7551C2.94756 19.1682 3.4233 18.6925 4.01015 18.6925C4.597 18.6925 5.07274 19.1682 5.07274 19.7551ZM12.0012 22.9402C12.5881 22.9402 13.0638 22.4644 13.0638 21.8776C13.0638 21.2907 12.5881 20.815 12.0012 20.815C11.4144 20.815 10.9386 21.2907 10.9386 21.8776C10.9386 22.4644 11.4144 22.9402 12.0012 22.9402ZM21.0526 19.7551C21.0526 20.3419 20.5769 20.8177 19.99 20.8177C19.4032 20.8177 18.9275 20.3419 18.9275 19.7551C18.9275 19.1682 19.4032 18.6925 19.99 18.6925C20.5769 18.6925 21.0526 19.1682 21.0526 19.7551Z" fill="currentColor"/>
 </g>
 <defs>
 <clipPath id="clip0_566_495340">
diff --git a/app/react/portainer/environments/ItemView/EdgeKeyDisplay.tsx b/app/react/portainer/environments/ItemView/EdgeKeyDisplay.tsx
index 5b6860e03..6e1f77d88 100644
--- a/app/react/portainer/environments/ItemView/EdgeKeyDisplay.tsx
+++ b/app/react/portainer/environments/ItemView/EdgeKeyDisplay.tsx
@@ -1,6 +1,7 @@
 import { CopyButton } from '@@/buttons';
 import { FormSection } from '@@/form-components/FormSection';
 import { TextTip } from '@@/Tip/TextTip';
+import { Code } from '@@/Code';
 
 export function EdgeKeyDisplay({ edgeKey }: { edgeKey: string }) {
   return (
@@ -15,9 +16,7 @@ export function EdgeKeyDisplay({ edgeKey }: { edgeKey: string }) {
         <a href="https://downloads.portainer.io/edge_agent_guide.pdf">here.</a>
       </p>
 
-      <div className="mt-2 break-words">
-        <code>{edgeKey}</code>
-      </div>
+      <Code>{edgeKey}</Code>
 
       <CopyButton copyText={edgeKey}>Copy token</CopyButton>
     </FormSection>
diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/WizardDocker.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/WizardDocker.tsx
index 181dc2885..90690ecc7 100644
--- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/WizardDocker.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/WizardDocker.tsx
@@ -50,16 +50,14 @@ const defaultOptions: BoxSelectorOption<
   },
   {
     id: 'edgeAgentStandard',
-    icon: EdgeAgentStandardIcon,
-    iconType: 'badge',
+    icon: <BadgeIcon icon={EdgeAgentStandardIcon} size="3xl" />,
     label: 'Edge Agent Standard',
     description: '',
     value: 'edgeAgentStandard',
   },
   isBE && {
     id: 'edgeAgentAsync',
-    icon: EdgeAgentAsyncIcon,
-    iconType: 'badge',
+    icon: <BadgeIcon icon={EdgeAgentAsyncIcon} size="3xl" />,
     label: 'Edge Agent Async',
     description: '',
     value: 'edgeAgentAsync',