diff --git a/nymea-app/images.qrc b/nymea-app/images.qrc
index 4a886372..0d413d49 100644
--- a/nymea-app/images.qrc
+++ b/nymea-app/images.qrc
@@ -209,5 +209,8 @@
         <file>ui/images/browser/BrowserIconDocument.svg</file>
         <file>ui/images/browser/BrowserIconPackage.svg</file>
         <file>ui/images/home.svg</file>
+        <file>ui/images/browser/MediaBrowserIconNapster.svg</file>
+        <file>ui/images/browser/MediaBrowserIconSoundCloud.svg</file>
+        <file>ui/images/browser/MediaBrowserIconDeezer.svg</file>
     </qresource>
 </RCC>
diff --git a/nymea-app/ui/delegates/BrowserItemDelegate.qml b/nymea-app/ui/delegates/BrowserItemDelegate.qml
index 58b22ca3..1df27724 100644
--- a/nymea-app/ui/delegates/BrowserItemDelegate.qml
+++ b/nymea-app/ui/delegates/BrowserItemDelegate.qml
@@ -12,9 +12,9 @@ NymeaListItemDelegate {
     progressive: model.browsable
     subText: model.description
     prominentSubText: false
-    iconName: "../images/browser/" + model.icon + ".svg"
+    iconName: "../images/browser/" + (model.mediaIcon && model.mediaIcon !== "MediaBrowserIconNone" ? model.mediaIcon : model.icon) + ".svg"
     thumbnail: model.thumbnail
-    enabled: model.browsable || model.executable
+    enabled: !model.disabled
     secondaryIconName: model.actionTypeIds.length > 0 ? "../images/navigation-menu.svg" : ""
     secondaryIconClickable: true
 
diff --git a/nymea-app/ui/images/browser/MediaBrowserIconDeezer.svg b/nymea-app/ui/images/browser/MediaBrowserIconDeezer.svg
new file mode 100644
index 00000000..ee0902f8
--- /dev/null
+++ b/nymea-app/ui/images/browser/MediaBrowserIconDeezer.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="90"
+   height="90"
+   viewBox="0 0 23.812499 23.812501"
+   version="1.1"
+   id="svg2587"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="MediaBrowserIconDeezer.svg">
+  <defs
+     id="defs2581" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="26.948469"
+     inkscape:cy="46.475465"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="2792"
+     inkscape:window-height="1698"
+     inkscape:window-x="88"
+     inkscape:window-y="44"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3148" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2584">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-273.18748)">
+    <path
+       style="fill:#808080;stroke-width:1;fill-opacity:1"
+       d="m 1.3229129,290.76468 v -1.34392 h 2.3098547 2.3098549 v 1.34392 1.34391 H 3.6327676 1.3229129 Z m 5.5436527,0 v -1.34392 h 2.3098554 2.309855 v 1.34392 1.34391 H 9.176421 6.8665656 Z m 5.5436524,-0.002 v -1.34527 l 2.288857,0.0224 2.288857,0.0223 0.02312,1.32292 0.02313,1.32292 h -2.31199 -2.311988 v -1.34526 z m 5.478524,0.0223 0.02312,-1.32291 2.288857,-0.0223 2.288857,-0.0224 v 1.34527 1.34526 H 20.177594 17.865605 Z M 6.8665656,287.02826 V 285.641 h 2.3119357 2.3119357 l -0.02307,1.36492 -0.02307,1.36491 -2.2888574,0.0224 -2.2888566,0.0224 z m 5.5436524,-0.002 v -1.38862 l 2.288857,0.0224 2.288857,0.0224 v 1.34391 1.34391 l -2.288857,0.0224 -2.288857,0.0224 v -1.38861 z m 5.499743,1.28092 c -0.02125,-0.0578 -0.02952,-0.67196 -0.01837,-1.36492 l 0.02027,-1.25993 2.288856,-0.0223 2.288858,-0.0224 v 1.38726 1.38728 H 20.21908 c -1.739791,0 -2.279525,-0.0245 -2.309132,-0.105 z M 6.8665656,283.24715 v -1.38861 l 2.2888566,0.0224 2.2888568,0.0224 v 1.34391 1.34391 l -2.2888568,0.0224 -2.2888566,0.0223 z m 11.0403264,1.27722 c -0.02294,-0.0597 -0.0312,-0.67398 -0.01837,-1.36491 l 0.02335,-1.25622 2.288855,-0.0224 2.288857,-0.0224 v 1.38726 1.38727 h -2.270497 c -1.780025,0 -2.279503,-0.0235 -2.3122,-0.1087 z m 0,-3.77976 c -0.02294,-0.0597 -0.0312,-0.67398 -0.01837,-1.36491 l 0.02335,-1.25622 2.288855,-0.0224 2.288857,-0.0223 v 1.38725 1.38727 h -2.270497 c -1.780025,0 -2.279503,-0.0235 -2.3122,-0.10869 z"
+       id="path3146"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccccccccccccccccscccccccccscc" />
+  </g>
+</svg>
diff --git a/nymea-app/ui/images/browser/MediaBrowserIconNapster.svg b/nymea-app/ui/images/browser/MediaBrowserIconNapster.svg
new file mode 100644
index 00000000..39c2eb6a
--- /dev/null
+++ b/nymea-app/ui/images/browser/MediaBrowserIconNapster.svg
@@ -0,0 +1,56 @@
+<?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"
+   viewBox="0 0 50 50"
+   width="90"
+   height="90"
+   fill="#000000"
+   version="1.1"
+   id="svg840"
+   sodipodi:docname="MediaBrowserIconNapster.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata846">
+    <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="defs844" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2792"
+     inkscape:window-height="1698"
+     id="namedview842"
+     showgrid="false"
+     inkscape:zoom="5.2444444"
+     inkscape:cx="45.633179"
+     inkscape:cy="18.895952"
+     inkscape:window-x="88"
+     inkscape:window-y="44"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg840" />
+  <path
+     d="M 25 1 C 18.302 1 12.324313 3.7769688 9.1953125 8.2929688 C 7.9103125 8.0089688 7.102 8 7 8 L 5 8 C 4.447 8 4 8.448 4 9 L 4 16.027344 C 2.087 17.645344 1 19.977 1 22.5 C 1 25.042 2.1029687 27.387859 4.0429688 29.005859 C 4.5749688 40.073859 13.878 49 25 49 C 36.122 49 45.425031 40.073859 45.957031 29.005859 C 47.897031 27.387859 49 25.042 49 22.5 C 49 19.978 47.913 17.645344 46 16.027344 L 46 9 C 46 8.448 45.553 8 45 8 L 43 8 C 42.898 8 42.089687 8.0089688 40.804688 8.2929688 C 37.675688 3.7769688 31.698 1 25 1 z M 25 6 C 29.773 6 34.038938 7.7961719 36.335938 10.701172 C 35.619937 11.098172 34.846625 11.57225 34.015625 12.15625 L 33.988281 12.175781 C 31.975281 11.113781 28.929 10 25 10 C 21.071 10 18.023719 11.112828 16.011719 12.173828 L 15.984375 12.154297 C 15.153375 11.571297 14.382016 11.098172 13.666016 10.701172 C 15.963016 7.7971719 20.227 6 25 6 z M 41 14.050781 L 41 26.572266 L 40.962891 28.765625 C 40.558891 37.166625 33.398 44 25 44 C 16.602 44 9.4411094 37.166625 9.0371094 28.765625 L 9 26.572266 L 9 14.052734 C 9.829 14.336734 11.269375 14.953094 13.109375 16.246094 L 15.345703 17.818359 C 15.728703 18.086359 16.243797 18.055187 16.591797 17.742188 C 16.622797 17.714188 19.695 15 25 15 C 30.261 15 33.380203 17.717187 33.408203 17.742188 C 33.597203 17.912188 33.838125 18 34.078125 18 C 34.278125 18 34.478344 17.940359 34.652344 17.818359 L 36.888672 16.246094 C 38.728672 14.953094 40.172 14.334781 41 14.050781 z M 13.5 27 C 13.224 27 13 27.224 13 27.5 C 13 29.985 15.015 32 17.5 32 L 23.5 32 C 23.776 32 24 31.776 24 31.5 C 24 29.014 21.985 27 19.5 27 L 13.5 27 z M 30.5 27 C 28.015 27 26 29.015 26 31.5 C 26 31.776 26.224 32 26.5 32 L 32.5 32 C 34.985 32 37 29.985 37 27.5 C 37 27.224 36.776 27 36.5 27 L 30.5 27 z M 20.470703 34 C 20.039703 34 19.832109 34.587625 20.162109 34.890625 C 20.857109 35.528625 24.375 37 25 37 C 25.625 37 29.141891 35.528625 29.837891 34.890625 C 30.166891 34.587625 29.96225 34 29.53125 34 L 20.470703 34 z M 20.964844 37.994141 A 1.0001 1.0001 0 0 0 20.552734 39.894531 C 20.552734 39.894531 22.666667 41 25 41 C 27.333333 41 29.447266 39.894531 29.447266 39.894531 A 1.0001163 1.0001163 0 1 0 28.552734 38.105469 C 28.552734 38.105469 26.666667 39 25 39 C 23.333333 39 21.447266 38.105469 21.447266 38.105469 A 1.0001 1.0001 0 0 0 20.964844 37.994141 z"
+     id="path838"
+     style="fill:#808080;fill-opacity:1" />
+</svg>
diff --git a/nymea-app/ui/images/browser/MediaBrowserIconSoundCloud.svg b/nymea-app/ui/images/browser/MediaBrowserIconSoundCloud.svg
new file mode 100644
index 00000000..b2c50c51
--- /dev/null
+++ b/nymea-app/ui/images/browser/MediaBrowserIconSoundCloud.svg
@@ -0,0 +1,86 @@
+<?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"
+   viewBox="0 0 90 90"
+   version="1.1"
+   id="svg1446"
+   sodipodi:docname="MediaBrowserIconSoundCloud.svg"
+   width="90"
+   height="90"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata1452">
+    <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="defs1450" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2792"
+     inkscape:window-height="1698"
+     id="namedview1448"
+     showgrid="false"
+     inkscape:zoom="4.72"
+     inkscape:cx="-32.733051"
+     inkscape:cy="25"
+     inkscape:window-x="88"
+     inkscape:window-y="44"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1446" />
+  <g
+     id="g2006"
+     transform="translate(20.9875,-20.999999)"
+     style="fill:#808080;fill-opacity:1">
+    <path
+       style="stroke-width:1;fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path1434"
+       d="M 54.788834,62.149949 H 54.403829 C 52.671307,53.294835 44.778705,46.749751 35.538586,46.749751 c -5.967577,0 -11.357646,2.695035 -14.822691,7.122592 -0.385005,0.577507 -0.577507,1.155014 -0.577507,2.310029 l -0.77001,17.517726 0.77001,10.587636 c 0,0.577508 0.577507,0.962513 0.962512,0.962513 h 33.687934 c 6.352582,0 11.550149,-5.197567 11.550149,-11.550149 0,-6.352582 -5.197567,-11.550149 -11.550149,-11.550149 z" />
+    <path
+       style="stroke-width:1;fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path1436"
+       d="m 14.170811,54.44985 c -0.577508,0 -0.962513,0.385005 -0.962513,0.962512 l -1.54002,17.325224 v 1.925024 l 1.54002,9.625124 c 0,0.577508 0.577508,0.962513 1.155015,0.962513 h 0.385005 c 0.577508,0 0.962513,-0.385005 1.155015,-0.962513 l 1.54002,-9.625124 c 0,-0.577507 0.192502,-1.347517 0,-1.925024 l -1.54002,-17.325224 c 0,-0.577507 -0.577507,-0.962512 -0.962512,-0.962512 z" />
+    <path
+       style="stroke-width:1;fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path1438"
+       d="m 6.4707115,56.374875 c -0.5775074,0 -0.9625124,0.385005 -0.9625124,0.962512 L 3.9681793,72.737586 v 1.925024 l 1.5400198,9.625124 c 0,0.577508 0.5775075,0.962513 1.1550149,0.962513 h 0.385005 c 0.5775074,0 0.9625124,-0.385005 1.1550148,-0.962513 L 9.7432537,74.66261 c 0,-0.577507 0.1925025,-1.347517 0,-1.925024 L 8.2032338,57.337387 c 0,-0.577507 -0.5775074,-0.962512 -0.9625124,-0.962512 z" />
+    <path
+       style="stroke-width:1;fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path1440"
+       d="m -1.0368852,62.149949 c -0.5775074,0 -0.9625124,0.385005 -1.1550149,0.962513 l -1.5400198,9.625124 v 1.925024 l 1.5400198,9.625124 c 0,0.577508 0.5775075,0.962513 1.1550149,0.962513 0.57750744,0 0.9625124,-0.385005 1.15501488,-0.962513 L 1.6581495,74.66261 V 72.737586 L 0.11812968,63.112462 C -0.0743728,62.534954 -0.45937776,62.149949 -1.0368852,62.149949 Z" />
+    <path
+       style="stroke-width:1;fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path1442"
+       d="m -8.7369844,60.224924 c -0.5775074,0 -0.9625124,0.385005 -1.1550149,0.962513 l -1.7325227,11.550149 v 1.925024 l 1.54002,9.625124 c 0.3850052,0.577508 0.7700102,0.962513 1.3475176,0.962513 0.5775074,0 0.9625124,-0.385005 1.1550149,-0.962513 l 1.5400198,-9.625124 c 0,-0.577507 0.1925025,-1.347517 0,-1.925024 L -7.774472,61.187437 c 0,-0.577508 -0.385005,-0.962513 -0.9625124,-0.962513 z" />
+    <path
+       style="stroke-width:1;fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path1444"
+       d="m -15.859576,65.999999 c -0.577508,0 -0.962513,0.385005 -1.155015,0.962512 l -1.155015,5.775075 c -0.192502,0.577507 -0.192502,1.347517 0,1.925024 l 1.155015,7.7001 c 0.192502,0.577507 0.577507,0.962512 1.155015,0.962512 0.577507,0 0.962512,-0.385005 1.155015,-0.962512 l 1.155015,-7.7001 v -1.925024 l -1.155015,-5.775075 c -0.192503,-0.577507 -0.577508,-0.962512 -1.155015,-0.962512 z" />
+  </g>
+</svg>