diff --git a/LICENSES b/LICENSES
index 5decf87a5..5398feed5 100644
--- a/LICENSES
+++ b/LICENSES
@@ -12,8 +12,3 @@ listed here.
 - static/themes/default/icons/sharing.png :: [[https://www.shareicon.net/social-share-this-107338][CC 2.5]]
 - static/themes/default/icons/tor.png :: [[https://commons.wikimedia.org/wiki/File:Tor_logo1.png][CC BY 3.0 US]]
 - static/themes/default/icons/transmission.png :: [[https://transmissionbt.com/][GPL]]
-- static/themes/default/icons/f-droid.png :: [[https://gitlab.com/fdroid/artwork/blob/master/fdroid-logo-2015/fdroid-logo.svg][CC-BY-SA 3.0 or GPLv3+]]
-- static/themes/default/icons/google-play.png :: [[https://thenounproject.com/icon/887917/download/color/000000/png/][CC BY 3.0 US]]
-- static/themes/default/icons/app-store.png :: [[https://thenounproject.com/icon/162372/download/color/000000/png/][CC BY 3.0 US]]
-- static/themes/default/icons/apple.png :: [[https://thenounproject.com/icon/1203053/download/color/000000/png][CC BY 3.0 US]]
-- static/themes/default/icons/windows.png :: [[https://thenounproject.com/icon/1206946/download/color/000000/png][CC BY 3.0 US]]
diff --git a/debian/copyright b/debian/copyright
index 631afc5cd..94ca41b97 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,6 +18,12 @@ Copyright: 2012 FreedomBox Foundation
 Comment: Original Author: Robert Martinez
 License: GPL-3+
 
+Files: static/themes/default/icons/app-store.png
+       static/themes/default/icons/app-store.svg
+Copyright: Marie Van den Broeck (https://thenounproject.com/marie49/)
+Comment: https://thenounproject.com/icon/162372/
+License: CC-BY-SA-3.0
+
 Files: static/themes/default/icons/cockpit.svg
 Copyright: Cockpit Authors (https://github.com/cockpit-project/cockpit/blob/master/AUTHORS)
 Comment: https://github.com/cockpit-project/cockpit/blob/master/src/branding/default/logo.svg
@@ -51,6 +57,19 @@ Comment: Placed into public domain by authors (or)
          https://github.com/resiprocate/resiprocate/blob/master/resip/stack/doc/reSIProcate-logo.svg
 License: public-domain
 
+Files: static/themes/default/icons/f-droid.png
+       static/themes/default/icons/f-droid.svg
+Copyright: 2012 William Theaker
+           2013 Robert Martinez
+           2015 Andrew Nayenko
+Comment: https://gitlab.com/fdroid/artwork/blob/master/fdroid-logo-2015/fdroid-logo.svg
+License: CC-BY-SA-3.0 or GPL-3+
+
+Files: static/themes/default/icons/google-play.png
+Copyright: Chameleon Design (https://thenounproject.com/Chamedesign/)
+Comment: https://thenounproject.com/icon/887917/
+License: CC-BY-3.0-US
+
 Files: static/themes/default/icons/gnu-linux.png
 Copyright: 2017 Cowemoji
 License: CC0-1.0
@@ -66,6 +85,12 @@ Files: static/themes/default/icons/infinoted.png
 Copyright: 2008-2014 Armin Burgmeier <armin@arbur.net>
 License: ISC
 
+Files: static/themes/default/icons/macos.png
+       static/themes/default/icons/macos.svg
+Copyright: Vectors Market (https://thenounproject.com/vectorsmarket/)
+Comment: https://thenounproject.com/icon/1203053/
+License: CC-BY-SA-3.0
+
 Files: static/themes/default/icons/matrixsynapse.png
 Copyright: 2017 Kishan Raval
 Comment: https://github.com/thekishanraval/Logos
@@ -201,6 +226,13 @@ Copyright: 2005 Andrew Dolgov
 Comment: https://git.tt-rss.org/fox/tt-rss/src/master/images/favicon-72px.png
 License: GPL-3+
 
+Files: static/themes/default/icons/windows.png
+       static/themes/default/icons/windows.svg
+Copyright: 2007 ruli (https://thenounproject.com/2007ruli/)
+Comment: https://thenounproject.com/icon/1206946/
+License: CC-BY-SA-3.0
+
+
 Files: static/themes/default/img/network-computer.svg
 Copyright: 2008 GNOME icon artists
 Comment: https://commons.wikimedia.org/wiki/File:Gnome-computer.svg
diff --git a/static/themes/default/icons/macos.svg b/static/themes/default/icons/macos.svg
new file mode 100644
index 000000000..0657a9a6a
--- /dev/null
+++ b/static/themes/default/icons/macos.svg
@@ -0,0 +1,57 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 43.570316 52.061451"
+   xml:space="preserve"
+   id="svg14"
+   sodipodi:docname="macos.svg"
+   width="43.570316"
+   height="52.061451"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
+     id="metadata20"><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="defs18" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1040"
+     inkscape:window-height="480"
+     id="namedview16"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="3.6307692"
+     inkscape:cx="21.870317"
+     inkscape:cy="19.515727"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg14" /><g
+     id="g8"
+     transform="translate(-4.1296828,0.04572518)"><path
+       d="m 37.2,29.6 c 0,-6 4.6,-11 10.5,-11.5 C 45.6,14.8 42,12.6 36.8,12.5 32.5,12.4 28.9,15 27.2,18.7 25.6,15 21.9,12.4 17.6,12.5 -3.7,13.1 3.1,47.7 18.4,51.8 c 2.1,0.6 4.1,-0.1 5.7,-1.5 1.7,-1.5 4.3,-1.5 6.1,0 1.6,1.4 3.6,2 5.7,1.5 4.8,-1.3 8.7,-5.5 11.2,-10.7 -5.5,-0.8 -9.9,-5.6 -9.9,-11.5 z"
+       id="path2"
+       inkscape:connector-curvature="0" /><path
+       d="m 27.3,15.1 c 0.5,-0.7 1.1,-1.2 1.8,-1.8 0.8,-3.1 2.4,-7 5.6,-9.9 C 35,3.1 35,2.5 34.7,2.1 34.4,1.7 33.8,1.7 33.4,2 c -4.2,3.8 -5.8,9 -6.5,12.5 0.1,0.3 0.2,0.4 0.4,0.6 z"
+       id="path4"
+       inkscape:connector-curvature="0" /><path
+       d="m 26.3,9.5 c 0.5,-1.4 1.2,-2.8 2,-4.3 -2.4,-4.3 -7.4,-6.4 -12.6,-4.6 1,5.6 5.4,9.1 10.6,8.9 z"
+       id="path6"
+       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/static/themes/default/icons/windows.svg b/static/themes/default/icons/windows.svg
new file mode 100644
index 000000000..baeb4a0fa
--- /dev/null
+++ b/static/themes/default/icons/windows.svg
@@ -0,0 +1,70 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xml:space="preserve"
+   version="1.1"
+   style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
+   viewBox="0 0 180 180"
+   x="0px"
+   y="0px"
+   id="svg20"
+   sodipodi:docname="windows.svg"
+   width="180"
+   height="180"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
+     id="metadata24"><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><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2086"
+     inkscape:window-height="1231"
+     id="namedview22"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="4.1955556"
+     inkscape:cx="81.603445"
+     inkscape:cy="70.526652"
+     inkscape:window-x="990"
+     inkscape:window-y="336"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg20" /><defs
+     id="defs4"><style
+       type="text/css"
+       id="style2">
+   
+    .fil0 {fill:black}
+   
+  </style></defs><g
+     id="g14"><polygon
+       class="fil0"
+       points="0,94 87,94 87,180 0,180 "
+       id="polygon6"
+       style="fill:#000000" /><polygon
+       class="fil0"
+       points="94,180 94,94 180,94 180,180 "
+       id="polygon8"
+       style="fill:#000000" /><polygon
+       class="fil0"
+       points="180,87 94,87 94,0 180,0 "
+       id="polygon10"
+       style="fill:#000000" /><polygon
+       class="fil0"
+       points="87,87 0,87 0,0 87,0 "
+       id="polygon12"
+       style="fill:#000000" /></g></svg>
\ No newline at end of file