diff --git a/devicon.json b/devicon.json
index 08a9e14fd..1593b248c 100644
--- a/devicon.json
+++ b/devicon.json
@@ -1858,24 +1858,21 @@
         "versions": {
             "svg": [
                 "original",
-                "original-wordmark"
+                "original-wordmark",
+                "plain",
+                "plain-wordmark",
+                "line",
+                "line-wordmark"
             ],
             "font": [
-                "original",
-                "original-wordmark"
+                "plain",
+                "plain-wordmark",
+                "line",
+                "line-wordmark"
             ]
         },
-        "color": "#205081",
-        "aliases": [
-            {
-                "base": "original",
-                "alias": "plain"
-            },
-            {
-                "base": "original-wordmark",
-                "alias": "plain-wordmark"
-            }
-        ]
+        "color": "#136be6",
+        "aliases": []
     },
     {
         "name": "consul",
diff --git a/icons/confluence/confluence-line-wordmark.svg b/icons/confluence/confluence-line-wordmark.svg
new file mode 100644
index 000000000..6bc61578c
--- /dev/null
+++ b/icons/confluence/confluence-line-wordmark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#136be6" d="M86.138 9.325a3.257 3.257 0 0 0-2.655 1.572l-.004.008-.002.006a121.838 121.838 0 0 1-2.634 4.482l-.002.002c-3.529 5.816-6.968 8.277-11.124 8.626-4.156.35-9.152-1.484-15.612-4.583h-.002l-17.99-8.471-.005-.002c-1.688-.77-3.577.005-4.35 1.556l-.006.01-8.59 19.438c-.795 1.597-.025 3.585 1.545 4.37l.008.004.01.006c3.824 1.717 11.36 5.29 17.967 8.595l.006.002.003.002c12.285 5.847 23.696 8.636 34.078 6.672 10.38-1.963 19.668-8.697 27.651-21.676l.002-.004a232.18 232.18 0 0 0 2.781-4.504h.002v-.002c.924-1.55.457-3.58-1.095-4.516l-.004-.002L88.002 9.798l-.004-.002a3.334 3.334 0 0 0-1.86-.47Zm.042.993c.444-.02.9.086 1.31.33l18.113 11.117h.002c1.088.655 1.414 2.06.757 3.161a231.209 231.209 0 0 1-2.769 4.487l-.002.002-.002.003c-7.885 12.823-16.911 19.32-26.994 21.227-10.08 1.907-21.281-.794-33.457-6.59l-.01-.003c-6.611-3.307-14.128-6.871-17.979-8.6l-.002-.003c-1.07-.537-1.622-1.984-1.097-3.038l.006-.01 8.59-19.438c.547-1.1 1.839-1.647 3.05-1.095h.002l17.98 8.467c6.5 3.118 11.618 5.053 16.122 4.674 4.505-.378 8.274-3.141 11.888-9.097l.002-.002a122.726 122.726 0 0 0 2.651-4.515l-.006.014a2.246 2.246 0 0 1 1.845-1.091zM55.994 51.263c-12.785.295-24.12 6.934-33.6 22.345v.002l-.004.004a232.057 232.057 0 0 0-2.78 4.506h-.002v.002c-.925 1.546-.46 3.583 1.1 4.517l18.114 11.113h.002c1.547.93 3.58.462 4.515-1.093l.006-.008.004-.006a118.606 118.606 0 0 1 2.632-4.482l.002-.002c3.527-5.819 6.965-8.281 11.122-8.63 4.156-.35 9.153 1.484 15.614 4.583h.002l17.989 8.471.002.002c1.69.774 3.58-.005 4.354-1.552l.006-.01 8.59-19.444c.796-1.594.024-3.581-1.545-4.37l-.01-.004-.01-.006c-3.822-1.713-11.359-5.284-17.965-8.589l-.004-.002-.004-.002c-9.982-4.805-19.381-7.546-28.13-7.345Zm.023.993c8.525-.197 17.782 2.484 27.677 7.248 6.611 3.307 14.127 6.868 17.977 8.595 1.075.54 1.627 1.99 1.102 3.04l-.006.01-8.589 19.444c-.548 1.096-1.84 1.646-3.052 1.09L73.149 83.22l-.004-.002c-6.499-3.117-11.62-5.053-16.124-4.675-4.506.379-8.274 3.143-11.887 9.103a119.524 119.524 0 0 0-2.648 4.504c-.655 1.086-2.055 1.413-3.15.754L21.22 81.788l-.002-.002c-1.092-.654-1.414-2.06-.758-3.157.906-1.507 1.83-3.004 2.77-4.49l.001-.002.002-.004c9.364-15.224 20.324-21.59 32.783-21.877Zm-5.39 46.343c-1.514 0-2.721.454-3.53 1.286-.809.833-1.188 2.005-1.188 3.332v.951h-2.145v3.097h2.145v11.142h3.223v-11.142h3.442v-3.097h-3.471v-.86c0-.507.137-.866.38-1.11.242-.245.62-.411 1.236-.411.525 0 1.011.031 1.335.106l.609.142v-3.128l-.384-.088c-.383-.088-.903-.22-1.651-.22zm3.4.027v15.881c0 1.314.39 2.345 1.128 3.014.739.669 1.765.944 2.928.944.591 0 .985-.013 1.312-.107l.36-.102v-2.977l-.55.062c-.251.028-.369.027-.606.027-.43 0-.759-.095-.956-.252-.196-.157-.329-.383-.329-.88v-15.61Zm-3.4.965c.467 0 .741.076 1.044.141v1.144c-.313-.032-.61-.082-.952-.082-.805 0-1.483.24-1.942.704-.459.463-.667 1.113-.667 1.81v1.853h3.471v1.112H48.14v11.141H46.9v-11.141h-2.145v-1.112H46.9v-1.944c0-1.14.313-2.03.907-2.642.594-.611 1.498-.984 2.82-.984zm4.392.027h1.303v14.618c0 .711.257 1.3.701 1.655.444.355 1.006.47 1.576.47.055 0 .113-.008.165-.009v1.076c-.185.02-.315.044-.68.044-1.008 0-1.764-.236-2.262-.688-.499-.451-.803-1.151-.803-2.277zm-45.59.093c-2.96 0-5.342.973-6.964 2.667C.844 104.07 0 106.458 0 109.208c0 2.852.844 5.23 2.475 6.885 1.63 1.654 4.02 2.552 6.986 2.552 1.77 0 3.44-.29 4.665-1.02l.477.03v-3.615l-.717.357c-1.213.603-2.541.998-4.307.998-1.96 0-3.483-.618-4.53-1.676-1.049-1.059-1.642-2.581-1.642-4.479 0-1.902.567-3.445 1.583-4.517 1.016-1.073 2.496-1.702 4.44-1.702 1.954 0 3.22.39 4.38 1.126l.762.483v-3.477l-.21-.147c-1.364-.965-3.177-1.295-4.934-1.295Zm0 .992c1.54 0 3.052.328 4.15 1.023v1.249c-1.146-.572-2.426-.946-4.149-.946-2.162 0-3.942.727-5.159 2.011-1.217 1.285-1.856 3.098-1.856 5.2 0 2.107.675 3.91 1.928 5.176s3.064 1.971 5.236 1.971c1.597 0 2.874-.354 4.031-.837v1.235c-.956.563-2.483.868-4.149.868-2.768 0-4.86-.817-6.279-2.256-1.418-1.439-2.19-3.53-2.19-6.19 0-2.548.771-4.661 2.19-6.143 1.42-1.482 3.502-2.36 6.246-2.36zm71.986 3.161c-2.139 0-3.87.776-5.03 2.1-1.16 1.326-1.745 3.168-1.745 5.262 0 2.12.572 3.992 1.846 5.328 1.274 1.336 3.218 2.09 5.803 2.091 1.38 0 3.113-.192 4.372-.87l.261-.14v-3.104l-.658.23c-1.174.41-2.408.698-3.886.698-1.493 0-2.515-.34-3.2-.895-.543-.44-.855-1.075-1.056-1.82h9.525v-1.518c0-2.083-.415-3.91-1.43-5.246-1.015-1.336-2.636-2.116-4.802-2.116zm29.064 0c-2.468 0-4.36.76-5.607 2.087-1.247 1.328-1.827 3.182-1.827 5.275 0 2.122.578 3.989 1.825 5.324 1.248 1.335 3.14 2.095 5.609 2.095 1.256 0 2.54-.163 3.463-.659l-.235.058h.53v-3.252l-.667.244c-.772.283-1.534.45-2.847.45-1.631 0-2.703-.494-3.397-1.248-.695-.754-1.03-1.81-1.03-3.012 0-1.203.33-2.262 1.012-3.015.683-.753 1.736-1.244 3.35-1.244 1.177 0 1.989.217 2.782.585l.705.328v-3.202l-.288-.134c-1.12-.512-2.13-.68-3.378-.68zm11.29 0c-2.139 0-3.869.776-5.029 2.1-1.16 1.326-1.746 3.168-1.746 5.262 0 2.12.573 3.992 1.847 5.328 1.274 1.336 3.217 2.091 5.8 2.091 1.413 0 3.116-.193 4.373-.87l.261-.14v-3.104l-.659.23c-1.172.41-2.407.698-3.88.698-1.493 0-2.517-.34-3.203-.895-.545-.441-.857-1.075-1.058-1.82H128v-1.518c0-2.083-.416-3.91-1.43-5.246-1.015-1.336-2.635-2.116-4.8-2.116zm-99.724.033c-2.113 0-3.846.783-5.02 2.108-1.173 1.326-1.785 3.167-1.785 5.252s.62 3.932 1.795 5.268c1.176 1.336 2.907 2.136 5.006 2.153h.004c2.1 0 3.828-.803 4.996-2.143 1.168-1.341 1.779-3.194 1.779-5.278 0-2.085-.611-3.926-1.781-5.252-1.17-1.325-2.897-2.108-4.994-2.108zm15.393.027c-1.475 0-2.718.713-3.698 1.738v-1.467h-3.288v14.243h3.288v-7.872c0-1.25.34-2.138.872-2.718.533-.579 1.277-.881 2.225-.881 1.006 0 1.622.23 2.018.662.395.432.626 1.15.626 2.27v8.508h3.253v-8.235c0-1.9-.456-3.461-1.372-4.56-.915-1.099-2.285-1.688-3.924-1.688zm58.855 0c-1.474 0-2.717.713-3.698 1.738v-1.467H89.31v14.243h3.285v-7.872c0-1.25.34-2.138.872-2.718.533-.579 1.277-.881 2.223-.881 1.006 0 1.624.231 2.02.662.395.432.623 1.15.623 2.27v8.508h3.254v-8.235c0-1.9-.455-3.461-1.37-4.56-.915-1.099-2.286-1.688-3.924-1.688zm-35.566.244v8.262c0 1.9.455 3.46 1.37 4.558.915 1.099 2.286 1.69 3.924 1.69 1.474 0 2.718-.714 3.7-1.74v1.469h3.287v-14.239h-3.289v7.841c0 1.248-.34 2.136-.872 2.715-.533.58-1.278.882-2.223.882-1.006 0-1.622-.23-2.017-.663-.396-.432-.626-1.152-.626-2.275v-8.5zm20.688.688c1.937 0 3.184.636 4.011 1.725.828 1.09 1.229 2.696 1.229 4.645v.526h-9.767l.083.567c.178 1.217.677 2.28 1.583 3.014.906.734 2.178 1.118 3.824 1.118 1.356 0 2.47-.302 3.552-.634v1.167c-.99.449-2.455.669-3.641.669-2.395 0-4.028-.676-5.086-1.785-1.057-1.11-1.571-2.699-1.571-4.642 0-1.91.531-3.502 1.5-4.608.968-1.107 2.378-1.762 4.283-1.762zm29.064 0c1.052 0 1.804.176 2.674.533v1.114c-.742-.267-1.478-.529-2.494-.529-1.823 0-3.199.592-4.085 1.57-.887.978-1.27 2.298-1.27 3.682 0 1.387.392 2.708 1.291 3.684.9.977 2.29 1.568 4.128 1.568 1.109 0 1.806-.198 2.521-.405v1.078c-.668.298-1.696.502-2.765.502-2.269 0-3.845-.67-4.882-1.78-1.037-1.11-1.56-2.705-1.56-4.647 0-1.911.52-3.49 1.558-4.595 1.037-1.104 2.615-1.775 4.884-1.775zm11.29 0c1.938 0 3.185.636 4.012 1.725.827 1.09 1.227 2.696 1.227 4.645v.526h-9.768l.084.567c.178 1.218.68 2.282 1.587 3.016.907.734 2.18 1.116 3.826 1.116 1.351 0 2.465-.302 3.546-.634v1.167c-.989.45-2.424.669-3.641.669-2.394 0-4.026-.674-5.084-1.783-1.057-1.11-1.571-2.7-1.571-4.644 0-1.91.531-3.502 1.5-4.608.968-1.107 2.377-1.762 4.282-1.762zm-99.724.033c1.856 0 3.268.661 4.25 1.773.981 1.113 1.533 2.704 1.533 4.595 0 1.89-.553 3.498-1.535 4.626-.982 1.127-2.393 1.802-4.245 1.803-1.855-.015-3.277-.691-4.267-1.816-.99-1.125-1.548-2.724-1.548-4.613 0-1.892.55-3.483 1.534-4.595.985-1.112 2.405-1.773 4.278-1.773zm15.393.027c1.41 0 2.44.465 3.163 1.332.722.866 1.141 2.182 1.141 3.924v7.242h-1.27V109.9c0-1.255-.253-2.251-.885-2.94-.631-.689-1.584-.985-2.75-.985-1.169 0-2.22.405-2.955 1.204-.735.798-1.134 1.956-1.134 3.387v6.88h-1.304v-12.257h1.304v1.672l.932.234c.757-1.407 2.139-2.178 3.758-2.178zm58.855 0c1.41 0 2.439.465 3.16 1.332.722.866 1.142 2.182 1.142 3.924v7.242h-1.27V109.9c0-1.255-.254-2.251-.885-2.94-.631-.689-1.584-.985-2.75-.985-1.167 0-2.22.406-2.954 1.204-.734.798-1.133 1.956-1.133 3.387v6.88h-1.3v-12.257h1.3v1.672l.932.236c.76-1.408 2.142-2.18 3.758-2.18zm-34.574.244h1.27v7.508c0 1.258.254 2.254.885 2.944s1.584.986 2.75.986c1.167 0 2.217-.403 2.952-1.201.734-.798 1.135-1.957 1.135-3.388v-6.849h1.305v12.254h-1.303v-1.672l-.932-.237c-.76 1.408-2.145 2.18-3.76 2.18-1.41 0-2.439-.464-3.16-1.33-.722-.868-1.142-2.184-1.142-3.925zm19.574.814c-1.313 0-2.382.436-3.12 1.212-.739.775-1.138 1.85-1.268 3.083l-.056.548h8.498l-.025-.521c-.065-1.303-.394-2.385-1.078-3.155-.683-.77-1.705-1.167-2.951-1.167zm40.385 0c-1.325 0-2.396.435-3.131 1.212-.736.776-1.129 1.851-1.258 3.083l-.056.548h8.5l-.026-.521c-.064-1.303-.394-2.385-1.077-3.155-.684-.77-1.705-1.167-2.952-1.167zm-99.602.027c-1.563 0-2.768.639-3.524 1.626-.755.988-1.08 2.284-1.08 3.63s.326 2.648 1.08 3.642c.755.994 1.96 1.641 3.524 1.641 1.537 0 2.728-.658 3.472-1.655.745-.997 1.068-2.296 1.068-3.628 0-1.33-.316-2.623-1.058-3.614-.742-.991-1.933-1.642-3.482-1.642zm59.217.966c1.047 0 1.73.294 2.209.833.38.429.539 1.204.659 2.025h-6.049c.166-.764.355-1.51.78-1.955.543-.571 1.298-.903 2.4-.903zm40.385 0c1.048 0 1.73.294 2.21.833.38.429.538 1.204.659 2.025h-6.053c.164-.765.35-1.512.772-1.957.54-.57 1.295-.901 2.412-.901zm-99.602.027c1.286 0 2.116.479 2.688 1.242.571.763.86 1.85.86 3.021 0 1.167-.296 2.261-.872 3.033-.577.772-1.408 1.258-2.676 1.258-1.304 0-2.153-.481-2.735-1.248-.582-.767-.876-1.859-.876-3.043 0-1.184.295-2.267.876-3.027.581-.76 1.43-1.236 2.735-1.236z"/></svg>
diff --git a/icons/confluence/confluence-line.svg b/icons/confluence/confluence-line.svg
new file mode 100644
index 000000000..778d2a166
--- /dev/null
+++ b/icons/confluence/confluence-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#136be6" d="M96.971 2.649a4.49 4.49 0 0 0-3.664 2.17l-.004.008-.004.006a176.272 176.272 0 0 1-3.826 6.51l-.002.002c-5.138 8.47-10.2 12.11-16.306 12.622-6.107.513-13.38-2.17-22.759-6.672h-.002L24.31 5.013l-.004-.002c-2.345-1.07-4.943.006-6.018 2.148l-.005.011-12.46 28.2c-1.096 2.195-.026 4.96 2.142 6.041l.007.004.01.006c5.548 2.491 16.483 7.673 26.063 12.466l.006.002.003.002c17.798 8.472 34.301 12.498 49.292 9.663 14.924-2.823 28.282-12.48 39.803-31.11h.01l.146-.23a329.925 329.925 0 0 0 4.037-6.535h.002c1.285-2.143.635-4.951-1.512-6.245l-.004-.002L99.549 3.306l-.002-.002a4.609 4.609 0 0 0-2.576-.655Zm.043.992a3.609 3.609 0 0 1 2.021.516l26.278 16.124h.002c1.684 1.012 2.19 3.193 1.174 4.886h.002a329.05 329.05 0 0 1-3.881 6.285h-.004l-.146.236C111.004 50.321 97.852 59.8 83.161 62.578c-14.689 2.779-30.983-1.16-48.672-9.58l-.01-.003C24.896 48.2 13.98 43.027 8.407 40.524l-.004-.004c-1.666-.834-2.516-3.059-1.692-4.708l.006-.01 12.46-28.198c.849-1.694 2.848-2.543 4.718-1.69L49.98 18.193c9.416 4.52 16.813 7.306 23.268 6.764 6.455-.543 11.847-4.485 17.07-13.094l.002-.002a177.156 177.156 0 0 0 3.835-6.529 3.485 3.485 0 0 1 2.859-1.69ZM53.246 63.48c-18.472.425-34.828 9.995-48.55 32.308v.002c0 .002-.003.003-.004.004a329.966 329.966 0 0 0-4.035 6.53H.655v.002c-1.281 2.143-.635 4.951 1.516 6.244l26.278 16.126.002.002c2.143 1.286 4.948.634 6.24-1.515l.004-.006.004-.008a183.88 183.88 0 0 1 3.825-6.51v-.002h.002c5.138-8.47 10.2-12.11 16.307-12.623 6.107-.513 13.382 2.171 22.76 6.673h.002l26.094 12.281.004.002c2.345 1.07 4.948-.005 6.017-2.149l.006-.01 12.466-28.2c1.09-2.194.024-4.955-2.148-6.04l-.008-.005-.01-.006c-5.548-2.49-16.48-7.672-26.064-12.465l-.002-.002-.004-.002c-14.458-6.961-28.06-10.922-40.7-10.631Zm.023.992c12.416-.286 25.875 3.615 40.247 10.535 9.59 4.795 20.5 9.968 26.076 12.471l.004.004c1.673.84 2.517 3.058 1.698 4.708l-.006.01-12.468 28.203c-.844 1.689-2.845 2.535-4.711 1.686l-.006-.002-26.08-12.275-.004-.002c-9.416-4.52-16.812-7.306-23.268-6.764-6.456.543-11.85 4.485-17.074 13.096a184.83 184.83 0 0 0-3.835 6.529c-1.013 1.684-3.187 2.19-4.88 1.174L2.684 107.721h-.002C1 106.709.495 104.528 1.506 102.835l.002-.002a330.226 330.226 0 0 1 4.025-6.514l.002-.002.002-.003C19.142 74.186 35.123 64.89 53.27 64.472Z"/></svg>
diff --git a/icons/confluence/confluence-original-wordmark.svg b/icons/confluence/confluence-original-wordmark.svg
index aef57901f..ef071f928 100644
--- a/icons/confluence/confluence-original-wordmark.svg
+++ b/icons/confluence/confluence-original-wordmark.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><defs><linearGradient id="confluence-original-wordmark-a" gradientUnits="userSpaceOnUse" x1="26.791" y1="28.467" x2="11.792" y2="19.855" gradientTransform="translate(5.976 -3.222) scale(3.6229)"><stop offset="0" stop-color="#0052cc"/><stop offset=".918" stop-color="#2380fb"/><stop offset="1" stop-color="#2684ff"/></linearGradient><linearGradient id="confluence-original-wordmark-b" gradientUnits="userSpaceOnUse" x1="5.209" y1="2.523" x2="20.208" y2="11.136" gradientTransform="translate(5.976 -3.222) scale(3.6229)"><stop offset="0" stop-color="#0052cc"/><stop offset=".918" stop-color="#2380fb"/><stop offset="1" stop-color="#2684ff"/></linearGradient></defs><path d="M23.629 74.875a229.944 229.944 0 00-2.758 4.469c-.785 1.312-.394 3.023.922 3.812l17.988 11.035c1.313.79 3.02.395 3.809-.918a118.23 118.23 0 012.625-4.468c7.09-11.696 14.312-10.38 27.183-4.207l17.86 8.41c1.441.66 3.02 0 3.676-1.313l8.535-19.316c.656-1.313 0-3.02-1.313-3.68-3.808-1.707-11.293-5.254-17.86-8.539-24.292-11.695-44.91-10.906-60.667 14.715zm0 0" fill="url(#confluence-original-wordmark-a)"/><path d="M104.258 30.988a230.06 230.06 0 002.758-4.465c.785-1.316.39-3.023-.922-3.812L88.105 11.67c-1.312-.784-3.02-.39-3.808.923a121.42 121.42 0 01-2.625 4.469c-7.094 11.69-14.313 10.378-27.184 4.203l-17.86-8.41c-1.44-.657-3.019 0-3.675 1.316l-8.535 19.312c-.656 1.317 0 3.024 1.312 3.68 3.81 1.711 11.293 5.258 17.86 8.543C67.883 57.27 88.5 56.613 104.258 30.988zm0 0" fill="url(#confluence-original-wordmark-b)"/><path d="M14.953 117.824c-1.078.719-2.785 1.016-4.582 1.016-5.695 0-8.902-3.406-8.902-8.88 0-5.26 3.207-8.937 8.87-8.937 1.68 0 3.388.329 4.614 1.196v2.3c-1.226-.777-2.605-1.195-4.613-1.195-4.078 0-6.473 2.692-6.473 6.668 0 3.977 2.516 6.606 6.621 6.606 1.828 0 3.239-.418 4.496-1.043v2.27zm0 0M16.602 111.996c0-3.95 2.308-6.816 6.265-6.816 3.926 0 6.235 2.867 6.235 6.816 0 3.945-2.309 6.875-6.235 6.875-3.926-.031-6.265-2.93-6.265-6.875zm2.218 0c0 2.512 1.23 4.754 4.078 4.754 2.786 0 4.016-2.273 4.016-4.754 0-2.484-1.2-4.726-4.016-4.726-2.847 0-4.078 2.214-4.078 4.726zm0 0M42.95 118.602h-2.278v-7.954c0-2.359-.961-3.406-3.117-3.406-2.102 0-3.567 1.406-3.567 4.067v7.324h-2.281v-13.156h2.281v2.152c.836-1.555 2.395-2.422 4.164-2.422 3.028 0 4.766 2.094 4.766 5.711v7.684zm0 0M52.688 105.45v2.09H49.27v11.062h-2.215v-11.063h-2.13v-2.09h2.13v-1.437c0-2.45 1.379-4.094 4.195-4.094.688 0 1.137.117 1.527.207v2.094c-.39-.09-.898-.121-1.437-.121-1.41 0-2.098.808-2.098 2.004v1.347zm0 0M58.652 118.66c-2.156 0-3.535-1.015-3.535-3.437V99.945h2.278v15.008c0 1.2.777 1.617 1.77 1.617.237 0 .386 0 .655-.03v2.034c-.207.059-.597.086-1.168.086zm0 0M61.738 105.45h2.278v7.948c0 2.364.96 3.41 3.117 3.41 2.097 0 3.566-1.406 3.566-4.066v-7.293h2.281v13.153H70.7v-2.153c-.84 1.555-2.4 2.422-4.165 2.422-3.027 0-4.765-2.094-4.765-5.71v-7.712zm0 0M82.688 118.84c-4.946 0-7.102-2.84-7.102-6.875 0-3.977 2.219-6.817 6.234-6.817 4.075 0 5.696 2.813 5.696 6.817v1.015h-9.621c.328 2.243 1.765 3.68 4.882 3.68 1.532 0 2.82-.3 4.02-.719v2.094c-1.11.598-2.79.805-4.11.805zm-4.856-7.774h7.375c-.121-2.449-1.23-3.824-3.508-3.824-2.398 0-3.625 1.524-3.867 3.824zm0 0M101.39 118.602h-2.277v-7.954c0-2.359-.96-3.406-3.117-3.406-2.098 0-3.566 1.406-3.566 4.067v7.324h-2.278v-13.156h2.278v2.152c.84-1.555 2.398-2.422 4.164-2.422 3.027 0 4.765 2.094 4.765 5.711v7.684zm0 0M113.887 118.242c-.778.418-2.008.598-3.207.598-4.703 0-6.89-2.84-6.89-6.875 0-3.977 2.187-6.817 6.89-6.817 1.199 0 2.097.149 3.148.63v2.093c-.84-.39-1.738-.629-2.969-.629-3.414 0-4.824 2.153-4.824 4.723s1.442 4.722 4.887 4.722c1.348 0 2.187-.18 2.996-.476v2.031zm0 0M122.758 118.84c-4.942 0-7.102-2.84-7.102-6.875 0-3.977 2.219-6.817 6.235-6.817 4.074 0 5.695 2.813 5.695 6.817v1.015h-9.621c.328 2.243 1.77 3.68 4.887 3.68 1.527 0 2.816-.3 4.015-.719v2.094c-1.11.598-2.758.805-4.11.805zm-4.824-7.774h7.375c-.121-2.449-1.23-3.824-3.508-3.824-2.426 0-3.625 1.524-3.867 3.824zm0 0" fill="#253858"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><defs><linearGradient id="a" x1="26.791" x2="11.792" y1="28.467" y2="19.855" gradientTransform="translate(4.574 -5.311) scale(3.677)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0052cc"/><stop offset=".918" stop-color="#2380fb"/><stop offset="1" stop-color="#2684ff"/></linearGradient><linearGradient id="b" x1="5.209" x2="20.208" y1="2.523" y2="11.136" gradientTransform="translate(4.574 -5.311) scale(3.677)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0052cc"/><stop offset=".918" stop-color="#2380fb"/><stop offset="1" stop-color="#2684ff"/></linearGradient></defs><path fill="url(#a)" d="M22.49 73.952a233.377 233.377 0 0 0-2.798 4.535c-.797 1.332-.4 3.068.935 3.87l18.257 11.199c1.333.802 3.065.4 3.866-.932a119.995 119.995 0 0 1 2.664-4.534c7.196-11.871 14.526-10.535 27.589-4.27l18.127 8.535c1.462.67 3.065 0 3.73-1.332l8.663-19.605c.666-1.332 0-3.065-1.333-3.735-3.865-1.732-11.461-5.332-18.126-8.666-24.655-11.87-45.58-11.069-61.573 14.935Zm0 0"/><path fill="url(#b)" d="M104.324 29.41a233.495 233.495 0 0 0 2.799-4.532c.797-1.336.396-3.068-.936-3.87L87.93 9.804c-1.332-.796-3.066-.396-3.865.937a123.233 123.233 0 0 1-2.665 4.535c-7.2 11.865-14.526 10.533-27.59 4.266l-18.126-8.535c-1.462-.667-3.064 0-3.73 1.335l-8.662 19.6c-.666 1.337 0 3.07 1.331 3.736 3.867 1.736 11.462 5.336 18.127 8.67 24.656 11.737 45.58 11.07 61.574-14.938Zm0 0"/><path fill="#253858" d="M13.685 117.542c-1.094.73-2.826 1.031-4.65 1.031-5.78 0-9.035-3.457-9.035-9.013 0-5.338 3.255-9.07 9.002-9.07 1.706 0 3.439.334 4.683 1.214v2.334c-1.244-.788-2.644-1.213-4.682-1.213-4.138 0-6.57 2.733-6.57 6.768 0 4.036 2.554 6.705 6.72 6.705 1.856 0 3.288-.425 4.564-1.059v2.304zm1.674-5.915c0-4.01 2.342-6.918 6.358-6.918 3.985 0 6.329 2.91 6.329 6.918 0 4.004-2.344 6.978-6.329 6.978-3.984-.032-6.358-2.974-6.358-6.978zm2.251 0c0 2.55 1.248 4.825 4.139 4.825 2.828 0 4.076-2.307 4.076-4.825 0-2.521-1.218-4.797-4.076-4.797-2.89 0-4.139 2.247-4.139 4.797zm24.49 6.704h-2.312v-8.072c0-2.394-.975-3.457-3.163-3.457-2.134 0-3.62 1.427-3.62 4.128v7.433h-2.316V105.01h2.316v2.184c.848-1.579 2.43-2.459 4.226-2.459 3.073 0 4.837 2.126 4.837 5.797v7.798zm9.884-13.348v2.121h-3.47v11.227h-2.247v-11.228h-2.162v-2.12h2.162v-1.46c0-2.486 1.4-4.154 4.257-4.154.699 0 1.154.118 1.55.21v2.125c-.396-.091-.911-.123-1.458-.123-1.431 0-2.13.82-2.13 2.034v1.367zm6.053 13.407c-2.188 0-3.588-1.03-3.588-3.488V99.396h2.312v15.232c0 1.218.789 1.641 1.796 1.641.241 0 .392 0 .665-.03v2.064c-.21.06-.606.087-1.185.087zm3.132-13.407h2.312v8.067c0 2.4.974 3.46 3.163 3.46 2.129 0 3.62-1.426 3.62-4.126v-7.402h2.315v13.35h-2.314v-2.186c-.853 1.579-2.436 2.459-4.228 2.459-3.072 0-4.836-2.126-4.836-5.796v-7.827zm21.263 13.59c-5.02 0-7.208-2.882-7.208-6.978 0-4.036 2.252-6.918 6.327-6.918 4.136 0 5.78 2.855 5.78 6.918v1.03h-9.764c.333 2.277 1.791 3.735 4.955 3.735 1.555 0 2.862-.304 4.08-.73v2.126c-1.127.607-2.832.817-4.171.817zm-4.929-7.89h7.485c-.123-2.486-1.248-3.881-3.56-3.881-2.434 0-3.68 1.547-3.925 3.881zm23.91 7.648h-2.311v-8.072c0-2.394-.974-3.457-3.164-3.457-2.129 0-3.619 1.427-3.619 4.128v7.433h-2.312V105.01h2.312v2.184c.853-1.579 2.434-2.459 4.226-2.459 3.072 0 4.836 2.126 4.836 5.797v7.798zm12.683-.365c-.79.424-2.038.607-3.254.607-4.774 0-6.993-2.882-6.993-6.978 0-4.036 2.22-6.918 6.993-6.918 1.216 0 2.128.15 3.195.639v2.124c-.853-.396-1.764-.638-3.014-.638-3.465 0-4.896 2.185-4.896 4.793 0 2.609 1.464 4.793 4.96 4.793 1.368 0 2.22-.183 3.04-.483v2.061zm9.004.607c-5.016 0-7.208-2.882-7.208-6.978 0-4.036 2.252-6.918 6.328-6.918 4.135 0 5.78 2.855 5.78 6.918v1.03h-9.765c.333 2.277 1.797 3.735 4.96 3.735 1.55 0 2.858-.304 4.075-.73v2.126c-1.126.607-2.799.817-4.171.817zm-4.896-7.89h7.485c-.123-2.486-1.248-3.881-3.56-3.881-2.463 0-3.68 1.547-3.925 3.881zm0 0"/></svg>
diff --git a/icons/confluence/confluence-original.svg b/icons/confluence/confluence-original.svg
index ee2ffdf92..2ba39438d 100644
--- a/icons/confluence/confluence-original.svg
+++ b/icons/confluence/confluence-original.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><defs><linearGradient id="confluence-original-a" gradientUnits="userSpaceOnUse" x1="26.791" y1="28.467" x2="11.792" y2="19.855" gradientTransform="scale(4)"><stop offset="0" stop-color="#0052cc"/><stop offset=".918" stop-color="#2380fb"/><stop offset="1" stop-color="#2684ff"/></linearGradient><linearGradient id="confluence-original-b" gradientUnits="userSpaceOnUse" x1="5.209" y1="2.523" x2="20.208" y2="11.136" gradientTransform="scale(4)"><stop offset="0" stop-color="#0052cc"/><stop offset=".918" stop-color="#2380fb"/><stop offset="1" stop-color="#2684ff"/></linearGradient></defs><path d="M19.492 86.227a249.047 249.047 0 00-3.047 4.933c-.867 1.45-.433 3.336 1.016 4.207l19.863 12.188c1.45.87 3.332.433 4.203-1.016a139.349 139.349 0 012.899-4.934c7.832-12.91 15.804-11.46 30.011-4.64l19.72 9.281c1.593.727 3.335 0 4.058-1.45l9.426-21.323c.722-1.453 0-3.336-1.454-4.063-4.203-1.887-12.464-5.805-19.714-9.43-26.82-12.914-49.586-12.043-66.98 16.247zm0 0" fill="url(#confluence-original-a)"/><path d="M108.508 37.773a249.047 249.047 0 003.047-4.933c.87-1.45.433-3.336-1.016-4.207L90.676 16.445c-1.45-.87-3.332-.433-4.203 1.016a133.55 133.55 0 01-2.899 4.934c-7.832 12.91-15.804 11.46-30.011 4.64l-19.72-9.281c-1.593-.727-3.331 0-4.058 1.45l-9.422 21.323c-.726 1.453 0 3.34 1.45 4.063 4.203 1.887 12.468 5.805 19.714 9.43 26.825 12.77 49.586 12.042 66.98-16.247zm0 0" fill="url(#confluence-original-b)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><defs><linearGradient id="a" x1="26.791" x2="11.792" y1="28.467" y2="19.855" gradientTransform="translate(-21.334 -18.666) scale(5.33331)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0052cc"/><stop offset=".918" stop-color="#2380fb"/><stop offset="1" stop-color="#2684ff"/></linearGradient><linearGradient id="b" x1="5.209" x2="20.208" y1="2.523" y2="11.136" gradientTransform="translate(-21.334 -18.666) scale(5.33331)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0052cc"/><stop offset=".918" stop-color="#2380fb"/><stop offset="1" stop-color="#2684ff"/></linearGradient></defs><path fill="url(#a)" d="M4.655 96.303a332.061 332.061 0 0 0-4.062 6.577c-1.156 1.933-.578 4.448 1.354 5.61l26.484 16.25c1.934 1.16 4.443.577 5.604-1.355a185.798 185.798 0 0 1 3.866-6.579c10.442-17.213 21.071-15.28 40.014-6.186l26.293 12.374c2.124.97 4.447 0 5.41-1.933l12.569-28.43c.963-1.938 0-4.448-1.939-5.418-5.604-2.516-16.618-7.74-26.285-12.573-35.76-17.219-66.114-16.057-89.306 21.663Zm0 0"/><path fill="url(#b)" d="M123.343 31.697a332.061 332.061 0 0 0 4.063-6.577c1.16-1.933.577-4.448-1.355-5.61L99.567 3.26c-1.933-1.16-4.443-.577-5.604 1.355a178.066 178.066 0 0 1-3.865 6.579c-10.443 17.213-21.072 15.28-40.015 6.186L23.79 5.006c-2.124-.97-4.441 0-5.41 1.933L5.816 35.369c-.968 1.938 0 4.454 1.933 5.418 5.604 2.516 16.624 7.74 26.285 12.573 35.767 17.027 66.115 16.056 89.307-21.663zm0 0"/></svg>
diff --git a/icons/confluence/confluence-plain-wordmark.svg b/icons/confluence/confluence-plain-wordmark.svg
new file mode 100644
index 000000000..f90ef3c9c
--- /dev/null
+++ b/icons/confluence/confluence-plain-wordmark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#136be6" d="M86.332 9.398a2.772 2.772 0 0 0-2.268 1.342 123.233 123.233 0 0 1-2.664 4.535c-7.2 11.865-14.526 10.533-27.59 4.266l-18.126-8.535c-1.462-.667-3.065 0-3.73 1.336l-8.663 19.6c-.666 1.336 0 3.068 1.332 3.734 3.867 1.736 11.462 5.338 18.127 8.672 24.656 11.736 45.581 11.07 61.574-14.938a233.495 233.495 0 0 0 2.8-4.533c.796-1.336.395-3.068-.936-3.87L87.93 9.804a2.863 2.863 0 0 0-1.598-.405zM55.943 51.664c-12.721.293-23.957 6.848-33.453 22.287a233.377 233.377 0 0 0-2.799 4.537c-.796 1.332-.4 3.067.936 3.867l18.258 11.202c1.332.801 3.064.4 3.865-.932a119.995 119.995 0 0 1 2.664-4.535c7.196-11.87 14.527-10.535 27.59-4.27l18.125 8.535c1.462.67 3.067.001 3.732-1.332l8.662-19.605c.666-1.333-.001-3.065-1.334-3.734-3.864-1.733-11.46-5.332-18.125-8.666-10.016-4.822-19.416-7.554-28.12-7.354zm-5.42 47.705c-2.858 0-4.255 1.668-4.255 4.154v1.46h-2.163v2.12h2.163v11.229h2.248v-11.228h3.468v-2.122h-3.498v-1.367c0-1.214.698-2.033 2.13-2.033.546 0 1.062.03 1.458.121v-2.125c-.396-.091-.852-.209-1.55-.209zm3.926.027v15.506c0 2.459 1.4 3.489 3.588 3.489.58 0 .976-.028 1.186-.088v-2.065c-.273.03-.426.032-.666.032-1.008 0-1.795-.423-1.795-1.641V99.396h-2.313zM9.002 100.49c-5.748 0-9.002 3.732-9.002 9.07 0 5.556 3.255 9.012 9.035 9.012 1.824 0 3.556-.301 4.65-1.031l.032.002v-2.305c-1.276.635-2.707 1.059-4.563 1.059-4.166 0-6.72-2.667-6.72-6.703 0-4.036 2.431-6.768 6.57-6.768 2.038 0 3.437.424 4.682 1.213v-2.336c-1.245-.88-2.979-1.213-4.684-1.213zm72.549 4.186c-4.075 0-6.328 2.883-6.328 6.92 0 4.094 2.19 6.975 7.209 6.976 1.34 0 3.044-.21 4.17-.816v-2.125c-1.218.425-2.526.73-4.08.73-3.164 0-4.623-1.46-4.956-3.736h9.766v-1.03c0-4.063-1.645-6.92-5.781-6.92zm29.29 0c-4.772 0-6.991 2.883-6.991 6.92 0 4.095 2.219 6.976 6.992 6.976 1.217 0 2.464-.181 3.254-.605h.033v-2.063c-.821.3-1.673.485-3.041.485-3.497 0-4.961-2.185-4.961-4.793 0-2.609 1.431-4.793 4.896-4.793 1.25 0 2.162.24 3.014.636v-2.123c-1.067-.488-1.978-.64-3.195-.64zm11.38 0c-4.076 0-6.328 2.883-6.328 6.92 0 4.095 2.19 6.976 7.207 6.976 1.372 0 3.043-.21 4.17-.816v-2.125c-1.217.425-2.525.73-4.075.73-3.163 0-4.628-1.46-4.96-3.736H128v-1.03c0-4.063-1.644-6.92-5.78-6.92zm-100.504.033c-4.016 0-6.358 2.909-6.358 6.918 0 4.004 2.373 6.947 6.358 6.978 3.984 0 6.328-2.974 6.328-6.978 0-4.008-2.344-6.918-6.328-6.918zm15.513.027c-1.795 0-3.378.881-4.226 2.46v-2.186h-2.315v13.353h2.315v-7.433c0-2.701 1.488-4.127 3.621-4.127 2.188 0 3.164 1.06 3.164 3.455v8.074h2.28v-7.799c0-3.67-1.765-5.797-4.839-5.797zm59.315 0c-1.792 0-3.374.881-4.227 2.46v-2.186h-2.31v13.353h2.31v-7.433c0-2.701 1.49-4.127 3.62-4.127 2.189 0 3.164 1.06 3.164 3.455v8.074h2.279v-7.799c0-3.67-1.764-5.797-4.836-5.797zm-35.344.246v7.827c0 3.67 1.764 5.796 4.836 5.796 1.791 0 3.376-.88 4.229-2.459v2.186h2.312v-13.35h-2.314v7.403c0 2.7-1.491 4.125-3.62 4.125-2.189 0-3.164-1.062-3.164-3.461v-8.067h-2.279zm20.227 1.82c2.312 0 3.437 1.396 3.56 3.882h-7.484c.246-2.335 1.49-3.881 3.924-3.881zm40.7 0c2.313 0 3.439 1.396 3.561 3.882h-7.486c.246-2.335 1.464-3.881 3.926-3.881zm-100.38.028c2.858 0 4.076 2.276 4.076 4.797 0 2.518-1.248 4.824-4.076 4.824-2.89 0-4.139-2.275-4.139-4.824 0-2.55 1.25-4.797 4.139-4.797z"/></svg>
diff --git a/icons/confluence/confluence-plain.svg b/icons/confluence/confluence-plain.svg
new file mode 100644
index 000000000..d6c7ac094
--- /dev/null
+++ b/icons/confluence/confluence-plain.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#136be6" d="M97.25 2.67a4.02 4.02 0 0 0-3.287 1.945 178.066 178.066 0 0 1-3.865 6.578c-10.443 17.214-21.071 15.281-40.014 6.188L23.789 5.006c-2.124-.97-4.44 0-5.41 1.933L5.816 35.37c-.968 1.937 0 4.454 1.934 5.418 5.604 2.516 16.624 7.74 26.285 12.572 35.767 17.027 66.115 16.057 89.307-21.662h.002a332.061 332.061 0 0 0 4.062-6.576c1.16-1.933.577-4.448-1.355-5.61L99.566 3.26a4.14 4.14 0 0 0-2.316-.59zM53.174 63.975c-18.453.424-34.748 9.932-48.518 32.328a332.061 332.061 0 0 0-4.064 6.576c-1.156 1.933-.577 4.448 1.355 5.61l26.485 16.251c1.933 1.16 4.442.577 5.603-1.355a185.798 185.798 0 0 1 3.865-6.578c10.443-17.214 21.073-15.281 40.016-6.188l26.293 12.375c2.124.97 4.446 0 5.41-1.933l12.569-28.43c.962-1.937-.001-4.449-1.94-5.418-5.604-2.516-16.618-7.74-26.285-12.572-14.528-6.995-28.164-10.957-40.79-10.666z"/></svg>
diff --git a/icons/confluence/confluence.eps b/icons/confluence/confluence.eps
deleted file mode 100644
index 4860547cf..000000000
Binary files a/icons/confluence/confluence.eps and /dev/null differ