From b60fdd7fe43fb81e6be2674d442085d9d327af29 Mon Sep 17 00:00:00 2001
From: tiansen <tian_sen@dl.cn.nexty-ele.com>
Date: Fri, 2 Nov 2018 10:27:50 +0800
Subject: vertical

---
 launcher/qml/Launcher.qml                          |   9 +-
 .../qml/images/AGL_HMI_Blue_Background_Car-01.png  | Bin 785945 -> 824254 bytes
 launcher/qml/images/browser_active.svg             | 231 +++++++++++++++++++++
 launcher/qml/images/browser_inactive.svg           | 165 +++++++++++++++
 launcher/qml/images/images.qrc                     |   8 +-
 launcher/qml/images/video_active.svg               | 177 ----------------
 launcher/qml/images/video_inactive.svg             | 111 ----------
 launcher/qml/images/videoplayer_active.svg         | 177 ++++++++++++++++
 launcher/qml/images/videoplayer_inactive.svg       | 111 ++++++++++
 launcher/qml/images/webbrowser_active.svg          | 231 ---------------------
 launcher/qml/images/webbrowser_inactive.svg        | 165 ---------------
 launcher/src/applicationmodel.cpp                  |   9 +-
 12 files changed, 698 insertions(+), 696 deletions(-)
 create mode 100644 launcher/qml/images/browser_active.svg
 create mode 100644 launcher/qml/images/browser_inactive.svg
 delete mode 100644 launcher/qml/images/video_active.svg
 delete mode 100644 launcher/qml/images/video_inactive.svg
 create mode 100644 launcher/qml/images/videoplayer_active.svg
 create mode 100644 launcher/qml/images/videoplayer_inactive.svg
 delete mode 100644 launcher/qml/images/webbrowser_active.svg
 delete mode 100644 launcher/qml/images/webbrowser_inactive.svg

diff --git a/launcher/qml/Launcher.qml b/launcher/qml/Launcher.qml
index 6d55271..53447e5 100644
--- a/launcher/qml/Launcher.qml
+++ b/launcher/qml/Launcher.qml
@@ -67,15 +67,15 @@ ApplicationWindow {
             property int index: grid.indexAt(loc.mouseX, loc.mouseY)
             x: 62
             y: 264
+            anchors.rightMargin: 0
+            anchors.bottomMargin: 0
+            anchors.leftMargin: 0
+            anchors.topMargin: 0
             onPressAndHold: currentId = applicationModel.id(newIndex = index)
             onReleased: {
-                if(loc.index < 0) {
-                    return
-                }
                 if (currentId === '') {
                     pid = launcher.launch(applicationModel.id(loc.index))
                     if (1 < pid) {
-                        homescreenHandler.tapShortcut(applicationModel.name(loc.index))
                     }
                     else {
                         console.warn("app cannot be launched!")
@@ -83,6 +83,7 @@ ApplicationWindow {
                 } else {
                     currentId = ''
                 }
+                homescreenHandler.tapShortcut(applicationModel.name(loc.index))
             }
             onPositionChanged: {
                 if (loc.currentId === '') return
diff --git a/launcher/qml/images/AGL_HMI_Blue_Background_Car-01.png b/launcher/qml/images/AGL_HMI_Blue_Background_Car-01.png
index 8c01263..5ea3a53 100644
Binary files a/launcher/qml/images/AGL_HMI_Blue_Background_Car-01.png and b/launcher/qml/images/AGL_HMI_Blue_Background_Car-01.png differ
diff --git a/launcher/qml/images/browser_active.svg b/launcher/qml/images/browser_active.svg
new file mode 100644
index 0000000..70b4617
--- /dev/null
+++ b/launcher/qml/images/browser_active.svg
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   id="Settings_Active"
+   x="0px"
+   y="0px"
+   viewBox="0 0 300 300"
+   style="enable-background:new 0 0 300 300;"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="webbrowser_active.svg"><metadata
+     id="metadata6110"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6108" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1490"
+     inkscape:window-height="730"
+     id="namedview6106"
+     showgrid="false"
+     inkscape:zoom="0.78666667"
+     inkscape:cx="-90.254237"
+     inkscape:cy="150"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Settings_Active" /><style
+     type="text/css"
+     id="style6027">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{opacity:0.4;fill:url(#SVGID_2_);enable-background:new    ;}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:url(#SVGID_5_);}
+	.st5{fill:url(#SVGID_6_);}
+	.st6{fill:url(#SVGID_7_);}
+	.st7{fill:url(#SVGID_8_);}
+</style><linearGradient
+     id="SVGID_1_"
+     gradientUnits="userSpaceOnUse"
+     x1="67.5042"
+     y1="-12.4026"
+     x2="207.9578"
+     y2="375.3077"
+     gradientTransform="matrix(1.3307804,0,0,-1.3314313,1.3518321,294.26058)"><stop
+       offset="0"
+       style="stop-color:#0DF9FF"
+       id="stop6030" /><stop
+       offset="9.208472e-02"
+       style="stop-color:#0DF9FF;stop-opacity:0.853"
+       id="stop6032" /><stop
+       offset="0.6264"
+       style="stop-color:#0DF9FF;stop-opacity:0"
+       id="stop6034" /></linearGradient><ellipse
+     class="st0"
+     cx="149.46768"
+     cy="149.93343"
+     id="circle6036"
+     style="fill:url(#SVGID_1_)"
+     rx="135.60652"
+     ry="135.67285" /><linearGradient
+     id="SVGID_2_"
+     gradientUnits="userSpaceOnUse"
+     x1="-104.3909"
+     y1="-193.5205"
+     x2="168.3364"
+     y2="188.2976"
+     gradientTransform="matrix(1.3307804,0,0,-1.3314313,1.3518321,294.26058)"><stop
+       offset="0.2978"
+       style="stop-color:#FFFFFF;stop-opacity:0"
+       id="stop6039" /><stop
+       offset="0.3685"
+       style="stop-color:#FAFAFA;stop-opacity:0.1007"
+       id="stop6041" /><stop
+       offset="0.4554"
+       style="stop-color:#EBEBEB;stop-opacity:0.2245"
+       id="stop6043" /><stop
+       offset="0.5508"
+       style="stop-color:#D2D2D2;stop-opacity:0.3603"
+       id="stop6045" /><stop
+       offset="0.6523"
+       style="stop-color:#AFAFAF;stop-opacity:0.5048"
+       id="stop6047" /><stop
+       offset="0.7585"
+       style="stop-color:#828282;stop-opacity:0.6562"
+       id="stop6049" /><stop
+       offset="0.8689"
+       style="stop-color:#4B4B4B;stop-opacity:0.8133"
+       id="stop6051" /><stop
+       offset="0.9806"
+       style="stop-color:#0C0C0C;stop-opacity:0.9724"
+       id="stop6053" /><stop
+       offset="1"
+       style="stop-color:#000000"
+       id="stop6055" /></linearGradient><ellipse
+     class="st1"
+     cx="149.46768"
+     cy="149.93343"
+     id="circle6057"
+     style="opacity:0.4;fill:url(#SVGID_2_);enable-background:new"
+     rx="135.60652"
+     ry="135.67285" /><g
+     id="g6059"
+     transform="matrix(1.3307804,0,0,1.3314313,1.3518321,1.3456942)"><linearGradient
+       id="SVGID_3_"
+       gradientUnits="userSpaceOnUse"
+       x1="-43.8396"
+       y1="-45.145401"
+       x2="272.5983"
+       y2="258.20679"
+       gradientTransform="matrix(1,0.00546456,0.00546456,-1,-3.8006,218.0353)"><stop
+         offset="0"
+         style="stop-color:#00ADDC"
+         id="stop6062" /><stop
+         offset="1"
+         style="stop-color:#6BFBFF"
+         id="stop6064" /></linearGradient><path
+       class="st2"
+       d="m 111.7,216.8 c -0.2,0 -0.4,0 -0.6,0 C 53.1,216.5 6.2,169.1 6.5,111.1 6.9,53.3 54,6.5 111.7,6.5 c 0.2,0 0.4,0 0.6,0 58,0.3 104.9,47.7 104.6,105.7 l 0,0 C 216.5,170 169.4,216.8 111.7,216.8 Z m 0,-206.6 C 56,10.2 10.5,55.4 10.2,111.1 c -0.3,55.9 45,101.7 100.9,102 0.2,0 0.4,0 0.6,0 55.7,0 101.2,-45.2 101.5,-100.9 0.3,-55.9 -45,-101.7 -100.9,-102 -0.2,0 -0.4,0 -0.6,0 z"
+       id="path6066"
+       style="fill:url(#SVGID_3_)"
+       inkscape:connector-curvature="0" /></g><g
+     id="_x38_ymwRc.tif"
+     transform="matrix(1.3307804,0,0,1.3314313,1.3518321,1.3456942)"><g
+       id="g6069"><linearGradient
+         id="SVGID_4_"
+         gradientUnits="userSpaceOnUse"
+         x1="47.166698"
+         y1="108.6"
+         x2="175.26669"
+         y2="108.6"
+         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
+           offset="0"
+           style="stop-color:#00ADDC"
+           id="stop6072" /><stop
+           offset="1"
+           style="stop-color:#6BFBFF"
+           id="stop6074" /></linearGradient><path
+         class="st3"
+         d="m 123.2,159.5 c -22.9,0 -45.7,0 -68.6,0 -3.9,0 -5.8,-2.3 -7.4,-5.3 0,-28.5 0,-57.1 0,-85.6 1.8,-4.1 4.9,-5.4 9.4,-5.4 36.6,0.1 73.2,0.1 109.7,0.1 6.7,0 9,2.3 9,9 0,26.1 0,52.3 0,78.4 0,6.5 -2.3,8.7 -8.9,8.8 -3,0 -11,0.1 -11,0.1 0,0 -2.3,-2 -3.9,-3.6 5.3,0 10,0 14.7,0 4.7,0 5.5,-0.8 5.5,-5.5 0,-22 0,-44 0.1,-66 0,-2.7 -0.8,-3.4 -3.5,-3.4 -38,0.1 -76,0.1 -114,0 -2.8,0 -3.4,0.9 -3.4,3.5 0.1,22.1 0.1,44.2 0.1,66.3 0,4.3 0.8,5.1 5.2,5.1 21.4,0 42.9,0 64.3,0 1,0 2,-0.1 2.9,0.1 M 111.2,77.7 c 18,0 35.9,0 53.9,0 6.6,0 6.5,0 6.4,-6.6 0,-2.9 -1.3,-4.2 -4.1,-4.2 -0.9,0 -1.7,0 -2.6,0 -35.7,0 -71.4,0 -107.1,0 -6.4,0 -6.7,0.3 -6.7,6.5 0,4.3 0,4.3 4.1,4.3 18.6,0 37.4,0 56.1,0 z"
+         id="path6076"
+         style="fill:url(#SVGID_4_)"
+         inkscape:connector-curvature="0" /><linearGradient
+         id="SVGID_5_"
+         gradientUnits="userSpaceOnUse"
+         x1="86.366699"
+         y1="147.7428"
+         x2="135.8667"
+         y2="147.7428"
+         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
+           offset="0"
+           style="stop-color:#00ADDC"
+           id="stop6079" /><stop
+           offset="1"
+           style="stop-color:#6BFBFF"
+           id="stop6081" /></linearGradient><path
+         class="st4"
+         d="m 111.5,70.5 c 7.1,0 14.2,0 21.2,0 1.4,0 3.2,-0.3 3.2,1.7 0,2 -1.8,1.8 -3.2,1.8 -14.4,0 -28.7,0 -43.1,0 -1.3,0 -3.2,0.4 -3.2,-1.7 0,-2.1 1.8,-1.8 3.2,-1.8 7.3,0 14.6,0 21.9,0 z"
+         id="path6083"
+         style="fill:url(#SVGID_5_)"
+         inkscape:connector-curvature="0" /><linearGradient
+         id="SVGID_6_"
+         gradientUnits="userSpaceOnUse"
+         x1="60.2943"
+         y1="147.79939"
+         x2="63.808201"
+         y2="147.79939"
+         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
+           offset="0"
+           style="stop-color:#00ADDC"
+           id="stop6086" /><stop
+           offset="1"
+           style="stop-color:#6BFBFF"
+           id="stop6088" /></linearGradient><path
+         class="st5"
+         d="m 63.8,72.2 c -0.1,0.9 -0.5,1.7 -1.6,1.7 -1.2,0.1 -1.9,-0.5 -1.9,-1.7 0,-1 0.6,-1.6 1.6,-1.7 1.2,-0.1 1.7,0.6 1.9,1.7 z"
+         id="path6090"
+         style="fill:url(#SVGID_6_)"
+         inkscape:connector-curvature="0" /><linearGradient
+         id="SVGID_7_"
+         gradientUnits="userSpaceOnUse"
+         x1="66.4795"
+         y1="147.7"
+         x2="69.944099"
+         y2="147.7"
+         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
+           offset="0"
+           style="stop-color:#00ADDC"
+           id="stop6093" /><stop
+           offset="1"
+           style="stop-color:#6BFBFF"
+           id="stop6095" /></linearGradient><path
+         class="st6"
+         d="m 68.6,74 c -1.3,0 -2,-0.5 -2.1,-1.5 -0.1,-1.1 0.4,-1.9 1.6,-1.9 1,0 1.7,0.5 1.8,1.5 0.2,1.1 -0.5,1.7 -1.3,1.9 z"
+         id="path6097"
+         style="fill:url(#SVGID_7_)"
+         inkscape:connector-curvature="0" /><linearGradient
+         id="SVGID_8_"
+         gradientUnits="userSpaceOnUse"
+         x1="54.3325"
+         y1="147.7989"
+         x2="57.717999"
+         y2="147.7989"
+         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
+           offset="0"
+           style="stop-color:#00ADDC"
+           id="stop6100" /><stop
+           offset="1"
+           style="stop-color:#6BFBFF"
+           id="stop6102" /></linearGradient><path
+         class="st7"
+         d="m 57.7,72.5 c -0.2,1.1 -0.9,1.5 -1.8,1.4 -1.2,-0.1 -1.7,-0.8 -1.5,-2 0.2,-1 0.8,-1.5 1.8,-1.4 1.2,0.2 1.6,1 1.5,2 z"
+         id="path6104"
+         style="fill:url(#SVGID_8_)"
+         inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/launcher/qml/images/browser_inactive.svg b/launcher/qml/images/browser_inactive.svg
new file mode 100644
index 0000000..09f34c9
--- /dev/null
+++ b/launcher/qml/images/browser_inactive.svg
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   id="Settings_Active"
+   x="0px"
+   y="0px"
+   viewBox="0 0 300 300"
+   style="enable-background:new 0 0 300 300;"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="webbrowser_inactive.svg"><metadata
+     id="metadata56"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs54" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1345"
+     inkscape:window-height="856"
+     id="namedview52"
+     showgrid="false"
+     inkscape:zoom="0.78666667"
+     inkscape:cx="-87.711864"
+     inkscape:cy="150"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Settings_Active" /><style
+     type="text/css"
+     id="style3">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:url(#SVGID_5_);}
+	.st5{fill:url(#SVGID_6_);}
+</style><g
+     id="g5"
+     transform="matrix(1.3307804,0,0,1.3314313,1.3518321,1.3456942)"><linearGradient
+       id="SVGID_1_"
+       gradientUnits="userSpaceOnUse"
+       x1="-43.8396"
+       y1="-45.145401"
+       x2="272.5983"
+       y2="258.20679"
+       gradientTransform="matrix(1,0.00546456,0.00546456,-1,-3.8006,218.0353)"><stop
+         offset="0"
+         style="stop-color:#00ADDC"
+         id="stop8" /><stop
+         offset="1"
+         style="stop-color:#6BFBFF"
+         id="stop10" /></linearGradient><path
+       class="st0"
+       d="m 111.7,216.8 c -0.2,0 -0.4,0 -0.6,0 C 53.1,216.5 6.2,169.1 6.5,111.1 6.9,53.3 54,6.5 111.7,6.5 c 0.2,0 0.4,0 0.6,0 58,0.3 104.9,47.7 104.6,105.7 l 0,0 C 216.5,170 169.4,216.8 111.7,216.8 Z m 0,-206.6 C 56,10.2 10.5,55.4 10.2,111.1 c -0.3,55.9 45,101.7 100.9,102 0.2,0 0.4,0 0.6,0 55.7,0 101.2,-45.2 101.5,-100.9 0.3,-55.9 -45,-101.7 -100.9,-102 -0.2,0 -0.4,0 -0.6,0 z"
+       id="path12"
+       style="fill:url(#SVGID_1_)"
+       inkscape:connector-curvature="0" /></g><g
+     id="_x38_ymwRc.tif"
+     transform="matrix(1.3307804,0,0,1.3314313,1.3518321,1.3456942)"><g
+       id="g15"><linearGradient
+         id="SVGID_2_"
+         gradientUnits="userSpaceOnUse"
+         x1="47.166698"
+         y1="108.6"
+         x2="175.26669"
+         y2="108.6"
+         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
+           offset="0"
+           style="stop-color:#00ADDC"
+           id="stop18" /><stop
+           offset="1"
+           style="stop-color:#6BFBFF"
+           id="stop20" /></linearGradient><path
+         class="st1"
+         d="m 123.2,159.5 c -22.9,0 -45.7,0 -68.6,0 -3.9,0 -5.8,-2.3 -7.4,-5.3 0,-28.5 0,-57.1 0,-85.6 1.8,-4.1 4.9,-5.4 9.4,-5.4 36.6,0.1 73.2,0.1 109.7,0.1 6.7,0 9,2.3 9,9 0,26.1 0,52.3 0,78.4 0,6.5 -2.3,8.7 -8.9,8.8 -3,0 -11,0.1 -11,0.1 0,0 -2.3,-2 -3.9,-3.6 5.3,0 10,0 14.7,0 4.7,0 5.5,-0.8 5.5,-5.5 0,-22 0,-44 0.1,-66 0,-2.7 -0.8,-3.4 -3.5,-3.4 -38,0.1 -76,0.1 -114,0 -2.8,0 -3.4,0.9 -3.4,3.5 0.1,22.1 0.1,44.2 0.1,66.3 0,4.3 0.8,5.1 5.2,5.1 21.4,0 42.9,0 64.3,0 1,0 2,-0.1 2.9,0.1 M 111.2,77.7 c 18,0 35.9,0 53.9,0 6.6,0 6.5,0 6.4,-6.6 0,-2.9 -1.3,-4.2 -4.1,-4.2 -0.9,0 -1.7,0 -2.6,0 -35.7,0 -71.4,0 -107.1,0 -6.4,0 -6.7,0.3 -6.7,6.5 0,4.3 0,4.3 4.1,4.3 18.6,0 37.4,0 56.1,0 z"
+         id="path22"
+         style="fill:url(#SVGID_2_)"
+         inkscape:connector-curvature="0" /><linearGradient
+         id="SVGID_3_"
+         gradientUnits="userSpaceOnUse"
+         x1="86.366699"
+         y1="147.7428"
+         x2="135.8667"
+         y2="147.7428"
+         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
+           offset="0"
+           style="stop-color:#00ADDC"
+           id="stop25" /><stop
+           offset="1"
+           style="stop-color:#6BFBFF"
+           id="stop27" /></linearGradient><path
+         class="st2"
+         d="m 111.5,70.5 c 7.1,0 14.2,0 21.2,0 1.4,0 3.2,-0.3 3.2,1.7 0,2 -1.8,1.8 -3.2,1.8 -14.4,0 -28.7,0 -43.1,0 -1.3,0 -3.2,0.4 -3.2,-1.7 0,-2.1 1.8,-1.8 3.2,-1.8 7.3,0 14.6,0 21.9,0 z"
+         id="path29"
+         style="fill:url(#SVGID_3_)"
+         inkscape:connector-curvature="0" /><linearGradient
+         id="SVGID_4_"
+         gradientUnits="userSpaceOnUse"
+         x1="60.2943"
+         y1="147.79939"
+         x2="63.808201"
+         y2="147.79939"
+         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
+           offset="0"
+           style="stop-color:#00ADDC"
+           id="stop32" /><stop
+           offset="1"
+           style="stop-color:#6BFBFF"
+           id="stop34" /></linearGradient><path
+         class="st3"
+         d="m 63.8,72.2 c -0.1,0.9 -0.5,1.7 -1.6,1.7 -1.2,0.1 -1.9,-0.5 -1.9,-1.7 0,-1 0.6,-1.6 1.6,-1.7 1.2,-0.1 1.7,0.6 1.9,1.7 z"
+         id="path36"
+         style="fill:url(#SVGID_4_)"
+         inkscape:connector-curvature="0" /><linearGradient
+         id="SVGID_5_"
+         gradientUnits="userSpaceOnUse"
+         x1="66.4795"
+         y1="147.7"
+         x2="69.944099"
+         y2="147.7"
+         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
+           offset="0"
+           style="stop-color:#00ADDC"
+           id="stop39" /><stop
+           offset="1"
+           style="stop-color:#6BFBFF"
+           id="stop41" /></linearGradient><path
+         class="st4"
+         d="m 68.6,74 c -1.3,0 -2,-0.5 -2.1,-1.5 -0.1,-1.1 0.4,-1.9 1.6,-1.9 1,0 1.7,0.5 1.8,1.5 0.2,1.1 -0.5,1.7 -1.3,1.9 z"
+         id="path43"
+         style="fill:url(#SVGID_5_)"
+         inkscape:connector-curvature="0" /><linearGradient
+         id="SVGID_6_"
+         gradientUnits="userSpaceOnUse"
+         x1="54.3325"
+         y1="147.7989"
+         x2="57.717999"
+         y2="147.7989"
+         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
+           offset="0"
+           style="stop-color:#00ADDC"
+           id="stop46" /><stop
+           offset="1"
+           style="stop-color:#6BFBFF"
+           id="stop48" /></linearGradient><path
+         class="st5"
+         d="m 57.7,72.5 c -0.2,1.1 -0.9,1.5 -1.8,1.4 -1.2,-0.1 -1.7,-0.8 -1.5,-2 0.2,-1 0.8,-1.5 1.8,-1.4 1.2,0.2 1.6,1 1.5,2 z"
+         id="path50"
+         style="fill:url(#SVGID_6_)"
+         inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/launcher/qml/images/images.qrc b/launcher/qml/images/images.qrc
index cef5f21..501e81d 100644
--- a/launcher/qml/images/images.qrc
+++ b/launcher/qml/images/images.qrc
@@ -23,10 +23,10 @@
         <file>radio_inactive.svg</file>
         <file>settings_active.svg</file>
         <file>settings_inactive.svg</file>
-        <file>video_active.svg</file>
-        <file>video_inactive.svg</file>
-        <file>webbrowser_active.svg</file>
-        <file>webbrowser_inactive.svg</file>
+        <file>videoplayer_active.svg</file>
+        <file>videoplayer_inactive.svg</file>
+        <file>browser_active.svg</file>
+        <file>browser_inactive.svg</file>
         <file>blank_active.svg</file>
         <file>blank_inactive.svg</file>
         <file>plus_active.svg</file>
diff --git a/launcher/qml/images/video_active.svg b/launcher/qml/images/video_active.svg
deleted file mode 100644
index 794a441..0000000
--- a/launcher/qml/images/video_active.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<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"
-   id="Settings_Active"
-   x="0px"
-   y="0px"
-   viewBox="0 0 300 300"
-   style="enable-background:new 0 0 300 300;"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="video_active.svg"><metadata
-     id="metadata5790"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs5788" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1508"
-     inkscape:window-height="871"
-     id="namedview5786"
-     showgrid="false"
-     inkscape:zoom="0.78666667"
-     inkscape:cx="-90.254237"
-     inkscape:cy="150"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Settings_Active" /><style
-     type="text/css"
-     id="style5724">
-	.st0{fill:url(#SVGID_1_);}
-	.st1{opacity:0.4;fill:url(#SVGID_2_);}
-	.st2{fill:url(#SVGID_3_);}
-	.st3{fill:#231F20;}
-	.st4{fill:none;stroke:url(#SVGID_4_);stroke-width:4;stroke-miterlimit:10;}
-	.st5{fill:none;stroke:url(#SVGID_5_);stroke-width:4;stroke-miterlimit:10;}
-	.st6{fill:none;stroke:url(#SVGID_6_);stroke-width:4;stroke-miterlimit:10;}
-	.st7{fill:url(#SVGID_7_);}
-	.st8{fill:none;stroke:url(#SVGID_8_);stroke-width:4;stroke-miterlimit:10;}
-</style><linearGradient
-     id="SVGID_1_"
-     gradientUnits="userSpaceOnUse"
-     x1="65.308"
-     y1="229.4663"
-     x2="205.7616"
-     y2="-158.244"
-     gradientTransform="matrix(1.3314132,0,0,1.3314313,5.608242,5.2068449)"><stop
-       offset="0"
-       style="stop-color:#0DF9FF"
-       id="stop5727" /><stop
-       offset="9.208472e-02"
-       style="stop-color:#0DF9FF;stop-opacity:0.853"
-       id="stop5729" /><stop
-       offset="0.6264"
-       style="stop-color:#0DF9FF;stop-opacity:0"
-       id="stop5731" /></linearGradient><ellipse
-     class="st0"
-     cx="150.8654"
-     cy="149.93343"
-     id="circle5733"
-     style="fill:url(#SVGID_1_)"
-     rx="135.67101"
-     ry="135.67285" /><linearGradient
-     id="SVGID_2_"
-     gradientUnits="userSpaceOnUse"
-     x1="-106.5709"
-     y1="410.5855"
-     x2="166.1564"
-     y2="28.7673"
-     gradientTransform="matrix(1.3314132,0,0,1.3314313,5.608242,5.2068449)"><stop
-       offset="0.2978"
-       style="stop-color:#FFFFFF;stop-opacity:0"
-       id="stop5736" /><stop
-       offset="0.3685"
-       style="stop-color:#FAFAFA;stop-opacity:0.1007"
-       id="stop5738" /><stop
-       offset="0.4554"
-       style="stop-color:#EBEBEB;stop-opacity:0.2245"
-       id="stop5740" /><stop
-       offset="0.5508"
-       style="stop-color:#D2D2D2;stop-opacity:0.3603"
-       id="stop5742" /><stop
-       offset="0.6523"
-       style="stop-color:#AFAFAF;stop-opacity:0.5048"
-       id="stop5744" /><stop
-       offset="0.7585"
-       style="stop-color:#828282;stop-opacity:0.6562"
-       id="stop5746" /><stop
-       offset="0.8689"
-       style="stop-color:#4B4B4B;stop-opacity:0.8133"
-       id="stop5748" /><stop
-       offset="0.9806"
-       style="stop-color:#0C0C0C;stop-opacity:0.9724"
-       id="stop5750" /><stop
-       offset="1"
-       style="stop-color:#000000"
-       id="stop5752" /></linearGradient><ellipse
-     class="st1"
-     cx="150.8654"
-     cy="149.93343"
-     id="circle5754"
-     style="opacity:0.4;fill:url(#SVGID_2_)"
-     rx="135.67101"
-     ry="135.67285" /><g
-     id="g5756"
-     transform="matrix(1.3314132,0,0,1.3314313,5.608242,5.2068449)"><linearGradient
-       id="SVGID_3_"
-       gradientUnits="userSpaceOnUse"
-       x1="-47.346401"
-       y1="263.00369"
-       x2="269.0914"
-       y2="-40.3484"
-       gradientTransform="matrix(1,0.00546456,-0.00546456,1,-2.3177,-2.7461)"><stop
-         offset="0"
-         style="stop-color:#00ADDC"
-         id="stop5759" /><stop
-         offset="1"
-         style="stop-color:#6BFBFF"
-         id="stop5761" /></linearGradient><path
-       class="st2"
-       d="m 108.5,213.9 c -0.2,0 -0.4,0 -0.6,0 C 49.9,213.5 3,166.1 3.3,108.1 3.6,50.4 50.7,3.6 108.4,3.6 c 0.2,0 0.4,0 0.6,0 58,0.3 104.9,47.7 104.6,105.7 l 0,0 c -0.3,57.8 -47.4,104.6 -105.1,104.6 z M 108.4,7.2 C 52.7,7.2 7.3,52.4 7,108.2 c -0.3,55.9 45,101.7 100.9,102 0.2,0 0.4,0 0.6,0 C 164.2,210.2 209.7,165 210,109.3 210.3,53.4 165,7.6 109.1,7.3 108.8,7.2 108.6,7.2 108.4,7.2 Z"
-       id="path5763"
-       style="fill:url(#SVGID_3_)"
-       inkscape:connector-curvature="0" /></g><g
-     id="g5765"
-     transform="matrix(1.3314132,0,0,1.3314313,5.608242,5.2068449)"><g
-       id="g5767"><g
-         id="L7oFcc.tif"><g
-           id="g5770"><linearGradient
-             id="SVGID_4_"
-             gradientUnits="userSpaceOnUse"
-             x1="95.694397"
-             y1="108.712"
-             x2="131.1936"
-             y2="108.712"><stop
-               offset="0"
-               style="stop-color:#00ADDC"
-               id="stop5773" /><stop
-               offset="1"
-               style="stop-color:#6BFBFF"
-               id="stop5775" /></linearGradient><path
-             style="fill:url(#SVGID_4_)"
-             d="m 95.7,108.5 c 0,-6 0,-11.9 0,-17.9 0,-4.3 1.1,-5 4.7,-2.8 9.5,6 18.9,12 28.3,18 3.3,2.1 3.3,3.5 0,5.6 -9.4,6.1 -18.8,12.1 -28.3,18.1 -3.5,2.2 -4.6,1.5 -4.7,-2.8 0,-6 0,-12.1 0,-18.2 z m 4.8,-16 c -1.7,0 -1.3,1.2 -1.3,2.1 0,9.4 0,18.8 -0.1,28.1 0,3 1,2.6 2.9,1.4 7,-4.5 13.9,-9 21,-13.3 2.6,-1.6 2.3,-2.5 -0.1,-4 -6.9,-4.3 -13.8,-8.8 -20.7,-13.1 -0.5,-0.5 -1.1,-0.9 -1.7,-1.2 z"
-             id="path5777"
-             inkscape:connector-curvature="0" /></g></g></g><linearGradient
-       id="SVGID_5_"
-       gradientUnits="userSpaceOnUse"
-       x1="45.1595"
-       y1="108.712"
-       x2="171.7285"
-       y2="108.712"><stop
-         offset="0"
-         style="stop-color:#00ADDC"
-         id="stop5780" /><stop
-         offset="1"
-         style="stop-color:#6BFBFF"
-         id="stop5782" /></linearGradient><path
-       class="st5"
-       d="m 169.7,95.5 0,36.9 c 0,11.6 -9.5,21 -21,21 l -80.5,0 c -11.6,0 -21,-9.5 -21,-21 l 0,-47.4 c 0,-11.6 9.5,-21 21,-21 l 80.5,0 c 7,0 13.3,3.5 17.1,8.8"
-       id="path5784"
-       style="fill:none;stroke:url(#SVGID_5_);stroke-width:4;stroke-miterlimit:10"
-       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/launcher/qml/images/video_inactive.svg b/launcher/qml/images/video_inactive.svg
deleted file mode 100644
index 905d46f..0000000
--- a/launcher/qml/images/video_inactive.svg
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<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"
-   id="Settings_Active"
-   x="0px"
-   y="0px"
-   viewBox="0 0 300 300"
-   style="enable-background:new 0 0 300 300;"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="video_inactive.svg"><metadata
-     id="metadata5903"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs5901" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1551"
-     inkscape:window-height="804"
-     id="namedview5899"
-     showgrid="false"
-     inkscape:zoom="0.78666667"
-     inkscape:cx="-90.254237"
-     inkscape:cy="150"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Settings_Active" /><style
-     type="text/css"
-     id="style5867">
-	.st0{fill:url(#SVGID_1_);}
-	.st1{fill:#231F20;}
-	.st2{fill:none;stroke:url(#SVGID_2_);stroke-width:4;stroke-miterlimit:10;}
-	.st3{fill:none;stroke:url(#SVGID_3_);stroke-width:4;stroke-miterlimit:10;}
-	.st4{fill:none;stroke:url(#SVGID_4_);stroke-width:4;stroke-miterlimit:10;}
-	.st5{fill:url(#SVGID_5_);}
-	.st6{fill:none;stroke:url(#SVGID_6_);stroke-width:4;stroke-miterlimit:10;}
-</style><g
-     id="g5869"
-     transform="matrix(1.3314132,0,0,1.3314313,5.608242,5.2068449)"><linearGradient
-       id="SVGID_1_"
-       gradientUnits="userSpaceOnUse"
-       x1="-47.346401"
-       y1="263.00369"
-       x2="269.0914"
-       y2="-40.3484"
-       gradientTransform="matrix(1,0.00546456,-0.00546456,1,-2.3177,-2.7461)"><stop
-         offset="0"
-         style="stop-color:#00ADDC"
-         id="stop5872" /><stop
-         offset="1"
-         style="stop-color:#6BFBFF"
-         id="stop5874" /></linearGradient><path
-       class="st0"
-       d="m 108.5,213.9 c -0.2,0 -0.4,0 -0.6,0 C 49.9,213.5 3,166.1 3.3,108.1 3.6,50.4 50.7,3.6 108.4,3.6 c 0.2,0 0.4,0 0.6,0 58,0.3 104.9,47.7 104.6,105.7 l 0,0 c -0.3,57.8 -47.4,104.6 -105.1,104.6 z M 108.4,7.2 C 52.7,7.2 7.3,52.4 7,108.2 c -0.3,55.9 45,101.7 100.9,102 0.2,0 0.4,0 0.6,0 C 164.2,210.2 209.7,165 210,109.3 210.3,53.4 165,7.6 109.1,7.3 108.8,7.2 108.6,7.2 108.4,7.2 Z"
-       id="path5876"
-       style="fill:url(#SVGID_1_)"
-       inkscape:connector-curvature="0" /></g><g
-     id="g5878"
-     transform="matrix(1.3314132,0,0,1.3314313,5.608242,5.2068449)"><g
-       id="g5880"><g
-         id="L7oFcc.tif"><g
-           id="g5883"><linearGradient
-             id="SVGID_2_"
-             gradientUnits="userSpaceOnUse"
-             x1="95.694397"
-             y1="108.712"
-             x2="131.1936"
-             y2="108.712"><stop
-               offset="0"
-               style="stop-color:#00ADDC"
-               id="stop5886" /><stop
-               offset="1"
-               style="stop-color:#6BFBFF"
-               id="stop5888" /></linearGradient><path
-             style="fill:url(#SVGID_2_)"
-             d="m 95.7,108.5 c 0,-6 0,-11.9 0,-17.9 0,-4.3 1.1,-5 4.7,-2.8 9.5,6 18.9,12 28.3,18 3.3,2.1 3.3,3.5 0,5.6 -9.4,6.1 -18.8,12.1 -28.3,18.1 -3.5,2.2 -4.6,1.5 -4.7,-2.8 0,-6 0,-12.1 0,-18.2 z m 4.8,-16 c -1.7,0 -1.3,1.2 -1.3,2.1 0,9.4 0,18.8 -0.1,28.1 0,3 1,2.6 2.9,1.4 7,-4.5 13.9,-9 21,-13.3 2.6,-1.6 2.3,-2.5 -0.1,-4 -6.9,-4.3 -13.8,-8.8 -20.7,-13.1 -0.5,-0.5 -1.1,-0.9 -1.7,-1.2 z"
-             id="path5890"
-             inkscape:connector-curvature="0" /></g></g></g><linearGradient
-       id="SVGID_3_"
-       gradientUnits="userSpaceOnUse"
-       x1="45.1595"
-       y1="108.712"
-       x2="171.7285"
-       y2="108.712"><stop
-         offset="0"
-         style="stop-color:#00ADDC"
-         id="stop5893" /><stop
-         offset="1"
-         style="stop-color:#6BFBFF"
-         id="stop5895" /></linearGradient><path
-       class="st3"
-       d="m 169.7,95.5 0,36.9 c 0,11.6 -9.5,21 -21,21 l -80.5,0 c -11.6,0 -21,-9.5 -21,-21 l 0,-47.4 c 0,-11.6 9.5,-21 21,-21 l 80.5,0 c 7,0 13.3,3.5 17.1,8.8"
-       id="path5897"
-       style="fill:none;stroke:url(#SVGID_3_);stroke-width:4;stroke-miterlimit:10"
-       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/launcher/qml/images/videoplayer_active.svg b/launcher/qml/images/videoplayer_active.svg
new file mode 100644
index 0000000..794a441
--- /dev/null
+++ b/launcher/qml/images/videoplayer_active.svg
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   id="Settings_Active"
+   x="0px"
+   y="0px"
+   viewBox="0 0 300 300"
+   style="enable-background:new 0 0 300 300;"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="video_active.svg"><metadata
+     id="metadata5790"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs5788" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1508"
+     inkscape:window-height="871"
+     id="namedview5786"
+     showgrid="false"
+     inkscape:zoom="0.78666667"
+     inkscape:cx="-90.254237"
+     inkscape:cy="150"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Settings_Active" /><style
+     type="text/css"
+     id="style5724">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{opacity:0.4;fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:#231F20;}
+	.st4{fill:none;stroke:url(#SVGID_4_);stroke-width:4;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:url(#SVGID_5_);stroke-width:4;stroke-miterlimit:10;}
+	.st6{fill:none;stroke:url(#SVGID_6_);stroke-width:4;stroke-miterlimit:10;}
+	.st7{fill:url(#SVGID_7_);}
+	.st8{fill:none;stroke:url(#SVGID_8_);stroke-width:4;stroke-miterlimit:10;}
+</style><linearGradient
+     id="SVGID_1_"
+     gradientUnits="userSpaceOnUse"
+     x1="65.308"
+     y1="229.4663"
+     x2="205.7616"
+     y2="-158.244"
+     gradientTransform="matrix(1.3314132,0,0,1.3314313,5.608242,5.2068449)"><stop
+       offset="0"
+       style="stop-color:#0DF9FF"
+       id="stop5727" /><stop
+       offset="9.208472e-02"
+       style="stop-color:#0DF9FF;stop-opacity:0.853"
+       id="stop5729" /><stop
+       offset="0.6264"
+       style="stop-color:#0DF9FF;stop-opacity:0"
+       id="stop5731" /></linearGradient><ellipse
+     class="st0"
+     cx="150.8654"
+     cy="149.93343"
+     id="circle5733"
+     style="fill:url(#SVGID_1_)"
+     rx="135.67101"
+     ry="135.67285" /><linearGradient
+     id="SVGID_2_"
+     gradientUnits="userSpaceOnUse"
+     x1="-106.5709"
+     y1="410.5855"
+     x2="166.1564"
+     y2="28.7673"
+     gradientTransform="matrix(1.3314132,0,0,1.3314313,5.608242,5.2068449)"><stop
+       offset="0.2978"
+       style="stop-color:#FFFFFF;stop-opacity:0"
+       id="stop5736" /><stop
+       offset="0.3685"
+       style="stop-color:#FAFAFA;stop-opacity:0.1007"
+       id="stop5738" /><stop
+       offset="0.4554"
+       style="stop-color:#EBEBEB;stop-opacity:0.2245"
+       id="stop5740" /><stop
+       offset="0.5508"
+       style="stop-color:#D2D2D2;stop-opacity:0.3603"
+       id="stop5742" /><stop
+       offset="0.6523"
+       style="stop-color:#AFAFAF;stop-opacity:0.5048"
+       id="stop5744" /><stop
+       offset="0.7585"
+       style="stop-color:#828282;stop-opacity:0.6562"
+       id="stop5746" /><stop
+       offset="0.8689"
+       style="stop-color:#4B4B4B;stop-opacity:0.8133"
+       id="stop5748" /><stop
+       offset="0.9806"
+       style="stop-color:#0C0C0C;stop-opacity:0.9724"
+       id="stop5750" /><stop
+       offset="1"
+       style="stop-color:#000000"
+       id="stop5752" /></linearGradient><ellipse
+     class="st1"
+     cx="150.8654"
+     cy="149.93343"
+     id="circle5754"
+     style="opacity:0.4;fill:url(#SVGID_2_)"
+     rx="135.67101"
+     ry="135.67285" /><g
+     id="g5756"
+     transform="matrix(1.3314132,0,0,1.3314313,5.608242,5.2068449)"><linearGradient
+       id="SVGID_3_"
+       gradientUnits="userSpaceOnUse"
+       x1="-47.346401"
+       y1="263.00369"
+       x2="269.0914"
+       y2="-40.3484"
+       gradientTransform="matrix(1,0.00546456,-0.00546456,1,-2.3177,-2.7461)"><stop
+         offset="0"
+         style="stop-color:#00ADDC"
+         id="stop5759" /><stop
+         offset="1"
+         style="stop-color:#6BFBFF"
+         id="stop5761" /></linearGradient><path
+       class="st2"
+       d="m 108.5,213.9 c -0.2,0 -0.4,0 -0.6,0 C 49.9,213.5 3,166.1 3.3,108.1 3.6,50.4 50.7,3.6 108.4,3.6 c 0.2,0 0.4,0 0.6,0 58,0.3 104.9,47.7 104.6,105.7 l 0,0 c -0.3,57.8 -47.4,104.6 -105.1,104.6 z M 108.4,7.2 C 52.7,7.2 7.3,52.4 7,108.2 c -0.3,55.9 45,101.7 100.9,102 0.2,0 0.4,0 0.6,0 C 164.2,210.2 209.7,165 210,109.3 210.3,53.4 165,7.6 109.1,7.3 108.8,7.2 108.6,7.2 108.4,7.2 Z"
+       id="path5763"
+       style="fill:url(#SVGID_3_)"
+       inkscape:connector-curvature="0" /></g><g
+     id="g5765"
+     transform="matrix(1.3314132,0,0,1.3314313,5.608242,5.2068449)"><g
+       id="g5767"><g
+         id="L7oFcc.tif"><g
+           id="g5770"><linearGradient
+             id="SVGID_4_"
+             gradientUnits="userSpaceOnUse"
+             x1="95.694397"
+             y1="108.712"
+             x2="131.1936"
+             y2="108.712"><stop
+               offset="0"
+               style="stop-color:#00ADDC"
+               id="stop5773" /><stop
+               offset="1"
+               style="stop-color:#6BFBFF"
+               id="stop5775" /></linearGradient><path
+             style="fill:url(#SVGID_4_)"
+             d="m 95.7,108.5 c 0,-6 0,-11.9 0,-17.9 0,-4.3 1.1,-5 4.7,-2.8 9.5,6 18.9,12 28.3,18 3.3,2.1 3.3,3.5 0,5.6 -9.4,6.1 -18.8,12.1 -28.3,18.1 -3.5,2.2 -4.6,1.5 -4.7,-2.8 0,-6 0,-12.1 0,-18.2 z m 4.8,-16 c -1.7,0 -1.3,1.2 -1.3,2.1 0,9.4 0,18.8 -0.1,28.1 0,3 1,2.6 2.9,1.4 7,-4.5 13.9,-9 21,-13.3 2.6,-1.6 2.3,-2.5 -0.1,-4 -6.9,-4.3 -13.8,-8.8 -20.7,-13.1 -0.5,-0.5 -1.1,-0.9 -1.7,-1.2 z"
+             id="path5777"
+             inkscape:connector-curvature="0" /></g></g></g><linearGradient
+       id="SVGID_5_"
+       gradientUnits="userSpaceOnUse"
+       x1="45.1595"
+       y1="108.712"
+       x2="171.7285"
+       y2="108.712"><stop
+         offset="0"
+         style="stop-color:#00ADDC"
+         id="stop5780" /><stop
+         offset="1"
+         style="stop-color:#6BFBFF"
+         id="stop5782" /></linearGradient><path
+       class="st5"
+       d="m 169.7,95.5 0,36.9 c 0,11.6 -9.5,21 -21,21 l -80.5,0 c -11.6,0 -21,-9.5 -21,-21 l 0,-47.4 c 0,-11.6 9.5,-21 21,-21 l 80.5,0 c 7,0 13.3,3.5 17.1,8.8"
+       id="path5784"
+       style="fill:none;stroke:url(#SVGID_5_);stroke-width:4;stroke-miterlimit:10"
+       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/launcher/qml/images/videoplayer_inactive.svg b/launcher/qml/images/videoplayer_inactive.svg
new file mode 100644
index 0000000..905d46f
--- /dev/null
+++ b/launcher/qml/images/videoplayer_inactive.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   id="Settings_Active"
+   x="0px"
+   y="0px"
+   viewBox="0 0 300 300"
+   style="enable-background:new 0 0 300 300;"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="video_inactive.svg"><metadata
+     id="metadata5903"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs5901" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1551"
+     inkscape:window-height="804"
+     id="namedview5899"
+     showgrid="false"
+     inkscape:zoom="0.78666667"
+     inkscape:cx="-90.254237"
+     inkscape:cy="150"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Settings_Active" /><style
+     type="text/css"
+     id="style5867">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:#231F20;}
+	.st2{fill:none;stroke:url(#SVGID_2_);stroke-width:4;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:url(#SVGID_3_);stroke-width:4;stroke-miterlimit:10;}
+	.st4{fill:none;stroke:url(#SVGID_4_);stroke-width:4;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:none;stroke:url(#SVGID_6_);stroke-width:4;stroke-miterlimit:10;}
+</style><g
+     id="g5869"
+     transform="matrix(1.3314132,0,0,1.3314313,5.608242,5.2068449)"><linearGradient
+       id="SVGID_1_"
+       gradientUnits="userSpaceOnUse"
+       x1="-47.346401"
+       y1="263.00369"
+       x2="269.0914"
+       y2="-40.3484"
+       gradientTransform="matrix(1,0.00546456,-0.00546456,1,-2.3177,-2.7461)"><stop
+         offset="0"
+         style="stop-color:#00ADDC"
+         id="stop5872" /><stop
+         offset="1"
+         style="stop-color:#6BFBFF"
+         id="stop5874" /></linearGradient><path
+       class="st0"
+       d="m 108.5,213.9 c -0.2,0 -0.4,0 -0.6,0 C 49.9,213.5 3,166.1 3.3,108.1 3.6,50.4 50.7,3.6 108.4,3.6 c 0.2,0 0.4,0 0.6,0 58,0.3 104.9,47.7 104.6,105.7 l 0,0 c -0.3,57.8 -47.4,104.6 -105.1,104.6 z M 108.4,7.2 C 52.7,7.2 7.3,52.4 7,108.2 c -0.3,55.9 45,101.7 100.9,102 0.2,0 0.4,0 0.6,0 C 164.2,210.2 209.7,165 210,109.3 210.3,53.4 165,7.6 109.1,7.3 108.8,7.2 108.6,7.2 108.4,7.2 Z"
+       id="path5876"
+       style="fill:url(#SVGID_1_)"
+       inkscape:connector-curvature="0" /></g><g
+     id="g5878"
+     transform="matrix(1.3314132,0,0,1.3314313,5.608242,5.2068449)"><g
+       id="g5880"><g
+         id="L7oFcc.tif"><g
+           id="g5883"><linearGradient
+             id="SVGID_2_"
+             gradientUnits="userSpaceOnUse"
+             x1="95.694397"
+             y1="108.712"
+             x2="131.1936"
+             y2="108.712"><stop
+               offset="0"
+               style="stop-color:#00ADDC"
+               id="stop5886" /><stop
+               offset="1"
+               style="stop-color:#6BFBFF"
+               id="stop5888" /></linearGradient><path
+             style="fill:url(#SVGID_2_)"
+             d="m 95.7,108.5 c 0,-6 0,-11.9 0,-17.9 0,-4.3 1.1,-5 4.7,-2.8 9.5,6 18.9,12 28.3,18 3.3,2.1 3.3,3.5 0,5.6 -9.4,6.1 -18.8,12.1 -28.3,18.1 -3.5,2.2 -4.6,1.5 -4.7,-2.8 0,-6 0,-12.1 0,-18.2 z m 4.8,-16 c -1.7,0 -1.3,1.2 -1.3,2.1 0,9.4 0,18.8 -0.1,28.1 0,3 1,2.6 2.9,1.4 7,-4.5 13.9,-9 21,-13.3 2.6,-1.6 2.3,-2.5 -0.1,-4 -6.9,-4.3 -13.8,-8.8 -20.7,-13.1 -0.5,-0.5 -1.1,-0.9 -1.7,-1.2 z"
+             id="path5890"
+             inkscape:connector-curvature="0" /></g></g></g><linearGradient
+       id="SVGID_3_"
+       gradientUnits="userSpaceOnUse"
+       x1="45.1595"
+       y1="108.712"
+       x2="171.7285"
+       y2="108.712"><stop
+         offset="0"
+         style="stop-color:#00ADDC"
+         id="stop5893" /><stop
+         offset="1"
+         style="stop-color:#6BFBFF"
+         id="stop5895" /></linearGradient><path
+       class="st3"
+       d="m 169.7,95.5 0,36.9 c 0,11.6 -9.5,21 -21,21 l -80.5,0 c -11.6,0 -21,-9.5 -21,-21 l 0,-47.4 c 0,-11.6 9.5,-21 21,-21 l 80.5,0 c 7,0 13.3,3.5 17.1,8.8"
+       id="path5897"
+       style="fill:none;stroke:url(#SVGID_3_);stroke-width:4;stroke-miterlimit:10"
+       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/launcher/qml/images/webbrowser_active.svg b/launcher/qml/images/webbrowser_active.svg
deleted file mode 100644
index 70b4617..0000000
--- a/launcher/qml/images/webbrowser_active.svg
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<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"
-   id="Settings_Active"
-   x="0px"
-   y="0px"
-   viewBox="0 0 300 300"
-   style="enable-background:new 0 0 300 300;"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="webbrowser_active.svg"><metadata
-     id="metadata6110"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs6108" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1490"
-     inkscape:window-height="730"
-     id="namedview6106"
-     showgrid="false"
-     inkscape:zoom="0.78666667"
-     inkscape:cx="-90.254237"
-     inkscape:cy="150"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Settings_Active" /><style
-     type="text/css"
-     id="style6027">
-	.st0{fill:url(#SVGID_1_);}
-	.st1{opacity:0.4;fill:url(#SVGID_2_);enable-background:new    ;}
-	.st2{fill:url(#SVGID_3_);}
-	.st3{fill:url(#SVGID_4_);}
-	.st4{fill:url(#SVGID_5_);}
-	.st5{fill:url(#SVGID_6_);}
-	.st6{fill:url(#SVGID_7_);}
-	.st7{fill:url(#SVGID_8_);}
-</style><linearGradient
-     id="SVGID_1_"
-     gradientUnits="userSpaceOnUse"
-     x1="67.5042"
-     y1="-12.4026"
-     x2="207.9578"
-     y2="375.3077"
-     gradientTransform="matrix(1.3307804,0,0,-1.3314313,1.3518321,294.26058)"><stop
-       offset="0"
-       style="stop-color:#0DF9FF"
-       id="stop6030" /><stop
-       offset="9.208472e-02"
-       style="stop-color:#0DF9FF;stop-opacity:0.853"
-       id="stop6032" /><stop
-       offset="0.6264"
-       style="stop-color:#0DF9FF;stop-opacity:0"
-       id="stop6034" /></linearGradient><ellipse
-     class="st0"
-     cx="149.46768"
-     cy="149.93343"
-     id="circle6036"
-     style="fill:url(#SVGID_1_)"
-     rx="135.60652"
-     ry="135.67285" /><linearGradient
-     id="SVGID_2_"
-     gradientUnits="userSpaceOnUse"
-     x1="-104.3909"
-     y1="-193.5205"
-     x2="168.3364"
-     y2="188.2976"
-     gradientTransform="matrix(1.3307804,0,0,-1.3314313,1.3518321,294.26058)"><stop
-       offset="0.2978"
-       style="stop-color:#FFFFFF;stop-opacity:0"
-       id="stop6039" /><stop
-       offset="0.3685"
-       style="stop-color:#FAFAFA;stop-opacity:0.1007"
-       id="stop6041" /><stop
-       offset="0.4554"
-       style="stop-color:#EBEBEB;stop-opacity:0.2245"
-       id="stop6043" /><stop
-       offset="0.5508"
-       style="stop-color:#D2D2D2;stop-opacity:0.3603"
-       id="stop6045" /><stop
-       offset="0.6523"
-       style="stop-color:#AFAFAF;stop-opacity:0.5048"
-       id="stop6047" /><stop
-       offset="0.7585"
-       style="stop-color:#828282;stop-opacity:0.6562"
-       id="stop6049" /><stop
-       offset="0.8689"
-       style="stop-color:#4B4B4B;stop-opacity:0.8133"
-       id="stop6051" /><stop
-       offset="0.9806"
-       style="stop-color:#0C0C0C;stop-opacity:0.9724"
-       id="stop6053" /><stop
-       offset="1"
-       style="stop-color:#000000"
-       id="stop6055" /></linearGradient><ellipse
-     class="st1"
-     cx="149.46768"
-     cy="149.93343"
-     id="circle6057"
-     style="opacity:0.4;fill:url(#SVGID_2_);enable-background:new"
-     rx="135.60652"
-     ry="135.67285" /><g
-     id="g6059"
-     transform="matrix(1.3307804,0,0,1.3314313,1.3518321,1.3456942)"><linearGradient
-       id="SVGID_3_"
-       gradientUnits="userSpaceOnUse"
-       x1="-43.8396"
-       y1="-45.145401"
-       x2="272.5983"
-       y2="258.20679"
-       gradientTransform="matrix(1,0.00546456,0.00546456,-1,-3.8006,218.0353)"><stop
-         offset="0"
-         style="stop-color:#00ADDC"
-         id="stop6062" /><stop
-         offset="1"
-         style="stop-color:#6BFBFF"
-         id="stop6064" /></linearGradient><path
-       class="st2"
-       d="m 111.7,216.8 c -0.2,0 -0.4,0 -0.6,0 C 53.1,216.5 6.2,169.1 6.5,111.1 6.9,53.3 54,6.5 111.7,6.5 c 0.2,0 0.4,0 0.6,0 58,0.3 104.9,47.7 104.6,105.7 l 0,0 C 216.5,170 169.4,216.8 111.7,216.8 Z m 0,-206.6 C 56,10.2 10.5,55.4 10.2,111.1 c -0.3,55.9 45,101.7 100.9,102 0.2,0 0.4,0 0.6,0 55.7,0 101.2,-45.2 101.5,-100.9 0.3,-55.9 -45,-101.7 -100.9,-102 -0.2,0 -0.4,0 -0.6,0 z"
-       id="path6066"
-       style="fill:url(#SVGID_3_)"
-       inkscape:connector-curvature="0" /></g><g
-     id="_x38_ymwRc.tif"
-     transform="matrix(1.3307804,0,0,1.3314313,1.3518321,1.3456942)"><g
-       id="g6069"><linearGradient
-         id="SVGID_4_"
-         gradientUnits="userSpaceOnUse"
-         x1="47.166698"
-         y1="108.6"
-         x2="175.26669"
-         y2="108.6"
-         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
-           offset="0"
-           style="stop-color:#00ADDC"
-           id="stop6072" /><stop
-           offset="1"
-           style="stop-color:#6BFBFF"
-           id="stop6074" /></linearGradient><path
-         class="st3"
-         d="m 123.2,159.5 c -22.9,0 -45.7,0 -68.6,0 -3.9,0 -5.8,-2.3 -7.4,-5.3 0,-28.5 0,-57.1 0,-85.6 1.8,-4.1 4.9,-5.4 9.4,-5.4 36.6,0.1 73.2,0.1 109.7,0.1 6.7,0 9,2.3 9,9 0,26.1 0,52.3 0,78.4 0,6.5 -2.3,8.7 -8.9,8.8 -3,0 -11,0.1 -11,0.1 0,0 -2.3,-2 -3.9,-3.6 5.3,0 10,0 14.7,0 4.7,0 5.5,-0.8 5.5,-5.5 0,-22 0,-44 0.1,-66 0,-2.7 -0.8,-3.4 -3.5,-3.4 -38,0.1 -76,0.1 -114,0 -2.8,0 -3.4,0.9 -3.4,3.5 0.1,22.1 0.1,44.2 0.1,66.3 0,4.3 0.8,5.1 5.2,5.1 21.4,0 42.9,0 64.3,0 1,0 2,-0.1 2.9,0.1 M 111.2,77.7 c 18,0 35.9,0 53.9,0 6.6,0 6.5,0 6.4,-6.6 0,-2.9 -1.3,-4.2 -4.1,-4.2 -0.9,0 -1.7,0 -2.6,0 -35.7,0 -71.4,0 -107.1,0 -6.4,0 -6.7,0.3 -6.7,6.5 0,4.3 0,4.3 4.1,4.3 18.6,0 37.4,0 56.1,0 z"
-         id="path6076"
-         style="fill:url(#SVGID_4_)"
-         inkscape:connector-curvature="0" /><linearGradient
-         id="SVGID_5_"
-         gradientUnits="userSpaceOnUse"
-         x1="86.366699"
-         y1="147.7428"
-         x2="135.8667"
-         y2="147.7428"
-         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
-           offset="0"
-           style="stop-color:#00ADDC"
-           id="stop6079" /><stop
-           offset="1"
-           style="stop-color:#6BFBFF"
-           id="stop6081" /></linearGradient><path
-         class="st4"
-         d="m 111.5,70.5 c 7.1,0 14.2,0 21.2,0 1.4,0 3.2,-0.3 3.2,1.7 0,2 -1.8,1.8 -3.2,1.8 -14.4,0 -28.7,0 -43.1,0 -1.3,0 -3.2,0.4 -3.2,-1.7 0,-2.1 1.8,-1.8 3.2,-1.8 7.3,0 14.6,0 21.9,0 z"
-         id="path6083"
-         style="fill:url(#SVGID_5_)"
-         inkscape:connector-curvature="0" /><linearGradient
-         id="SVGID_6_"
-         gradientUnits="userSpaceOnUse"
-         x1="60.2943"
-         y1="147.79939"
-         x2="63.808201"
-         y2="147.79939"
-         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
-           offset="0"
-           style="stop-color:#00ADDC"
-           id="stop6086" /><stop
-           offset="1"
-           style="stop-color:#6BFBFF"
-           id="stop6088" /></linearGradient><path
-         class="st5"
-         d="m 63.8,72.2 c -0.1,0.9 -0.5,1.7 -1.6,1.7 -1.2,0.1 -1.9,-0.5 -1.9,-1.7 0,-1 0.6,-1.6 1.6,-1.7 1.2,-0.1 1.7,0.6 1.9,1.7 z"
-         id="path6090"
-         style="fill:url(#SVGID_6_)"
-         inkscape:connector-curvature="0" /><linearGradient
-         id="SVGID_7_"
-         gradientUnits="userSpaceOnUse"
-         x1="66.4795"
-         y1="147.7"
-         x2="69.944099"
-         y2="147.7"
-         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
-           offset="0"
-           style="stop-color:#00ADDC"
-           id="stop6093" /><stop
-           offset="1"
-           style="stop-color:#6BFBFF"
-           id="stop6095" /></linearGradient><path
-         class="st6"
-         d="m 68.6,74 c -1.3,0 -2,-0.5 -2.1,-1.5 -0.1,-1.1 0.4,-1.9 1.6,-1.9 1,0 1.7,0.5 1.8,1.5 0.2,1.1 -0.5,1.7 -1.3,1.9 z"
-         id="path6097"
-         style="fill:url(#SVGID_7_)"
-         inkscape:connector-curvature="0" /><linearGradient
-         id="SVGID_8_"
-         gradientUnits="userSpaceOnUse"
-         x1="54.3325"
-         y1="147.7989"
-         x2="57.717999"
-         y2="147.7989"
-         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
-           offset="0"
-           style="stop-color:#00ADDC"
-           id="stop6100" /><stop
-           offset="1"
-           style="stop-color:#6BFBFF"
-           id="stop6102" /></linearGradient><path
-         class="st7"
-         d="m 57.7,72.5 c -0.2,1.1 -0.9,1.5 -1.8,1.4 -1.2,-0.1 -1.7,-0.8 -1.5,-2 0.2,-1 0.8,-1.5 1.8,-1.4 1.2,0.2 1.6,1 1.5,2 z"
-         id="path6104"
-         style="fill:url(#SVGID_8_)"
-         inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/launcher/qml/images/webbrowser_inactive.svg b/launcher/qml/images/webbrowser_inactive.svg
deleted file mode 100644
index 09f34c9..0000000
--- a/launcher/qml/images/webbrowser_inactive.svg
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<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"
-   id="Settings_Active"
-   x="0px"
-   y="0px"
-   viewBox="0 0 300 300"
-   style="enable-background:new 0 0 300 300;"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="webbrowser_inactive.svg"><metadata
-     id="metadata56"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs54" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1345"
-     inkscape:window-height="856"
-     id="namedview52"
-     showgrid="false"
-     inkscape:zoom="0.78666667"
-     inkscape:cx="-87.711864"
-     inkscape:cy="150"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Settings_Active" /><style
-     type="text/css"
-     id="style3">
-	.st0{fill:url(#SVGID_1_);}
-	.st1{fill:url(#SVGID_2_);}
-	.st2{fill:url(#SVGID_3_);}
-	.st3{fill:url(#SVGID_4_);}
-	.st4{fill:url(#SVGID_5_);}
-	.st5{fill:url(#SVGID_6_);}
-</style><g
-     id="g5"
-     transform="matrix(1.3307804,0,0,1.3314313,1.3518321,1.3456942)"><linearGradient
-       id="SVGID_1_"
-       gradientUnits="userSpaceOnUse"
-       x1="-43.8396"
-       y1="-45.145401"
-       x2="272.5983"
-       y2="258.20679"
-       gradientTransform="matrix(1,0.00546456,0.00546456,-1,-3.8006,218.0353)"><stop
-         offset="0"
-         style="stop-color:#00ADDC"
-         id="stop8" /><stop
-         offset="1"
-         style="stop-color:#6BFBFF"
-         id="stop10" /></linearGradient><path
-       class="st0"
-       d="m 111.7,216.8 c -0.2,0 -0.4,0 -0.6,0 C 53.1,216.5 6.2,169.1 6.5,111.1 6.9,53.3 54,6.5 111.7,6.5 c 0.2,0 0.4,0 0.6,0 58,0.3 104.9,47.7 104.6,105.7 l 0,0 C 216.5,170 169.4,216.8 111.7,216.8 Z m 0,-206.6 C 56,10.2 10.5,55.4 10.2,111.1 c -0.3,55.9 45,101.7 100.9,102 0.2,0 0.4,0 0.6,0 55.7,0 101.2,-45.2 101.5,-100.9 0.3,-55.9 -45,-101.7 -100.9,-102 -0.2,0 -0.4,0 -0.6,0 z"
-       id="path12"
-       style="fill:url(#SVGID_1_)"
-       inkscape:connector-curvature="0" /></g><g
-     id="_x38_ymwRc.tif"
-     transform="matrix(1.3307804,0,0,1.3314313,1.3518321,1.3456942)"><g
-       id="g15"><linearGradient
-         id="SVGID_2_"
-         gradientUnits="userSpaceOnUse"
-         x1="47.166698"
-         y1="108.6"
-         x2="175.26669"
-         y2="108.6"
-         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
-           offset="0"
-           style="stop-color:#00ADDC"
-           id="stop18" /><stop
-           offset="1"
-           style="stop-color:#6BFBFF"
-           id="stop20" /></linearGradient><path
-         class="st1"
-         d="m 123.2,159.5 c -22.9,0 -45.7,0 -68.6,0 -3.9,0 -5.8,-2.3 -7.4,-5.3 0,-28.5 0,-57.1 0,-85.6 1.8,-4.1 4.9,-5.4 9.4,-5.4 36.6,0.1 73.2,0.1 109.7,0.1 6.7,0 9,2.3 9,9 0,26.1 0,52.3 0,78.4 0,6.5 -2.3,8.7 -8.9,8.8 -3,0 -11,0.1 -11,0.1 0,0 -2.3,-2 -3.9,-3.6 5.3,0 10,0 14.7,0 4.7,0 5.5,-0.8 5.5,-5.5 0,-22 0,-44 0.1,-66 0,-2.7 -0.8,-3.4 -3.5,-3.4 -38,0.1 -76,0.1 -114,0 -2.8,0 -3.4,0.9 -3.4,3.5 0.1,22.1 0.1,44.2 0.1,66.3 0,4.3 0.8,5.1 5.2,5.1 21.4,0 42.9,0 64.3,0 1,0 2,-0.1 2.9,0.1 M 111.2,77.7 c 18,0 35.9,0 53.9,0 6.6,0 6.5,0 6.4,-6.6 0,-2.9 -1.3,-4.2 -4.1,-4.2 -0.9,0 -1.7,0 -2.6,0 -35.7,0 -71.4,0 -107.1,0 -6.4,0 -6.7,0.3 -6.7,6.5 0,4.3 0,4.3 4.1,4.3 18.6,0 37.4,0 56.1,0 z"
-         id="path22"
-         style="fill:url(#SVGID_2_)"
-         inkscape:connector-curvature="0" /><linearGradient
-         id="SVGID_3_"
-         gradientUnits="userSpaceOnUse"
-         x1="86.366699"
-         y1="147.7428"
-         x2="135.8667"
-         y2="147.7428"
-         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
-           offset="0"
-           style="stop-color:#00ADDC"
-           id="stop25" /><stop
-           offset="1"
-           style="stop-color:#6BFBFF"
-           id="stop27" /></linearGradient><path
-         class="st2"
-         d="m 111.5,70.5 c 7.1,0 14.2,0 21.2,0 1.4,0 3.2,-0.3 3.2,1.7 0,2 -1.8,1.8 -3.2,1.8 -14.4,0 -28.7,0 -43.1,0 -1.3,0 -3.2,0.4 -3.2,-1.7 0,-2.1 1.8,-1.8 3.2,-1.8 7.3,0 14.6,0 21.9,0 z"
-         id="path29"
-         style="fill:url(#SVGID_3_)"
-         inkscape:connector-curvature="0" /><linearGradient
-         id="SVGID_4_"
-         gradientUnits="userSpaceOnUse"
-         x1="60.2943"
-         y1="147.79939"
-         x2="63.808201"
-         y2="147.79939"
-         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
-           offset="0"
-           style="stop-color:#00ADDC"
-           id="stop32" /><stop
-           offset="1"
-           style="stop-color:#6BFBFF"
-           id="stop34" /></linearGradient><path
-         class="st3"
-         d="m 63.8,72.2 c -0.1,0.9 -0.5,1.7 -1.6,1.7 -1.2,0.1 -1.9,-0.5 -1.9,-1.7 0,-1 0.6,-1.6 1.6,-1.7 1.2,-0.1 1.7,0.6 1.9,1.7 z"
-         id="path36"
-         style="fill:url(#SVGID_4_)"
-         inkscape:connector-curvature="0" /><linearGradient
-         id="SVGID_5_"
-         gradientUnits="userSpaceOnUse"
-         x1="66.4795"
-         y1="147.7"
-         x2="69.944099"
-         y2="147.7"
-         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
-           offset="0"
-           style="stop-color:#00ADDC"
-           id="stop39" /><stop
-           offset="1"
-           style="stop-color:#6BFBFF"
-           id="stop41" /></linearGradient><path
-         class="st4"
-         d="m 68.6,74 c -1.3,0 -2,-0.5 -2.1,-1.5 -0.1,-1.1 0.4,-1.9 1.6,-1.9 1,0 1.7,0.5 1.8,1.5 0.2,1.1 -0.5,1.7 -1.3,1.9 z"
-         id="path43"
-         style="fill:url(#SVGID_5_)"
-         inkscape:connector-curvature="0" /><linearGradient
-         id="SVGID_6_"
-         gradientUnits="userSpaceOnUse"
-         x1="54.3325"
-         y1="147.7989"
-         x2="57.717999"
-         y2="147.7989"
-         gradientTransform="matrix(1,0,0,-1,0,220)"><stop
-           offset="0"
-           style="stop-color:#00ADDC"
-           id="stop46" /><stop
-           offset="1"
-           style="stop-color:#6BFBFF"
-           id="stop48" /></linearGradient><path
-         class="st5"
-         d="m 57.7,72.5 c -0.2,1.1 -0.9,1.5 -1.8,1.4 -1.2,-0.1 -1.7,-0.8 -1.5,-2 0.2,-1 0.8,-1.5 1.8,-1.4 1.2,0.2 1.6,1 1.5,2 z"
-         id="path50"
-         style="fill:url(#SVGID_6_)"
-         inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/launcher/src/applicationmodel.cpp b/launcher/src/applicationmodel.cpp
index 17e38fb..090a300 100644
--- a/launcher/src/applicationmodel.cpp
+++ b/launcher/src/applicationmodel.cpp
@@ -60,10 +60,11 @@ ApplicationModel::Private::Private()
         auto const id = jso["id"].toString();
         auto const icon = get_icon_name(jso);
 
-        if ( name != "launcher" &&
-             name != "homescreen-2017" &&
-             name != "homescreen" &&
-             name != "OnScreenApp") {
+        // Hide HomeScreen icon itself
+        if (name != "launcher" && 
+	    name != "homescreen-2017" && 
+	    name != "homescreen" && 
+	    !name.contains("OnScreen", Qt::CaseInsensitive)) {
             this->data.append(AppInfo(icon, name, id));
         }
 
-- 
cgit 1.2.3-korg