diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.eot b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.eot
index 46f0ff86e..36249dc45 100644
Binary files a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.eot and b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.eot differ
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg
index 53e0d0b39..01a5fe314 100644
--- a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg
+++ b/src/doc/assets/fork-awesome/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" >
 <!--
-2018-2-17: Created with FontForge (http://fontforge.org)
+2018-2-18: 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 20170925 at Sat Feb 17 20:43:44 2018
+Created by FontForge 20170925 at Sun Feb 18 11:44:38 2018
  By Julien Deswaef
 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.470077 -256.313 2304.01 1536.25"
     underline-thickness="89.6"
     underline-position="-179.2"
-    unicode-range="U+0020-F2E4"
+    unicode-range="U+0020-F2E5"
   />
     <missing-glyph />
     <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
@@ -932,6 +932,10 @@ d="M1188 214c0 -25 -10 -50 -28 -68l-136 -136c-18 -18 -43 -28 -68 -28s-50 10 -68
 c18 18 43 28 68 28s50 -10 68 -28l294 -294l294 294c18 18 43 28 68 28s50 -10 68 -28l136 -136c18 -18 28 -43 28 -68s-10 -50 -28 -68l-294 -294l294 -294c18 -18 28 -43 28 -68z" />
     <glyph glyph-name="buysellads" unicode="&#xf20d;" 
 d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311v0l383 314zM1536 1120v-960c0 -158 -130 -288 -288 -288h-960c-158 0 -288 130 -288 288v960c0 158 130 288 288 288h960c158 0 288 -130 288 -288z" />
+    <glyph glyph-name="diaspora" unicode="&#xf2e5;" 
+d="M976 133c-43 60 -110 153 -149 208c-40 56 -72 99 -74 99s-64 -84 -148 -199c-80 -110 -146 -200 -147 -200c-2 0 -287 202 -288 204c0 1 64 95 143 210s144 211 144 213c0 4 -25 13 -227 80c-125 42 -229 76 -230 77c-2 1 10 40 51 169c29 93 54 169 55 170
+s109 -34 241 -77s241 -79 242 -79s3 3 4 5s1 114 2 249s3 247 4 248c1 2 38 3 174 3c95 0 174 -1 175 -2c2 -1 5 -75 9 -242c7 -273 7 -277 11 -277c2 0 107 35 233 78s229 77 230 76c3 -3 106 -340 105 -341s-106 -37 -234 -80c-176 -60 -233 -79 -233 -82
+c0 -2 60 -92 137 -205c76 -111 137 -202 137 -203c-1 -2 -285 -212 -287 -212c-1 0 -37 50 -80 110z" />
     <glyph glyph-name="fonticons" unicode="&#xf280;" 
 d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925c41 0 57 -15 56 -79l174 21c0 153 -105 181 -222 181c-174 0 -265 -70 -265 -240v-72h-96v-128h76
 c10 0 20 0 20 -8v-382c0 -19 -5 -25 -23 -27l-73 -7v-88h448v86l-149 14c-18 2 -11 5 -11 25v387h191l38 128h-231c-10 0 2 7 2 15v80c0 60 2 94 65 94zM1248 96v86l-54 9c-19 3 -10 5 -10 25v520h-275l-23 -101l83 -22c13 -4 23 -13 23 -27v-370c0 -19 -8 -23 -26 -25
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.ttf b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.ttf
index a3cbec420..021f3c0aa 100644
Binary files a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.ttf and b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.ttf differ
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff
index 4fd5f8614..96a85574b 100644
Binary files a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff and b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff differ
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff2 b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff2
index 2535bb798..869198046 100644
Binary files a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff2 and b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff2 differ
diff --git a/src/icons/.fontcustom-manifest.json b/src/icons/.fontcustom-manifest.json
index 7aa7f705d..78fd6bd00 100644
--- a/src/icons/.fontcustom-manifest.json
+++ b/src/icons/.fontcustom-manifest.json
@@ -1,7 +1,7 @@
 {
   "checksum": {
-    "previous": "7f768daad1434b41cb0d2162d5103da9cf90110104789554504c282f52a2d9c1",
-    "current": "7f768daad1434b41cb0d2162d5103da9cf90110104789554504c282f52a2d9c1"
+    "previous": "10d82f545d5379c7cd3493b8e2e5824c8263660534a9ee810ce33c2f4136ac9b",
+    "current": "10d82f545d5379c7cd3493b8e2e5824c8263660534a9ee810ce33c2f4136ac9b"
   },
   "fonts": [
     "forkawesome/forkawesome.ttf",
@@ -751,6 +751,10 @@
       "codepoint": 61977,
       "source": "svg/diamond.svg"
     },
+    "diaspora": {
+      "codepoint": 62181,
+      "source": "svg/diaspora.svg"
+    },
     "digg": {
       "codepoint": 61862,
       "source": "svg/digg.svg"
diff --git a/src/icons/icons.yml b/src/icons/icons.yml
index d6bd78dea..14db287b4 100644
--- a/src/icons/icons.yml
+++ b/src/icons/icons.yml
@@ -6606,3 +6606,13 @@ icons:
       - video
     categories:
       - Brand Icons
+
+  - name:       Diaspora*
+    id:         diaspora
+    unicode:    f2e5
+    created:    1.0
+    url:        diasporafoundation.org
+    filter:
+      - social-network
+    categories:
+      - Brand Icons
diff --git a/src/icons/svg/diaspora.svg b/src/icons/svg/diaspora.svg
new file mode 100644
index 000000000..3f254a2ad
--- /dev/null
+++ b/src/icons/svg/diaspora.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg4004"
+   height="1536px"
+   width="1536px">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <path
+     id="path4093"
+     d="m 976.4712,1403.3688 c -43.00676,-60.025 -110.10822,-153.7452 -149.11435,-208.2669 -39.83928,-55.6864 -72.25076,-99.1478 -73.95618,-99.1698 -1.75244,-0.022 -64.43213,84.2337 -148.2603,199.2969 -79.87342,109.6348 -145.88891,199.3361 -146.70108,199.3361 -2.27163,0 -287.96223,-201.2295 -288.69756,-203.3475 -0.35577,-1.0246 64.22911,-95.833 143.52196,-210.685 79.29284,-114.85207 144.16881,-210.63199 144.16881,-212.84411 0,-3.56726 -25.69485,-12.58823 -227.2431,-79.78068 C 105.20568,746.24057 1.7223614,711.67136 0.22645575,711.08739 -1.8542458,710.27509 10.044871,670.46244 50.863738,541.66265 80.210149,449.06305 104.88453,372.54369 105.69569,371.61962 c 0.81117,-0.92406 109.43669,33.83614 241.39005,77.24487 131.95335,43.40873 241.01939,78.92402 242.36893,78.92282 1.34955,-0.001 2.8761,-2.02042 3.39232,-4.48719 0.51625,-2.46679 1.65462,-114.81758 2.5297,-249.66842 0.87509,-134.85085 2.31676,-246.304619 3.20373,-247.675059 1.26995,-1.96218 38.33587,-2.48522 174.41906,-2.46119 95.04351,0.016 173.79664,0.68957 175.00696,1.49503 1.52548,1.01524 4.13272,75.152029 8.49882,241.664459 7.16912,273.4131 7.32363,277.07712 11.68355,277.07712 1.69069,0 106.26719,-35.00452 232.39239,-77.78784 126.1251,-42.78332 229.9333,-77.09404 230.6848,-76.24605 2.5481,2.87481 105.9961,339.65611 104.7223,340.92979 -0.6956,0.6957 -105.9575,36.74455 -233.9152,80.10856 -176.0209,59.65227 -232.8035,79.65605 -233.2802,82.18135 -0.3517,1.86464 60.1797,92.32386 137.1488,204.95753 75.7783,110.8908 137.5007,202.4468 137.1607,203.4575 -0.7805,2.3215 -284.3155,211.1724 -286.6866,211.1724 -0.9628,0 -36.9379,-49.1115 -79.9446,-109.1365 z"
+     style="fill:#000000" />
+</svg>