diff --git a/fonts/forkawesome-webfont.eot b/fonts/forkawesome-webfont.eot
index dae05b67fe..0c2309ee04 100644
Binary files a/fonts/forkawesome-webfont.eot and b/fonts/forkawesome-webfont.eot differ
diff --git a/fonts/forkawesome-webfont.svg b/fonts/forkawesome-webfont.svg
index fd159e835f..21f1567195 100644
--- a/fonts/forkawesome-webfont.svg
+++ b/fonts/forkawesome-webfont.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <!--
-2019-11-21: Created with FontForge (http://fontforge.org)
+2019-11-28: Created with FontForge (http://fontforge.org)
 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20190801 at Thu Nov 21 23:09:04 2019
+Created by FontForge 20190801 at Thu Nov 28 23:03:58 2019
  By Helmut K. C. Tessarek
 The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/OFL). Fork Awesome is a fork based of off Font Awesome 4.7.0 by Dave Gandy. More info on licenses at https://forkawesome.github.io
 </metadata>
@@ -22,7 +22,7 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/
     bbox="-0.653061 -410 2304.01 1538"
     underline-thickness="89.6"
     underline-position="-179.2"
-    unicode-range="U+0020-F338"
+    unicode-range="U+0020-F339"
   />
     <missing-glyph />
     <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
@@ -1100,6 +1100,19 @@ d="M0 1128c0 152 123 276 274 276h973c151 0 273 -124 273 -276v-980c0 -152 -122 -2
 d="M1134 307c11 -34 -8 -69 -41 -80c-34 -11 -70 8 -81 42c-33 107 -132 179 -244 179s-211 -72 -244 -179c-11 -34 -47 -53 -80 -42c-34 11 -53 46 -42 80c50 161 197 269 366 269s316 -108 366 -269zM640 896c0 -71 -57 -128 -128 -128s-128 57 -128 128s57 128 128 128
 s128 -57 128 -128zM1152 896c0 -71 -57 -128 -128 -128s-128 57 -128 128s57 128 128 128s128 -57 128 -128zM1408 640c0 353 -287 640 -640 640s-640 -287 -640 -640s287 -640 640 -640s640 287 640 640zM1536 640c0 -424 -344 -768 -768 -768s-768 344 -768 768
 s344 768 768 768s768 -344 768 -768z" />
+    <glyph glyph-name="funkwhale" unicode="&#xf339;" 
+d="M331 1335v0c77 -3 156 -18 221 -53v0c60 -31 108 -42 144 -56c34 -13 57 -33 69 -74c12 41 35 61 69 74c36 14 84 25 143 56c87 47 199 58 297 53h3l1 -3c19 -57 2 -120 -32 -168s-85 -82 -136 -109c-52 -27 -107 -32 -155 -60v0v0c-32 -17 -51 -38 -71 -69v0v0
+c-30 -46 -29 -104 -29 -104v-1l-5 -65v-1s-5 -17 -18 -34s-35 -34 -66 -34c-29 0 -50 17 -64 34s-19 34 -19 34l-1 1l-4 65v1s1 58 -29 104v0v0c-20 31 -39 50 -71 69c-48 28 -104 33 -156 60c-51 26 -102 61 -139 109v0v0c-34 49 -50 111 -31 168v3h3c24 1 50 1 76 0z
+M330 1327c76 -3 156 -19 219 -53v0v0c61 -32 109 -42 144 -56s57 -30 67 -77l1 -3h8l1 3c10 46 32 63 67 77s84 24 144 56v0c84 45 194 58 290 53c16 -53 1 -114 -32 -159c-33 -46 -82 -79 -133 -105c-50 -26 -105 -32 -155 -61v0c-34 -18 -54 -40 -74 -72
+c-32 -49 -31 -109 -31 -109l-4 -64c0 -1 -5 -16 -17 -31c-12 -16 -31 -31 -59 -31c-26 0 -44 15 -57 31c-12 15 -19 30 -19 31l-4 65v-1s2 61 -30 109c-20 32 -41 53 -74 72v0v0c-50 29 -106 35 -156 61v0v0c-51 25 -100 58 -136 105c-33 46 -48 106 -31 159c23 1 47 1 71 0
+zM424 1059c51 -26 107 -31 156 -60c32 -19 53 -40 73 -71c31 -47 29 -106 29 -106l4 -66s25 -65 80 -65c59 0 80 65 80 65l4 66s-1 58 30 106c20 31 40 54 73 71c49 29 104 34 155 60s101 60 135 107s49 110 31 165c-97 5 -209 -7 -295 -53c-119 -63 -192 -41 -213 -136h-2
+c-21 96 -94 73 -214 136c-86 46 -198 58 -295 53c-19 -55 -2 -117 32 -165c36 -48 86 -81 137 -107zM18 733h98c10 0 18 -9 18 -19c0 -350 284 -632 633 -632c348 0 633 283 633 632c0 10 8 19 18 19h100c10 0 18 -9 18 -19c0 -423 -345 -768 -768 -768s-768 345 -768 768
+c0 10 8 19 18 19zM18 724h98c5 0 10 -5 10 -10c0 -354 288 -641 641 -641c352 0 641 288 641 641c0 5 5 10 10 10h100c5 0 10 -5 10 -10c0 -419 -341 -759 -760 -759s-760 340 -760 759c0 5 5 10 10 10zM1518 728h-100c-7 0 -14 -7 -14 -14c0 -351 -287 -637 -637 -637
+c-351 0 -637 285 -637 637c0 7 -7 14 -14 14h-98c-7 0 -14 -7 -14 -14c0 -421 343 -763 764 -763s764 342 764 763c0 7 -7 14 -14 14v0zM269 733h98c10 0 18 -9 18 -19c0 -211 171 -382 382 -382s383 171 383 382c0 10 8 19 18 19h99c10 0 19 -9 19 -19
+c0 -285 -233 -517 -518 -517c-287 0 -520 232 -518 517c0 10 9 19 19 19zM269 724h98c5 0 10 -5 10 -10c0 -216 174 -390 390 -390s391 174 391 390c0 5 5 10 10 10h99c5 0 10 -5 10 -10c0 -280 -229 -509 -509 -509c-282 0 -511 229 -509 509v0c0 5 5 10 10 10zM768 201
+c283 0 513 230 513 513c0 7 -7 14 -14 14h-99c-7 0 -14 -7 -14 -14c0 -213 -174 -386 -387 -386s-386 173 -386 386c0 7 -7 14 -14 14h-98c-7 0 -14 -7 -14 -14c-2 -283 229 -513 513 -513zM517 733h100c10 0 18 -8 18 -18c0 -74 60 -132 133 -132c74 0 133 59 133 132
+c0 10 8 18 18 18h100c10 0 18 -8 18 -18c0 -148 -121 -268 -269 -268s-269 119 -269 268c0 10 8 18 18 18zM517 725h100c5 0 10 -5 10 -10c0 -78 64 -141 141 -141c78 0 141 64 141 141c0 5 5 10 10 10h100c5 0 9 -5 9 -10c0 -144 -116 -260 -260 -260s-260 116 -260 260
+c0 5 4 10 9 10v0zM768 451c146 0 265 118 265 264c0 7 -7 14 -14 14h-100c-7 0 -14 -7 -14 -14c0 -75 -61 -137 -137 -137c-75 0 -137 61 -137 137c0 7 -7 14 -14 14h-100c-7 0 -14 -7 -14 -14c0 -147 119 -264 265 -264z" />
     <glyph glyph-name="futbol-o" unicode="&#xf1e3;" horiz-adv-x="1792" 
 d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536c495 0 896 -401 896 -896s-401 -896 -896 -896s-896 401 -896 896s401 896 896 896zM1515 186c94 128 149 284 149 454v3l-102 -89l-240 224l63 323l134 -12c-95 131 -231 232 -389 282l53 -124l-287 -159l-287 159
 l53 124c-158 -50 -294 -151 -389 -282l135 12l62 -323l-240 -224l-102 89v-3c0 -170 55 -326 149 -454l30 132l326 -40l139 -298l-116 -69c75 -25 156 -39 240 -39s165 14 240 39l-116 69l139 298l326 40z" />
diff --git a/fonts/forkawesome-webfont.ttf b/fonts/forkawesome-webfont.ttf
index 740faf3d8a..42d2e35348 100644
Binary files a/fonts/forkawesome-webfont.ttf and b/fonts/forkawesome-webfont.ttf differ
diff --git a/fonts/forkawesome-webfont.woff b/fonts/forkawesome-webfont.woff
index ff9edb7a61..1555bbf76f 100644
Binary files a/fonts/forkawesome-webfont.woff and b/fonts/forkawesome-webfont.woff differ
diff --git a/fonts/forkawesome-webfont.woff2 b/fonts/forkawesome-webfont.woff2
index 64711e3ea1..bbc0e1a000 100644
Binary files a/fonts/forkawesome-webfont.woff2 and b/fonts/forkawesome-webfont.woff2 differ
diff --git a/src/icons/.fontcustom-manifest.json b/src/icons/.fontcustom-manifest.json
index 7f6ab81b68..1c4ed25f6b 100644
--- a/src/icons/.fontcustom-manifest.json
+++ b/src/icons/.fontcustom-manifest.json
@@ -1,7 +1,7 @@
 {
   "checksum": {
-    "previous": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d",
-    "current": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d"
+    "previous": "076bb7901adb5b0fab73c9bd90164e807cd8086b89b7a47c88fe440219cdc51b",
+    "current": "076bb7901adb5b0fab73c9bd90164e807cd8086b89b7a47c88fe440219cdc51b"
   },
   "fonts": [
     "forkawesome/forkawesome.ttf",
@@ -1179,6 +1179,10 @@
       "codepoint": 61721,
       "source": "svg/frown-o.svg"
     },
+    "funkwhale": {
+      "codepoint": 62265,
+      "source": "svg/funkwhale.svg"
+    },
     "futbol-o": {
       "codepoint": 61923,
       "source": "svg/futbol-o.svg"
diff --git a/src/icons/icons.yml b/src/icons/icons.yml
index c709826762..702ee5897b 100644
--- a/src/icons/icons.yml
+++ b/src/icons/icons.yml
@@ -7442,3 +7442,11 @@ icons:
       - science
     categories:
       - Brand Icons
+
+  - name:       Funkwhale
+    id:         funkwhale
+    unicode:    f339
+    created:    1.1
+    url:        funkwhale.audio
+    categories:
+      - Brand Icons
diff --git a/src/icons/svg/funkwhale.svg b/src/icons/svg/funkwhale.svg
new file mode 100644
index 0000000000..7de0bb4547
--- /dev/null
+++ b/src/icons/svg/funkwhale.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1536 1792" height="1792" width="1536">
+    <path d="M330.695 200.717c-25.662-1.107-51.021-.888-75.451.354l-2.785.145-.917 2.623c-19.498 56.798-2.537 119.88 31.85 168.526l.05.065.032.048c36.788 48.495 87.602 82.592 139.008 108.3 51.975 26.826 107.075 31.784 155.538 60.05 31.676 18.68 51.615 38.6 71.138 69.512l.016.048.033.032c30.389 45.583 28.97 103.907 28.97 103.907v.193l4.17 65.907.224.58s6.368 16.843 19.893 33.67c13.525 16.825 34.67 34.087 63.895 34.087 30.782 0 52.01-17.255 65.151-34.136 13.142-16.881 18.686-33.799 18.686-33.799l.16-.5 4.17-65.81v-.193s-1.447-57.472 28.985-103.922l.033-.032.017-.032c19.585-31.01 38.67-52.472 70.945-69.416l.082-.049.082-.048c48.467-28.273 103.575-33.221 155.554-60.05 51.403-26.53 101.423-60.623 135.774-108.38 34.447-47.89 50.52-111.738 31.883-168.494l-.885-2.688-2.816-.145c-97.715-4.968-210.389 6.496-297.154 53.21-59.262 31.47-106.796 41.626-143.08 56.056-33.595 13.36-57.13 32.338-69.207 73.36-12.04-41.393-35.437-60.39-68.965-73.665-36.185-14.328-83.697-24.278-143.355-55.736l-.033-.016c-65.07-35.03-144.714-50.243-221.686-53.563zm-.37 8.256c76.132 3.324 154.703 18.403 218.177 52.581h.017l.016.017c60.636 31.98 109.104 42.228 144.191 56.122 35.088 13.893 56.648 30.324 67.13 77.092l.725 3.22h8.24l.725-3.203c10.477-46.34 32.251-62.804 67.452-76.804C872.2 304 920.66 293.536 980.884 261.555h.033c83.725-45.083 193.615-56.79 289.637-52.275 16.225 53.003 1.305 113.04-31.255 158.306-33.22 46.183-82.082 79.661-132.861 105.87-50.15 25.883-105.387 30.849-155.763 60.177-.008.006-.025.01-.033.017-33.628 17.663-54.09 40.69-74.051 72.296-32.153 49.127-30.307 108.606-30.307 108.606l-4.056 64.056c-.184.55-5.244 15.564-17.221 30.95-12.198 15.668-30.923 30.966-58.649 30.966-25.986 0-44.819-15.291-57.457-31.014-12.349-15.363-18.144-30.286-18.412-30.982l-4.072-64.346v.37s1.867-60.264-30.306-108.607c-20.032-31.715-41.307-52.99-73.907-72.216v-.016h-.016c-50.419-29.411-105.722-34.348-155.924-60.258l-.017-.017h-.032C375.478 448.07 325.8 414.603 290.088 367.553c-32.601-46.15-48.222-105.347-31.255-158.274 23.234-1.093 47.192-1.366 71.492-.306zm94.05 268.145c51.09 26.37 106.301 31.314 155.744 60.155 32.137 18.953 52.738 39.554 72.515 70.868 31.314 46.97 29.666 106.301 29.666 106.301l4.12 65.1s24.721 65.099 79.932 65.099c58.507 0 79.932-65.1 79.932-65.1l4.12-65.099s-1.648-58.507 29.666-106.301c19.777-31.314 39.554-53.563 72.515-70.868 49.443-28.841 104.653-33.785 155.744-60.155 51.09-26.369 100.533-60.155 134.319-107.125 33.785-46.97 49.442-109.597 31.313-164.808-97.237-4.944-209.306 6.592-295.006 52.738-119.486 63.452-192.002 41.202-213.427 135.967h-1.648c-21.425-95.589-93.117-72.515-213.427-135.967-85.7-46.146-197.77-57.682-295.007-52.738-18.953 55.21-2.472 117.014 31.314 164.808 36.258 47.794 86.524 81.58 137.615 107.125zM18.122 803.442C8.264 803.442 0 811.706 0 821.564c0 423.322 344.679 768.016 768 768.016s768-344.694 768-768.016c0-9.858-8.264-18.122-18.122-18.122h-99.706c-9.858 0-18.139 8.264-18.139 18.122 0 348.798-284.879 632.87-632.854 632.87-348.81 0-632.87-283.236-632.87-632.87 0-9.858-8.264-18.122-18.122-18.122zm0 8.24h98.065c4.974 0 9.882 4.908 9.882 9.882 0 354.098 287.838 641.11 641.11 641.11 352.46 0 641.095-287.824 641.095-641.11 0-4.974 4.923-9.882 9.898-9.882h99.706c4.974 0 9.882 4.908 9.882 9.882 0 418.85-340.911 759.776-759.76 759.776S8.24 1240.413 8.24 821.564c0-4.974 4.908-9.882 9.882-9.882zm1499.756-4.123h-99.71c-7.416 0-14.008 6.592-14.008 14.009 0 351.041-286.767 636.983-636.984 636.983-351.042 0-636.984-285.118-636.984-636.983 0-7.417-6.592-14.01-14.009-14.01h-98.06c-7.417 0-14.01 6.593-14.01 14.01 0 421.085 342.802 763.886 763.887 763.886 421.085 0 763.886-342.801 763.886-763.886 0-7.417-6.592-14.01-14.008-14.01zm-1249.244-4.117c-9.852 0-18.13 8.255-18.138 18.106-1.662 284.902 230.98 517.52 517.504 517.52 284.888 0 517.504-232.615 517.504-517.504 0-9.858-8.28-18.122-18.138-18.122h-99.706c-9.858 0-18.122 8.264-18.122 18.122 0 211.2-171.16 382.359-382.359 382.359-211.2 0-382.358-171.16-382.358-382.359 0-9.858-8.265-18.122-18.123-18.122zm0 8.24h98.064c4.975 0 9.882 4.908 9.882 9.882 0 215.654 174.945 390.6 390.6 390.6 215.653 0 390.598-174.946 390.598-390.6 0-4.974 4.907-9.882 9.882-9.882h99.706c4.975 0 9.898 4.908 9.898 9.882 0 280.404-228.86 509.264-509.264 509.264-282.065 0-510.899-228.84-509.264-509.231v-.033c0-4.975 4.923-9.882 9.898-9.882zM768 1334.945c282.646 0 513.378-230.731 513.378-513.377 0-7.417-6.593-14.01-14.009-14.01h-99.709c-7.416 0-14.009 6.593-14.009 14.01 0 213.426-173.048 386.475-386.475 386.475-213.427 0-386.475-173.049-386.475-386.475 0-7.417-6.593-14.01-14.01-14.01h-98.06c-7.416 0-14.009 6.593-14.009 14.01-1.648 282.646 229.084 513.377 513.378 513.377zM517.488 802.621c-9.858 0-18.122 8.265-18.122 18.123 0 148.901 120.56 268.634 268.634 268.634 148.09 0 268.634-120.544 268.634-268.634 0-9.858-8.264-18.123-18.122-18.123h-99.706c-9.858 0-18.139 8.265-18.139 18.123 0 72.754-59.094 132.667-132.667 132.667-72.754 0-132.667-59.095-132.667-132.667 0-9.858-8.281-18.123-18.139-18.123zm0 8.24h99.706c4.975 0 9.898 4.908 9.898 9.883 0 78.05 63.687 140.907 140.908 140.907 78.051 0 140.908-63.686 140.908-140.907 0-4.975 4.923-9.882 9.898-9.882h99.706c4.974 0 9.882 4.907 9.882 9.882 0 143.62-116.773 260.393-260.394 260.393-143.636 0-260.394-115.936-260.394-260.393 0-4.975 4.907-9.882 9.882-9.882zM768 1085.262c145.855 0 264.517-118.662 264.517-264.517 0-7.417-6.592-14.01-14.008-14.01h-99.71c-7.416 0-14.008 6.593-14.008 14.01 0 74.987-60.98 136.79-136.791 136.79-74.988 0-136.79-60.979-136.79-136.79 0-7.417-6.593-14.01-14.01-14.01h-99.709c-7.416 0-14.008 6.593-14.008 14.01 0 146.679 118.662 264.517 264.517 264.517z" color="#000" font-weight="400" font-family="sans-serif" overflow="visible"/>
+</svg>