diff --git a/src/drivers/webextension/images/icons/AdRoll.svg b/src/drivers/webextension/images/icons/AdRoll.svg
index 3f485d3a2..732a7aed5 100644
--- a/src/drivers/webextension/images/icons/AdRoll.svg
+++ b/src/drivers/webextension/images/icons/AdRoll.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.804002 84.800004" height="84.8" width="96.804"><path d="M.001 84.8H50.2c48-.8 46.6-42.5 46.6-42.5C95.099-.6 55.599 0 55.599 0c-17 .1-28 10.3-33.1 16.5l14.7 19.3s5.6-12.5 19.4-11.1c0 0 14.2 1.4 14.4 16.9 0 0 .2 15.4-19.6 16.2H0z" fill="#00aeef"/></svg>
\ No newline at end of file
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.640319 29.696H16.704C32.064 29.44 31.616 16.096 31.616 16.096C31.0717 2.368 18.4317 2.56 18.4317 2.56C12.9917 2.592 9.47168 5.856 7.83968 7.84L12.5437 14.016C12.5437 14.016 14.3357 10.016 18.7517 10.464C18.7517 10.464 23.2957 10.912 23.3597 15.872C23.3597 15.872 23.4237 20.8 17.0877 21.056H0.639999L0.640319 29.696Z" fill="#00AEEF"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Afosto.svg b/src/drivers/webextension/images/icons/Afosto.svg
index c2238dc62..7e6e80ce0 100644
--- a/src/drivers/webextension/images/icons/Afosto.svg
+++ b/src/drivers/webextension/images/icons/Afosto.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 800 800"><path fill="#042739" fill-rule="evenodd" d="M643.9 681h-.2c-15 5.4-30.7 8.2-46.6 8.1H1.8L416.8 28l300.8 454v1a140.2 140.2 0 01-7.5 147 138.8 138.8 0 01-66.2 51z" clip-rule="evenodd"/><path fill="#0AFF91" d="M691 550.4a95 95 0 01-62.2 89.3 92.3 92.3 0 01-31.6 5.5h-247a40 40 0 01-40-39.7c0-5 1-10 3-14.7l6.6-10.5 32.9-52.4h153.5v-.3a28.4 28.4 0 0024-28.3c0-4.2-1-8.4-2.7-12.3v-.2l-.3-.5c-1-1.9-2.2-3.7-3.6-5.4l-52.3-79.3a57.3 57.3 0 01-.8-61.9l48.5-77.5a.2.2 0 01.1 0h.1l154.3 233.1v.2l2.9 4.3a95.6 95.6 0 0114.4 50.6h.1zM467 183a60.2 60.2 0 01.6 65.1l-47.6 76-201.1 321.1H82L349.7 218 418 109l49 74z"/></svg>
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.756 27.24H25.748C25.148 27.456 24.52 27.568 23.884 27.564H0.0720062L16.672 1.12L28.704 19.28V19.32C29.204 20.2316 29.4407 21.2642 29.3877 22.3025C29.3347 23.3409 28.9942 24.344 28.404 25.2C27.7519 26.1359 26.8273 26.8482 25.756 27.24V27.24Z" fill="#042739"/>
+<path d="M27.64 22.016C27.6412 22.7945 27.4031 23.5547 26.9582 24.1935C26.5132 24.8324 25.8827 25.3192 25.152 25.588C24.7467 25.7345 24.3189 25.809 23.888 25.808H14.008C13.5857 25.808 13.1806 25.6411 12.8808 25.3436C12.5811 25.0461 12.4112 24.6422 12.408 24.22C12.408 24.02 12.448 23.82 12.528 23.632L12.792 23.212L14.108 21.116H20.248V21.104C20.5172 21.0618 20.7622 20.9242 20.9384 20.7164C21.1147 20.5086 21.2103 20.2444 21.208 19.972C21.208 19.804 21.168 19.636 21.1 19.48V19.472L21.088 19.452C21.048 19.376 21 19.304 20.944 19.236L18.852 16.064C18.6101 15.6977 18.4785 15.2696 18.4729 14.8307C18.4672 14.3918 18.5877 13.9604 18.82 13.588L20.76 10.488C20.7613 10.4876 20.7627 10.4876 20.764 10.488H20.768L26.94 19.812V19.82L27.056 19.992C27.4335 20.5995 27.6331 21.3007 27.632 22.016H27.636H27.64ZM18.68 7.31999C18.9332 7.70605 19.0701 8.15678 19.0744 8.61846C19.0786 9.08014 18.9501 9.53332 18.704 9.92399L16.8 12.964L8.756 25.808H3.28L13.988 8.71999L16.72 4.35999L18.68 7.31999Z" fill="#0AFF91"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Amiro.CMS.png b/src/drivers/webextension/images/icons/Amiro.CMS.png
index 3ea826348..0e4e31664 100644
Binary files a/src/drivers/webextension/images/icons/Amiro.CMS.png and b/src/drivers/webextension/images/icons/Amiro.CMS.png differ
diff --git a/src/drivers/webextension/images/icons/Apache JSPWiki.png b/src/drivers/webextension/images/icons/Apache JSPWiki.png
deleted file mode 100644
index a25eaab5c..000000000
Binary files a/src/drivers/webextension/images/icons/Apache JSPWiki.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Apache Tomcat.svg b/src/drivers/webextension/images/icons/Apache Tomcat.svg
index e6cdad9f7..eff57b7d4 100644
--- a/src/drivers/webextension/images/icons/Apache Tomcat.svg	
+++ b/src/drivers/webextension/images/icons/Apache Tomcat.svg	
@@ -1 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 260.16199 184.413" height="184.413" width="260.162"><path d="M45.018 121.284c2.96 3.65 6.25 7.35 9.87 11.07-10.54 3.17-17.45 9.06-21.76 14.26-6.82 8.23-10.43 19.1-9.6 28.43H5.378c3.64-7.9 18.17-30.72 39.64-53.76zm210.26 58.71h-22.07c-50.63-26.42-95.08-45.05-142.3-49.12.1-6.57 1.27-14.01 3.52-22.3l-4.35-1.17c-2.31 8.52-3.52 16.23-3.66 23.13-4.92-.33-9.87-.49-14.87-.49-4.23 0-8.09.39-11.61 1.07-4.59-4.58-8.5-8.96-11.82-13.11 21.78-22.68 57.65-43.2 88.87-50.92 8.79 29.22 27.66 49.24 50.56 62.71a96.13 96.13 0 0 0 4.95-3.02l39.95 43.01 1.75-.15c10.91-.94 17.11 4.98 18.75 6.82 1.21 1.34 1.93 2.57 2.33 3.54z" fill="#d1a41a"/><path d="M235.788 36.134c.81 39.69-19.44 71.28-47.79 87.48-48.12-23.97-57.18-84.71-48.98-117.29 2.28 12.46 6.43 20.27 15.39 24.1 19.54-5.59 46.43-6.03 66.24-.57 8.25-6 11.45-15.17 13.2-23.18 2.18 9.32 1.93 29.46 1.94 29.46z" fill="#ffdc76"/><path d="M122.089 95.468l-22.3-14.957 14.957-6.8zm-20.939 1.359l-16.59-8.43 8.703-5.167zm-22.028 10.607L67.7 99.547l7.615-5.711zm110.68 33.72l12.51-5.71-5.44-5.168zm6.799 10.334l15.773-4.079-4.352-4.623zm-7.886-108.233l5.438-18.764-13.87.272zm-37.8 15.5l-11.966.816-1.36-7.886zm-1.905 10.606l-6.797 1.904-1.36-5.166zm76.145-7.885l8.974 1.359 1.904-5.983zm-1.903 11.149l6.797 2.447 1.632-4.895z"/><path d="M133.21 90.587h26.246v3.24H133.21zm0-7.777h26.246v3.24H133.21zm80.14 7.777h26.245v3.24H213.35zm0-7.777h26.245v3.24H213.35zm-9.249-19.21h-42.768v-2.915h13.31c1.638-7.018 1.962-13.725-.014-17.125-.844-1.446-2.01-2.122-3.674-2.122-7.61 0-10.753 8.047-10.884 8.39l.002-.003-2.73-1.024c.156-.42 3.964-10.279 13.612-10.279 2.692 0 4.834 1.237 6.191 3.57 2.41 4.141 2.127 11.305.494 18.592h23.355c3.102-9.115 9.58-13.413 20.405-13.413v2.915c-11.732 0-15.018 4.974-17.366 10.498h12.743l-.03 2.902-12.646.014z"/><path d="M206.018 78.002l.019-.003c-3.46-5.1-4.555-9.455-3.109-14.413l-2.97.015c-1.035 3.3-.62 8.273 1.928 12.54h-29.674c1.805-3.617 3.48-8.026 4.702-12.54h-3.02c-1.348 4.787-3.242 9.524-5.373 13.277l-.69 1.213 16.653 10.482-9.375 6.178 1.606 2.435 10.478-6.908 11.312 7.382 1.553-2.468-10.488-6.488s15.682-10.186 16.461-10.684l-.013-.018zm-18.86 8.808l-12.318-7.754 24.072.006-11.754 7.749z"/><path d="M240.682 32.617c-.019-5.07-1.598-26.5-4.5-32.4-7.87 2.99-22.19 12.68-25.43 22.588-15.533-2.32-33.043-2.045-48.382.609C159.808 12.754 146.946 4.596 137.243 0c-4.093 6.906-5.906 22.92-5.445 34.28l-.054.035c1.8 47.7 25.2 77.4 55.8 95.4 31.48-17.988 53.97-53.057 53.1-97.12l.038.022zm-26.197-9.196c.115.02.229.042.344.063-.114-.021-.228-.043-.344-.063zm-1.958-.338c.276.044.554.094.83.14l-.83-.14zm23.257 12.976c.81 39.69-19.44 71.279-47.79 87.48-48.118-23.977-57.182-84.71-48.977-117.29 2.283 12.456 6.425 20.268 15.394 24.1 19.533-5.591 46.423-6.033 66.23-.57 8.256-6.002 11.457-15.17 13.205-23.18 2.183 9.322 1.932 29.456 1.938 29.46z"/><path d="M256.305 173.375c-4.942-5.528-14.623-8.145-22.707-7.951-5.738-6.83-39.004-41.862-39.004-41.862l-2.306 2.904 40.162 43.238 1.744-.15c10.912-.934 17.115 4.984 18.756 6.82 1.204 1.347 1.931 2.575 2.327 3.539H233.2c-50.624-26.416-95.078-45.044-142.297-49.112.103-6.572 1.273-14.01 3.518-22.3l-4.343-1.176c-2.308 8.52-3.524 16.236-3.66 23.133-4.92-.326-9.873-.495-14.869-.495-4.236 0-8.095.393-11.614 1.077-4.59-4.587-8.5-8.959-11.823-13.108 21.936-22.85 58.15-43.498 89.534-51.092l-1.015-4.397c-33.792 8.149-70.78 30.335-91.391 51.762-9.565-12.91-13.36-23.504-14.487-31.532-1.424-10.14.997-19.442 7-26.9C47.15 44.1 60.501 43.277 74.23 45.586c-.268 2.168.017 4.24.885 5.522 3.631 5.363 23.144 7.246 34.791 2.05-8.595-12.045-26.005-17.926-30.83-15.57-1.598.781-2.803 2.215-3.63 3.887-4.745-.85-9.458-1.48-12.902-1.456-12.108.09-21.364 4.32-28.296 12.933-6.802 8.45-9.551 18.944-7.95 30.347 1.516 10.8 6.863 22.286 15.825 34.198a306.088 306.088 0 0 0-4.313 4.723C15.967 146.66 0 172.87 0 177.213v2.25h28.816l-.505-2.668c-1.627-8.6 1.623-19.35 8.28-27.385 4.179-5.044 11.1-10.8 21.967-13.457 9.663 9.43 21.975 19.446 35.679 29.11h21.414v-2.25c0-2.54-1.26-4.762-3.545-6.257-3.383-2.212-8.605-2.517-13.402-.881-4.573-5.093-7.137-11.897-7.691-20.347 46.474 4.115 90.927 22.883 141.085 49.085h27.597l.362-1.809c.515-2.575-.888-6.025-3.752-9.23zm-223.18-26.836c-6.815 8.227-10.428 19.094-9.6 28.424H5.372c3.647-7.894 18.176-30.712 39.643-53.76 2.958 3.656 6.253 7.35 9.872 11.073-10.54 3.168-17.45 9.06-21.761 14.263z"/></svg>
\ No newline at end of file
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.62052 19.5767C5.98205 20.0225 6.38388 20.4744 6.82602 20.9288C5.53869 21.3159 4.69472 22.0353 4.16831 22.6704C3.33533 23.6756 2.89441 25.0033 2.99579 26.1428H0.778992C1.22357 25.1779 2.99823 22.3907 5.62052 19.5767ZM31.3011 26.7474H28.6056C22.4217 23.5205 16.9927 21.2451 11.2254 20.748C11.2376 19.9455 11.3805 19.0368 11.6553 18.0243L11.124 17.8814C10.8419 18.922 10.6941 19.8637 10.677 20.7065C10.0761 20.6662 9.47151 20.6466 8.86082 20.6466C8.34418 20.6466 7.87273 20.6943 7.44281 20.7773C6.8822 20.2179 6.40464 19.683 5.99915 19.1761C8.6593 16.406 13.0404 13.8997 16.8535 12.9568C17.9271 16.5257 20.2318 18.9709 23.0288 20.6161C23.234 20.4992 23.4356 20.3762 23.6333 20.2472L28.5127 25.5004L28.7265 25.482C30.059 25.3672 30.8162 26.0903 31.0165 26.315C31.1643 26.4787 31.2523 26.6289 31.3011 26.7474Z" fill="#D1A41A"/>
+<path d="M28.9207 9.17668C29.0196 14.0243 26.5463 17.8826 23.0837 19.8613C17.2065 16.9336 16.0999 9.515 17.1014 5.53577C17.3799 7.0576 17.8868 8.01149 18.9811 8.47928C21.3677 7.79653 24.652 7.74279 27.0715 8.40966C28.0791 7.67683 28.47 6.55684 28.6837 5.57851C28.95 6.71684 28.9194 9.17668 28.9207 9.17668Z" fill="#FFDC76"/>
+<path d="M15.0338 16.4236L12.3101 14.5968L14.1369 13.7662L15.0338 16.4236ZM12.4763 16.5896L10.4501 15.56L11.513 14.9289L12.4763 16.5896ZM9.78589 17.8851L8.39084 16.9218L9.32092 16.2243L9.78589 17.8851ZM23.3041 22.0036L24.832 21.3062L24.1676 20.6749L23.3041 22.0036ZM24.1345 23.2657L26.0609 22.7675L25.5294 22.2029L24.1345 23.2657ZM23.1713 10.0464L23.8355 7.75464L22.1414 7.78786L23.1713 10.0464ZM18.5545 11.9396L17.093 12.0392L16.9269 11.076L18.5545 11.9396ZM18.3218 13.2349L17.4917 13.4675L17.3256 12.8365L18.3218 13.2349ZM27.622 12.2719L28.718 12.4379L28.9506 11.7071L27.622 12.2719ZM27.3896 13.6336L28.2197 13.9325L28.4191 13.3346L27.3896 13.6336Z" fill="black"/>
+<path d="M16.3921 15.8274H19.5977V16.2232H16.3921V15.8274ZM16.3921 14.8776H19.5977V15.2733H16.3921V14.8776ZM26.1802 15.8274H29.3856V16.2232H26.1802V15.8274ZM26.1802 14.8776H29.3856V15.2733H26.1802V14.8776ZM25.0505 12.5313H19.8269V12.1753H21.4526C21.6526 11.3181 21.6922 10.4989 21.4509 10.0837C21.3478 9.90707 21.2054 9.82451 21.0021 9.82451C20.0727 9.82451 19.6888 10.8073 19.6728 10.8492L19.673 10.8489L19.3396 10.7238C19.3587 10.6725 19.8238 9.46835 21.0021 9.46835C21.3309 9.46835 21.5925 9.61944 21.7583 9.90438C22.0526 10.4102 22.0181 11.2851 21.8186 12.1752H24.6711C25.05 11.0619 25.8412 10.5369 27.1634 10.5369V10.893C25.7304 10.893 25.3291 11.5005 25.0423 12.1752H26.5987L26.5951 12.5296L25.0505 12.5313Z" fill="black"/>
+<path d="M25.2846 14.2903L25.287 14.29C24.8644 13.6671 24.7306 13.1352 24.9072 12.5296L24.5445 12.5314C24.4181 12.9345 24.4688 13.5419 24.78 14.063H21.1557C21.3761 13.6213 21.5807 13.0828 21.7299 12.5314H21.3611C21.1965 13.1161 20.9651 13.6947 20.7049 14.1531L20.6206 14.3012L22.6545 15.5814L21.5095 16.336L21.7056 16.6334L22.9854 15.7897L24.367 16.6913L24.5567 16.3899L23.2757 15.5975C23.2757 15.5975 25.1911 14.3534 25.2862 14.2925L25.2846 14.2903ZM22.9811 15.3661L21.4766 14.4191L24.4167 14.4198L22.9811 15.3662V15.3661Z" fill="black"/>
+<path d="M29.5184 8.74712C29.5161 8.12789 29.3232 5.51048 28.9688 4.78987C28.0076 5.15506 26.2586 6.33857 25.8628 7.54871C23.9657 7.26535 21.827 7.29894 19.9536 7.62309C19.6407 6.32111 18.0697 5.32471 16.8846 4.76337C16.3847 5.60685 16.1633 7.56276 16.2196 8.95024L16.213 8.95451C16.4328 14.7805 19.2909 18.4079 23.0283 20.6064C26.8731 18.4094 29.62 14.1262 29.5138 8.74444L29.5184 8.74712ZM26.3188 7.62395C26.3328 7.62639 26.3467 7.62908 26.3608 7.63164C26.3469 7.62908 26.3329 7.62639 26.3188 7.62395ZM26.0796 7.58266C26.1133 7.58804 26.1473 7.59415 26.181 7.59976L26.0796 7.58266ZM28.9202 9.16752C29.0191 14.0152 26.5458 17.8734 23.0832 19.8521C17.2062 16.9236 16.0992 9.50584 17.1013 5.5266C17.3801 7.04795 17.886 8.00208 18.9815 8.47011C21.3672 7.78724 24.6515 7.73326 27.0706 8.4005C28.079 7.66743 28.47 6.54767 28.6835 5.56935C28.9501 6.70792 28.9194 9.16703 28.9202 9.16752Z" fill="black"/>
+<path d="M31.4266 25.9389C30.823 25.2638 29.6405 24.9441 28.6532 24.9678C27.9524 24.1336 23.8893 19.8549 23.8893 19.8549L23.6077 20.2096L28.513 25.4906L28.726 25.4723C30.0587 25.3582 30.8164 26.081 31.0168 26.3052C31.1638 26.4698 31.2526 26.6197 31.301 26.7375H28.6046C22.4215 23.5111 16.992 21.2359 11.2248 20.7391C11.2374 19.9364 11.3803 19.0279 11.6545 18.0154L11.124 17.8718C10.8421 18.9124 10.6936 19.8548 10.677 20.6972C10.0761 20.6574 9.47114 20.6367 8.86094 20.6367C8.34357 20.6367 7.87224 20.6847 7.44244 20.7683C6.88183 20.208 6.40427 19.674 5.99841 19.1673C8.67761 16.3764 13.1007 13.8545 16.9339 12.927L16.8099 12.39C12.6826 13.3853 8.165 16.095 5.64763 18.7121C4.47938 17.1353 4.01587 15.8414 3.87822 14.8608C3.7043 13.6224 3.99999 12.4862 4.73318 11.5753C5.88091 10.1496 7.51157 10.0491 9.18839 10.3311C9.15566 10.5959 9.19047 10.849 9.29648 11.0056C9.73996 11.6606 12.1232 11.8906 13.5458 11.2559C12.496 9.7848 10.3696 9.06651 9.78027 9.35427C9.58509 9.44966 9.43792 9.6248 9.33691 9.82902C8.75737 9.7252 8.18173 9.64825 7.76109 9.65119C6.28225 9.66218 5.15175 10.1788 4.30509 11.2308C3.47431 12.2629 3.13856 13.5446 3.3341 14.9373C3.51926 16.2564 4.17233 17.6592 5.26693 19.1141C5.08933 19.3046 4.91373 19.4969 4.74015 19.691C2.0723 22.676 0.122131 25.8773 0.122131 26.4077V26.6825H3.64164L3.57996 26.3567C3.38125 25.3063 3.77819 23.9933 4.59126 23.0119C5.10167 22.3959 5.94699 21.6928 7.27425 21.3683C8.45447 22.5201 9.95822 23.7434 11.632 24.9237H14.2474V24.6489C14.2474 24.3387 14.0936 24.0673 13.8145 23.8847C13.4013 23.6145 12.7635 23.5773 12.1776 23.7771C11.619 23.1551 11.3059 22.324 11.2382 21.292C16.9144 21.7946 22.3438 24.0869 28.47 27.2871H31.8406L31.8848 27.0661C31.9477 26.7516 31.7764 26.3303 31.4266 25.9388V25.9389ZM4.16793 22.6613C3.33557 23.6661 2.89428 24.9934 2.99541 26.1329H0.778254C1.22369 25.1687 2.99822 22.3818 5.62015 19.5668C5.98143 20.0133 6.38387 20.4645 6.82589 20.9192C5.53856 21.3061 4.69459 22.0258 4.16805 22.6613H4.16793Z" fill="black"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/ApexPages.png b/src/drivers/webextension/images/icons/ApexPages.png
deleted file mode 100644
index 839a8f681..000000000
Binary files a/src/drivers/webextension/images/icons/ApexPages.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Apigee.svg b/src/drivers/webextension/images/icons/Apigee.svg
new file mode 100644
index 000000000..7281d03e6
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Apigee.svg
@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3969_167)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.95102 0.390259H25.049C28.8882 0.390259 32 3.42636 32 7.17192V24.8273C32 28.5737 28.8882 31.6098 25.049 31.6098H6.95102C3.1118 31.6098 0 28.5737 0 24.8281V7.1727C0 3.42636 3.1118 0.390259 6.95102 0.390259Z" fill="#FF4100"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.3131 12.1834C27.3338 12.3716 27.2791 12.5603 27.1611 12.7083C27.0431 12.8563 26.8713 12.9515 26.6833 12.9733L22.5202 13.4182C22.2077 13.4516 21.9191 13.6007 21.711 13.8361C21.5029 14.0715 21.3904 14.3762 21.3955 14.6904C21.408 15.4404 21.6484 16.1686 22.0846 16.7782L26.0519 22.3251C26.1626 22.4796 26.2082 22.6714 26.179 22.8592C26.1498 23.0471 26.0481 23.2159 25.8958 23.3296L24.9412 24.0344C24.8662 24.0898 24.7809 24.1297 24.6902 24.1517C24.5996 24.1738 24.5054 24.1775 24.4133 24.1626C24.3212 24.1478 24.233 24.1147 24.1539 24.0654C24.0747 24.016 24.0062 23.9513 23.9524 23.8751L21.3767 20.2748C21.2197 20.0554 20.9855 19.9035 20.7212 19.8497C20.4568 19.7958 20.1819 19.844 19.9516 19.9844C19.3998 20.3211 18.9647 20.8192 18.7051 21.4111L15.79 28.0609C15.7169 28.2312 15.5796 28.3657 15.4079 28.4354C15.2363 28.5051 15.044 28.5043 14.8729 28.4332L14.8558 28.4254L13.7779 27.9384C13.6082 27.8603 13.4752 27.7197 13.4069 27.5458C13.3385 27.372 13.34 27.1784 13.4111 27.0057L13.4189 26.9885L15.175 22.9799C15.2942 22.7082 15.3082 22.4018 15.2143 22.1203C15.1204 21.8389 14.9253 21.6022 14.6669 21.4564C14.0528 21.1105 13.3462 20.9648 12.6454 21.0396L5.58826 21.7936C5.49509 21.803 5.40098 21.7938 5.31137 21.7667C5.22175 21.7395 5.13838 21.6949 5.06606 21.6354C4.99374 21.576 4.93389 21.5028 4.88997 21.4201C4.84604 21.3374 4.8189 21.2468 4.81011 21.1536L4.68679 19.9618C4.66594 19.7735 4.72049 19.5846 4.83853 19.4365C4.95656 19.2883 5.12847 19.1929 5.31665 19.1711L9.7264 18.7005C10.2954 18.6396 10.7239 18.1542 10.7145 17.5821C10.7033 16.9234 10.4921 16.2837 10.1088 15.7479L5.75372 9.65856C5.64303 9.50403 5.59738 9.31225 5.62657 9.12443C5.65576 8.93661 5.75746 8.76772 5.90982 8.65407L6.86435 7.95007C6.93938 7.89464 7.02472 7.85474 7.11537 7.83271C7.20603 7.81069 7.30016 7.80698 7.39226 7.82181C7.48436 7.83664 7.57258 7.86971 7.65173 7.91907C7.73089 7.96844 7.79939 8.03311 7.85323 8.10929L10.4156 11.6917C10.6048 11.9559 10.887 12.1388 11.2055 12.2036C11.5239 12.2685 11.8551 12.2105 12.1326 12.0414C12.7975 11.6356 13.3217 11.0354 13.6343 10.322L16.4324 3.93915C16.5055 3.7689 16.6427 3.63433 16.8144 3.56464C16.9861 3.49495 17.1783 3.49574 17.3494 3.56686L17.3666 3.57466L18.4445 4.06168C18.7957 4.2209 18.9572 4.63534 18.8113 4.99437L18.8035 5.01154L17.0396 9.03573C16.9148 9.32062 16.9004 9.64168 16.999 9.93662C17.0977 10.2315 17.3024 10.4793 17.5734 10.6318C18.2165 10.994 18.9565 11.147 19.6909 11.0689L26.4117 10.3509C26.5048 10.3415 26.5989 10.3506 26.6886 10.3778C26.7782 10.4049 26.8615 10.4495 26.9339 10.509C27.0062 10.5685 27.066 10.6417 27.11 10.7244C27.1539 10.8071 27.181 10.8976 27.1898 10.9909L27.3131 12.1834ZM16.3902 18.3415C17.0112 18.3415 17.6068 18.0948 18.0459 17.6557C18.485 17.2166 18.7317 16.621 18.7317 16C18.7317 15.379 18.485 14.7835 18.0459 14.3444C17.6068 13.9053 17.0112 13.6586 16.3902 13.6586C15.7692 13.6586 15.1737 13.9053 14.7345 14.3444C14.2954 14.7835 14.0487 15.379 14.0487 16C14.0487 16.621 14.2954 17.2166 14.7345 17.6557C15.1737 18.0948 15.7692 18.3415 16.3902 18.3415ZM16.3902 17.561C16.8042 17.561 17.2012 17.3965 17.494 17.1038C17.7867 16.8111 17.9512 16.414 17.9512 16C17.9512 15.586 17.7867 15.189 17.494 14.8962C17.2012 14.6035 16.8042 14.4391 16.3902 14.4391C15.9762 14.4391 15.5792 14.6035 15.2864 14.8962C14.9937 15.189 14.8292 15.586 14.8292 16C14.8292 16.414 14.9937 16.8111 15.2864 17.1038C15.5792 17.3965 15.9762 17.561 16.3902 17.561V17.561Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_3969_167">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Glider.js.svg b/src/drivers/webextension/images/icons/Glider.js.svg
index d3962f046..896047e05 100644
--- a/src/drivers/webextension/images/icons/Glider.js.svg
+++ b/src/drivers/webextension/images/icons/Glider.js.svg
@@ -1,4 +1,4 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16 0C24.8364 0 32 7.1636 32 16C32 24.8364 24.8364 32 16 32C7.1636 32 0 24.8364 0 16C0 7.1636 7.1636 0 16 0Z" fill="white"/>
-<path d="M20.1512 13.0304C20.1512 13.4324 19.8252 13.7588 19.4228 13.7588C19.0208 13.7588 18.6948 13.4324 18.6948 13.0304C18.6948 12.6284 19.0208 12.302 19.4228 12.302C19.8252 12.302 20.1512 12.6284 20.1512 13.0304ZM21.8508 10.8452C21.8508 10.7088 21.7292 10.6024 21.5924 10.6024C18.952 10.6024 17.5032 11.2096 15.6068 13.0988C15.1744 13.5388 14.7268 14.0396 14.2716 14.5784L11.3964 14.73C11.3204 14.7376 11.2448 14.7832 11.1992 14.8516L9.4996 17.7652C9.4464 17.8564 9.4616 17.9772 9.5376 18.0608L10.0232 18.5468C10.0688 18.592 10.1372 18.6148 10.198 18.6148C10.2208 18.6148 10.2436 18.6148 10.266 18.6068L12.36 17.9624L14.492 20.0944L13.8472 22.1888C13.8244 22.2724 13.8472 22.3636 13.908 22.4312L14.3936 22.9168C14.4468 22.9624 14.5072 22.9852 14.568 22.9852C14.6136 22.9852 14.6512 22.9768 14.6896 22.9552L17.6028 21.2552C17.6712 21.21 17.7164 21.1336 17.7248 21.0584L17.8764 18.1824C18.4152 17.7272 18.916 17.2796 19.356 16.8468C21.1528 15.0412 21.8508 13.3644 21.8508 10.8452Z" fill="#8CC9F0"/>
+<circle cx="16" cy="16" r="16" fill="white"/>
+<path d="M23.9804 9.31373C23.9804 10.0279 23.4012 10.6078 22.6862 10.6078C21.972 10.6078 21.3928 10.0279 21.3928 9.31373C21.3928 8.59951 21.972 8.01961 22.6862 8.01961C23.4012 8.01961 23.9804 8.59951 23.9804 9.31373ZM27 5.43137C27 5.18904 26.784 5 26.5409 5C21.8498 5 19.2757 6.07879 15.9065 9.43525C15.1382 10.217 14.343 11.1067 13.5342 12.064L8.42595 12.3333C8.29092 12.3468 8.15661 12.4279 8.07559 12.5494L5.05596 17.7258C4.96144 17.8879 4.98844 18.1025 5.12347 18.251L5.98622 19.1145C6.06724 19.1948 6.18876 19.2353 6.29679 19.2353C6.33729 19.2353 6.3778 19.2353 6.4176 19.2211L10.138 18.0762L13.9258 21.864L12.7802 25.5851C12.7397 25.7336 12.7802 25.8956 12.8882 26.0157L13.751 26.8785C13.8455 26.9595 13.9528 27 14.0608 27C14.1419 27 14.2087 26.9851 14.2769 26.9467L19.4527 23.9264C19.5742 23.8461 19.6545 23.7103 19.6694 23.5767L19.9388 18.4671C20.8961 17.6583 21.7858 16.8631 22.5676 16.0942C25.7599 12.8862 27 9.90713 27 5.43137Z" fill="#8CC9F0"/>
 </svg>
diff --git a/src/drivers/webextension/images/icons/acquia-cloud-platform.svg b/src/drivers/webextension/images/icons/acquia-cloud-platform.svg
index 17d878004..19b3db626 100644
--- a/src/drivers/webextension/images/icons/acquia-cloud-platform.svg
+++ b/src/drivers/webextension/images/icons/acquia-cloud-platform.svg
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 120 120" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(0.829876,0,0,0.829876,9.04564,0.0829876)">
-        <path d="M61.5,144.5C97,144.5 122.8,113.9 122.8,81.9C122.8,26.9 65.1,22.3 57.5,-0.1C52.2,21.8 0,30.6 0,82C0,111.8 25.4,144.5 61.5,144.5ZM87.8,103.4L34.6,103.4C24.7,103.4 16.7,95.8 16.7,86.4C16.7,77.8 23.3,70.8 31.9,69.6C31.8,68.9 31.7,68.3 31.7,67.6C31.7,61.8 36.6,57.1 42.7,57.1C45.4,57.1 47.9,58 49.9,59.6C53.4,52.7 60.9,47.9 69.5,47.9C81.6,47.9 91.4,57.3 91.4,68.8L91.4,69.6C99.5,71.2 105.7,78 105.7,86.3C105.6,95.8 97.7,103.4 87.8,103.4Z" style="fill:rgb(39,170,225);"/>
-    </g>
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3966_20)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0221 32C23.8783 32 29.5878 25.2282 29.5878 18.1466C29.5878 5.97511 16.8188 4.95713 15.1369 0C13.964 4.84648 2.41217 6.79392 2.41217 18.1688C2.41217 24.7635 8.0332 32 16.0221 32ZM21.8423 22.9046H10.0692C7.87829 22.9046 6.10788 21.2227 6.10788 19.1425C6.10788 17.2393 7.56847 15.6902 9.47165 15.4246C9.44952 15.2697 9.42739 15.1369 9.42739 14.982C9.42739 13.6985 10.5118 12.6584 11.8617 12.6584C12.4592 12.6584 13.0125 12.8575 13.4551 13.2116C14.2296 11.6847 15.8894 10.6224 17.7925 10.6224C20.4703 10.6224 22.639 12.7026 22.639 15.2476V15.4246C24.4315 15.7787 25.8036 17.2836 25.8036 19.1203C25.7815 21.2227 24.0332 22.9046 21.8423 22.9046Z" fill="#27AAE1"/>
+</g>
+<defs>
+<clipPath id="clip0_3966_20">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
 </svg>
diff --git a/src/drivers/webextension/images/icons/amCharts.png b/src/drivers/webextension/images/icons/amCharts.png
deleted file mode 100644
index 945bd5b40..000000000
Binary files a/src/drivers/webextension/images/icons/amCharts.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/amCharts.svg b/src/drivers/webextension/images/icons/amCharts.svg
new file mode 100644
index 000000000..4d256b459
--- /dev/null
+++ b/src/drivers/webextension/images/icons/amCharts.svg
@@ -0,0 +1,6 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.31555 16H5.29777" stroke="#3CABFF" stroke-width="2" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M30.3644 16H19.3422C13.8667 16 14.7556 8.67555 10.8089 8.67555C6.86222 8.67555 7.43111 15.7156 2.24 16H1.31555" stroke="#474758" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.33334 16H10.1689C11.3778 16 12.3022 16 13.8311 14.4711C15.36 12.9422 15.68 10.2044 16.8889 10.2044C18.0978 10.2044 18.4178 13.2622 19.6267 13.2622M30.3645 16H29.1556C27.9467 16 27.0222 16 25.4933 14.4711C23.9645 12.9422 23.6445 10.2044 22.4356 10.2044C21.2267 10.2044 20.9067 13.2622 19.6978 13.2622" stroke="#3CABFF" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.98666 21.44H3.30666L3.62667 20.7289H5.22667L5.51111 21.44H5.83111L4.58667 18.4889H4.26667L2.98666 21.44ZM4.40889 18.8089L5.12 20.48H3.69778L4.40889 18.8089ZM9.35111 21.44H9.67111V18.4889H9.38667L8.10667 20.0533L6.79111 18.4889H6.50667V21.4044H6.82667V18.9511L8.03556 20.4089H8.10667L9.31556 18.9511C9.35111 18.9511 9.35111 21.44 9.35111 21.44ZM11.1644 19.9822C11.1644 19.52 11.4844 19.1644 11.9822 19.1644C12.3378 19.1644 12.5867 19.3067 12.7644 19.4489L13.0844 18.9156C12.7644 18.6311 12.4089 18.4889 11.9111 18.4889C11.0222 18.4889 10.3822 19.1289 10.3822 19.9822C10.3822 20.8356 11.0578 21.4756 11.9111 21.4756C12.3733 21.4756 12.7644 21.3333 13.0844 21.0489L12.8 20.5156C12.6222 20.6578 12.3733 20.8 12.0178 20.8C11.52 20.8 11.1644 20.4089 11.1644 19.9822ZM15.8933 21.44H16.64V18.4889H15.8933V19.6267H14.5067V18.4889H13.76V21.4044H14.5067V20.2667H15.8933V21.44ZM17.1378 21.44H17.8844L18.0978 20.9067H19.3067L19.4844 21.44H20.2311L19.1289 18.5244H18.2756C18.2756 18.4889 17.1378 21.44 17.1378 21.44ZM18.7022 19.2356L19.1289 20.3733H18.2756C18.24 20.3733 18.7022 19.2356 18.7022 19.2356ZM20.7289 21.44H21.4756V20.4089H21.7956L22.6844 21.44H23.4667V21.2978L22.6133 20.3378C23.0044 20.2311 23.3244 19.9111 23.3244 19.4489C23.3244 18.8089 22.8622 18.4533 22.1867 18.4533H20.7644L20.7289 21.44ZM22.1156 19.1289C22.3644 19.1289 22.5067 19.2356 22.5067 19.4844C22.5067 19.6978 22.3644 19.84 22.1156 19.84H21.4756V19.0933L22.1156 19.1289ZM26.2044 19.1289V18.4889H23.7156V19.1289H24.6044V21.44H25.3511V19.1289H26.2044ZM26.7022 21.2267C26.88 21.3333 27.3422 21.4756 27.7689 21.4756C28.5156 21.4756 28.9778 21.0844 28.9778 20.5156C28.9778 20.1244 28.7289 19.84 28.1956 19.6978L27.6978 19.5556C27.52 19.4844 27.4133 19.4489 27.4133 19.3067C27.4133 19.1644 27.52 19.0578 27.8044 19.0578C28.1244 19.0578 28.4444 19.1644 28.6933 19.3067L28.9067 18.7022C28.6578 18.5956 28.2667 18.4889 27.84 18.4889C27.0578 18.4889 26.6667 18.88 26.6667 19.3778C26.6667 19.7689 26.9156 20.0533 27.4133 20.16L27.9111 20.3022C28.16 20.3733 28.2311 20.4089 28.2311 20.5867C28.2311 20.7644 28.0533 20.8711 27.7689 20.8711C27.4133 20.8711 27.0578 20.7289 26.8444 20.5511L26.7022 21.2267Z" fill="#474758"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/apigee.svg b/src/drivers/webextension/images/icons/apigee.svg
deleted file mode 100644
index 6c535462c..000000000
--- a/src/drivers/webextension/images/icons/apigee.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-   viewBox="0 0 156 64" style="enable-background:new 0 0 156 64;" xml:space="preserve">
-<path fill="#dd3303" d="M27.92,41.94c0,1.94,0,4.93-3.62,4.93c-2.2,0-3.1-1.21-3.62-3.2c-1.94,2.31-4.3,3.52-7.19,3.52
-  C6.4,47.19,1,41.16,1,32.66c0-8.29,5.56-14.64,12.49-14.64c2.78,0,5.51,1.1,7.19,3.46c0.21-1.84,1.78-3.15,3.62-3.15
-  c3.62,0,3.62,2.99,3.62,4.93V41.94z M14.54,40.27c3.93,0,5.82-3.99,5.82-7.61c0-3.62-1.84-7.71-5.82-7.71
-  c-4.15,0-5.98,4.09-5.98,7.71C8.56,36.28,10.45,40.27,14.54,40.27z M30.05,22.53c0-2.52,1.57-4.2,3.78-4.2
-  c2.1,0,3.31,1.15,3.78,3.15c1.42-2.31,4.36-3.46,7.19-3.46c8.13,0,12.17,7.61,12.17,14.95c0,7.14-4.83,14.22-12.44,14.22
-  c-2.36,0-4.93-0.89-6.93-2.62v9.23c0,2.52-1.57,4.2-3.78,4.2c-2.2,0-3.78-1.68-3.78-4.2V22.53z M43.53,40.27
-  c3.93,0,5.88-4.09,5.88-7.61c0-3.57-1.94-7.71-5.88-7.71c-4.04,0-5.93,3.78-5.93,7.45C37.6,36.07,39.39,40.27,43.53,40.27z
-   M66.77,11.15c0,2.36-1.89,4.35-4.25,4.35c-2.26,0-4.25-2.05-4.25-4.35c0-2.15,1.99-4.15,4.25-4.15C64.78,7,66.77,8.94,66.77,11.15z
-   M58.75,22.53c0-2.52,1.57-4.2,3.78-4.2c2.2,0,3.78,1.68,3.78,4.2v20.15c0,2.52-1.57,4.2-3.78,4.2c-2.2,0-3.78-1.68-3.78-4.2V22.53z
-  "/>
-<path fill="#54585b" d="M95,44.36C95,53.44,89.08,58,80.47,58c-3.1,0-11.91-1.52-11.91-5.67c0-1.42,1.57-3.31,3.04-3.31
-  c2.41,0,5.09,2.36,9.45,2.36c3.67,0,6.4-2.15,6.4-5.98v-1.79h-0.11c-1.57,2.31-4.14,3.57-7.61,3.57c-7.92,0-11.65-6.98-11.65-14.48
-  c0-7.61,4.83-14.69,12.44-14.69c2.57,0,5.51,1.15,6.93,3.46c0.47-1.99,1.68-3.15,3.78-3.15c2.2,0,3.78,1.68,3.78,4.2V44.36z
-   M81.52,24.94c-3.93,0-5.88,4.09-5.88,7.61c0,4.04,1.94,7.71,5.88,7.71c4.04,0,5.93-3.78,5.93-7.45
-  C87.45,29.14,85.66,24.94,81.52,24.94z M104.08,35.12c0.52,3.73,3.62,5.46,7.13,5.46c3.88,0,6.56-3.04,8.55-3.04
-  c1.63,0,3.1,1.63,3.1,3.25c0,3.25-6.72,6.4-12.33,6.4c-8.5,0-14.17-6.19-14.17-14.53c0-7.66,5.56-14.64,13.54-14.64
-  c8.19,0,13.59,7.45,13.59,13.75c0,2.26-1,3.36-3.3,3.36H104.08z M115.94,30.09c-0.42-3.31-2.52-5.77-6.03-5.77
-  c-3.36,0-5.62,2.57-5.98,5.77H115.94z M132.43,35.22c0.52,3.73,3.62,5.46,7.14,5.46c3.88,0,6.56-3.04,8.55-3.04
-  c1.63,0,3.1,1.63,3.1,3.25c0,3.25-6.72,6.4-12.33,6.4c-8.5,0-14.17-6.19-14.17-14.53c0-7.66,5.56-14.64,13.54-14.64
-  c8.19,0,13.59,7.45,13.59,13.75c0,2.26-1,3.36-3.3,3.36H132.43z M144.29,30.18c-0.42-3.31-2.52-5.77-6.03-5.77
-  c-3.36,0-5.61,2.57-5.98,5.77H144.29z"/>
-</svg>
diff --git a/src/technologies/a.json b/src/technologies/a.json
index f841942c9..c2a543e50 100644
--- a/src/technologies/a.json
+++ b/src/technologies/a.json
@@ -2635,12 +2635,22 @@
     "cats": [
       1
     ],
+    "description": "Amiro.CMS is a commercial content management system developed and distributed by the Russian company Amiro. Written in PHP and uses MySQL as a database.",
     "icon": "Amiro.CMS.png",
-    "implies": "PHP",
+    "implies": [
+      "PHP",
+      "MySQL"
+    ],
     "meta": {
       "generator": "Amiro"
     },
-    "website": "http://amirocms.com"
+    "saas": true,
+    "pricing": [
+      "freemium",
+      "onetime",
+      "recurring"
+    ],
+    "website": "https://www.amiro.ru"
   },
   "Amobee": {
     "cats": [
@@ -3013,7 +3023,7 @@
     "cpe": "cpe:2.3:a:apache:jspwiki:*:*:*:*:*:*:*:*",
     "description": "Apache JSPWiki is an open-source Wiki engine, built around standard JEE components (Java, servlets, JSP).",
     "html": "<html[^>]* xmlns:jspwiki=",
-    "icon": "Apache JSPWiki.png",
+    "icon": "Apache.svg",
     "implies": "Apache Tomcat",
     "scriptSrc": "jspwiki",
     "url": "wiki\\.jsp",
@@ -3063,18 +3073,23 @@
     "headers": {
       "X-Powered-By": "Salesforce\\.com ApexPages"
     },
-    "icon": "ApexPages.png",
+    "icon": "CloudFlare.svg",
     "implies": "Salesforce",
     "website": "https://developer.salesforce.com/docs/atlas.en-us.apexcode.meta/apexcode/apex_intro.htm"
   },
   "Apigee": {
     "cats": [
-      4
+      4,
+      19
     ],
     "description": "Apigee is an API gateway management tool to exchange data across cloud services and applications",
-    "html": "<script>[^>]{0,50}script src=[^>]/profiles/apigee",
-    "icon": "apigee.svg",
+    "icon": "Apigee.svg",
     "scriptSrc": "/profiles/apigee",
+    "saas": true,
+    "pricing": [
+      "payg",
+      "recurring"
+    ],
     "website": "https://cloud.google.com/apigee/"
   },
   "Apisearch": {
@@ -4589,7 +4604,7 @@
     ],
     "description": "amCharts is a JavaScript-based interactive charts and maps programming library and tool.",
     "html": "<svg[^>]*><desc>JavaScript chart by amCharts ([\\d.]*)\\;version:\\1",
-    "icon": "amCharts.png",
+    "icon": "amCharts.svg",
     "js": {
       "AmCharts": ""
     },