diff --git a/src/icons/icons.yml b/src/icons/icons.yml
index 479924c09..f5b7d5359 100644
--- a/src/icons/icons.yml
+++ b/src/icons/icons.yml
@@ -6977,6 +6977,7 @@ icons:
     categories:
       - Brand Icons
 
+<<<<<<< HEAD
   - name:       Hackaday
     id:         hackaday
     unicode:    f30a
@@ -7001,5 +7002,11 @@ icons:
     filter:
       - message
       - texting
+
+  - name:       GnuPG
+    id:         gnupg
+    unicode:    f30d
+    created:    1.0
+    url:        gnupg.org
     categories:
       - Brand Icons
diff --git a/src/icons/svg/gnupg.svg b/src/icons/svg/gnupg.svg
new file mode 100644
index 000000000..da4571f08
--- /dev/null
+++ b/src/icons/svg/gnupg.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1536" height="1792">
+    <path d="M190 869.324h81.273V624.678C271.273 350.42 493.69 128 767.944 128c274.262 0 496.672 222.42 496.672 496.68v242.23c-1.177.824-2.345 1.625-3.495 2.415h.01l-.753.507-.074.106h-.159l-.374.264-.446.296-.085.106-.483.338h-.021l-.191.117-.11.105-.242.148h-.053l-.296.19-.292.19-.4.265-.188.116-.16.117-.136.105-.449.296-.431.296h-.021l-.563.37-.123.106-.682.454h-.063l-.277.19h-.011l-.106.106-.895.582-.143.105-.194.117H1252.562l-.461.296h-.042l-.011.01h-.021l-.529.338-.112.106-.168.116-.16.116-.12.106-.277.19-.262.148h-.021l-.277.19h-.032l-.247.148h-.074l-.199.117-.128.105-.15.106-.176.116-.096.106-1.509.951-.322.19h-.074l-.806.497h-.063l-.917.56h-.084l-.25.149-.012.01-.266.148h-.032l-.233.148-.225.148h-.032l-.124.105-.397.222-.214.117-.303.19-.888.528-.888.518-.891.529-.895.528-1.806 1.057-.905.529-.91.529-.379.221-2.378 1.375-.925.539-.933.528-.936.54-1.225.697-1.603.91-.951.538-3.697 2.075-.153.106-.974.539-.978.54-.213.115-1.3.72-2.91 1.598-1.367.751a626.977 626.977 0 0 1-4.236 2.289l-.364.19-.667.338-2.071 1.105-1.041.55-.177.105-1.914 1.015h-.01l-1.06.55-.303.148-1.828.95-1.067.55-.986.508c-1.337.687-2.685 1.386-4.048 2.078l-1.117.56c-1.599.814-3.217 1.63-4.854 2.442l-.01.01c-1.563.772-3.14 1.555-4.731 2.334l-1.577.772c-1.73.835-3.472 1.685-5.24 2.531h-.01c-98.633 47.119-256.812 97.247-557.097 118.807-215.15 15.456-345.56 110.137-430.615 224.404V869.034zm310.05 0h535.792V624.678c0-147.939-119.963-267.903-267.898-267.903-147.927 0-267.894 119.964-267.894 267.903v244.646zm694.053 38.582a744.265 744.265 0 0 1-4.854 2.442M992.942 248.154c-63.692-38.058-138.155-59.957-217.72-59.957-218.103 0-397.881 164.328-422.34 375.875 63.94-200.033 251.367-344.939 472.589-344.939 58.766 0 115.147 10.252 167.47 29.02zm352.95 714.811V1664H356.977c109.011-60.612 190.258-54.44 324.818-50.186 183.247 5.795 385.727-70.968 485.307-172.614 99.592-101.655-9.015-24.053-121.75 4.544-112.753 28.586-330.927 31.627-476.764-6.704 459.322 6.259 638.081-142.324 739.599-275.389 101.513-133.066-43.905-23.103-138.107 22.768-94.199 45.916-258.49 78.719-439.148 54.797 273.456-.56 481.524-137.22 614.96-278.25z" class="fil0" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision"/>
+</svg>