diff --git a/interface/resources/icons/tablet-icons/clap-a.svg b/interface/resources/icons/tablet-icons/clap-a.svg
index 10a8e3ea98..60df3e0795 100644
--- a/interface/resources/icons/tablet-icons/clap-a.svg
+++ b/interface/resources/icons/tablet-icons/clap-a.svg
@@ -9,13 +9,13 @@
    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="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
+   width="225pt"
+   height="225pt"
+   viewBox="0 0 79.374998 79.374998"
    version="1.1"
    id="svg8"
    inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="ClapBlack.svg">
+   sodipodi:docname="clap-a.svg">
   <defs
      id="defs2" />
   <sodipodi:namedview
@@ -25,17 +25,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="-1800.9694"
-     inkscape:cy="1644.4317"
+     inkscape:zoom="2.8"
+     inkscape:cx="240.0566"
+     inkscape:cy="147.59313"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g3790"
      showgrid="false"
      inkscape:window-width="2560"
      inkscape:window-height="1377"
      inkscape:window-x="1912"
      inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="true"
+     units="pt" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -51,7 +53,8 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(0,-217.62501)">
     <g
        id="g3790"
        transform="translate(-276.67857,-1.5119048)"
@@ -60,45 +63,50 @@
          sodipodi:nodetypes="ccscccsccscssscscsscsccc"
          inkscape:connector-curvature="0"
          id="path3764"
-         d="m -284.61607,-7.2708335 67.27976,25.7023805 c 0,0 1.13393,-13.6071425 12.85119,-19.6547614 11.71726,-6.0476191 27.97024,-49.1369046 27.97024,-49.1369046 l 5.29167,-24.946427 6.80357,-25.702384 c 0,0 2.12085,-16.96991 -10.58333,-10.20535 -29.10417,15.497021 -24.19048,48.758924 -24.19048,48.758924 0,0 -1.98438,-29.765625 -0.85044,-44.790184 0.75595,-8.69345 1.98437,-36.85267 0.85044,-53.48363 -1.13393,-16.63095 -2.64583,-18.8988 -7.55952,-18.52083 -4.91369,0.37798 -8.31548,2.64583 -12.47322,25.70238 -4.15773,23.05655 -9.4494,44.60119 -8.69345,53.67262 0.75595,9.07143 -5.29167,0.755954 -1.13393,-16.63095 4.15774,-17.3869 12.47322,-54.05059 12.85119,-59.34226 0.37798,-5.29167 -8.31547,-17.76488 -16.63095,-4.91369 -8.31548,12.85119 -23.8125,89.391366 -23.8125,89.391366 0,0 1.97651,-26.642916 19.46577,-82.682286 1.0817,-3.466 -8.50446,-5.19718 -10.77232,-1.03944 -2.26786,4.15774 -10.20535,17.38691 -12.09524,26.08036 -1.88988,8.69345 -9.82738,54.050591 -15.11904,59.720233 -5.29167,5.669645 4.49743,-7.099475 13.60714,-58.113833 -9.817,-24.71133 -28.27858,49.543233 -30.23808,75.500739 -4.9137,31.372023 7.55951,41.577381 7.18153,64.6339275 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 287.04656,288.04665 23.71378,9.0592 c 0,0 0.39967,-4.79605 4.5296,-6.92762 4.12992,-2.13158 7.40168,-15.99614 7.40168,-15.99614 l 2.5266,-9.92668 4.1934,-9.24819 c 0,0 -1.13082,-3.82467 -4.67519,-0.19524 -8.8408,9.05294 -3.51813,14.25651 -8.14833,14.16202 -3.77977,-0.75596 -0.13245,-10.86933 0.26722,-16.16497 0.26644,-3.06413 0.69941,-12.98928 0.29974,-18.85112 -0.39966,-5.86184 -0.93256,-6.66118 -2.66446,-6.52795 -1.73191,0.13322 -2.93093,0.93257 -4.39638,9.05919 -1.46546,8.12664 -3.33058,15.72038 -3.06414,18.91774 0.26644,3.19737 -4.36307,0.64443 -2.89762,-5.48385 1.46546,-6.12827 4.82299,-19.49577 4.95621,-21.36089 0.13322,-1.86512 -0.52548,-5.99423 -3.45641,-1.46464 -2.93091,4.52961 -8.39307,31.77464 -8.39307,31.77464 0,0 -4.61911,1.35544 4.75249,-29.62183 0.37058,-1.22492 -1.2231,-1.82036 -2.02245,-0.35491 -0.79933,1.46547 -2.93556,6.41177 -3.60169,9.47592 -0.66612,3.06413 -4.12526,18.76747 -5.99039,20.76582 -1.86514,1.99836 -0.77914,-1.64516 2.43172,-19.62594 -3.46015,-8.7099 -7.6029,16.6051 -8.29355,25.75422 -1.73191,11.05755 2.66446,14.65459 2.53124,22.78122 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccscssscscccccssc"
+         sodipodi:nodetypes="ccscsssccccccssc"
          inkscape:connector-curvature="0"
          id="path3766"
-         d="m -178.02678,-41.666667 18.52083,9.827381 c 0,0 17.00893,0.755952 22.30059,3.401785 5.29167,2.645834 41.19941,-54.806545 41.19941,-54.806545 0,0 -4.53572,-1.13393 -9.07143,-15.119048 -4.53571,-13.985116 -21.54464,-56.696426 -26.83631,-66.523806 -5.29167,-9.82738 -7.18155,-13.22917 -9.82738,-21.16667 -2.64583,-7.9375 -6.04762,-14.3631 -10.58333,-0.37797 -4.53572,13.98511 -6.4256,32.12797 -3.02381,41.95535 3.40178,9.82738 4.53571,7.9375 3.02381,17.00893 -1.51191,9.07143 -2.64584,28.348214 0,33.261905 2.64583,4.913688 -4.34848,-6.617405 -3.02381,-32.505955 l -41.57738,-26.08036 -2.09231,69.82276 c 0,0 10.27982,-27.83049 28.28337,-31.02091 12.79747,-2.26785 6.6667,13.23175 2.11129,34.884518 -3.82434,18.177888 -9.40354,37.438635 -9.40354,37.438635 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 326.28601,276.79194 4.85752,2.59518 c 0,0 5.99506,0.26645 7.86018,1.19902 1.86513,0.93256 14.52136,-19.31742 14.52136,-19.31742 0,0 -1.59867,-0.39967 -3.19735,-5.32893 -1.59868,-4.92926 -7.59374,-19.98353 -9.45888,-23.44734 -1.86513,-3.46381 -2.53124,-4.66283 -3.4638,-7.46051 -0.93257,-2.7977 -2.13159,-5.0625 -3.73027,-0.13323 -1.59868,4.92927 -1.66343,10.45537 -0.46441,13.91919 1.38613,5.18454 3.8952,15.07683 1.97631,17.7369 -3.13067,-0.0635 -4.1718,-8.94257 -4.84078,-11.98701 l -10.45574,-8.48036 -1.15458,18.13553 c 0,0 3.30736,-4.0697 9.65298,-5.19422 4.51067,-0.79933 2.81751,6.4678 1.21188,14.09965 -1.34794,6.40707 -3.31442,13.66355 -3.31442,13.66355 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="csccccc"
+         sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
          id="path3768"
-         d="m -255.2424,-164.77493 c 0,0 -5.17771,7.37883 -4.94448,12.62849 0.13926,3.13454 -1.06908,-4.6104 -4.94448,-2.53906 -3.87541,2.07134 -5.61266,4.00904 -5.61266,4.00904 0,0 -4.40994,-4.81085 -0.73499,-12.36121 3.67493,-7.55037 10.55714,-4.6104 11.69303,-4.00904 1.1359,0.60135 2.73952,1.9377 4.54358,2.27178 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 291.74698,236.36722 c 0,0 -1.36535,-0.56172 -0.0701,-3.22296 1.29528,-2.66125 3.72103,-1.62503 4.12138,-1.41306 -1.04349,0.50764 -3.37926,4.82292 -4.05132,4.63602 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path3770"
-         d="m -306.29087,-42.165031 c 0,0 -5.07812,-19.243405 1.60361,-44.901278 6.68174,-25.657881 -14.96708,16.83798 -1.60361,44.901278 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 278.60514,277.01718 c 0,0 -0.98806,-8.05217 1.36702,-17.09567 5.11868,-12.29479 -7.76345,3.61446 -1.36702,17.09567 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
       <path
          inkscape:connector-curvature="0"
          id="path3772"
-         d="m -297.47099,-77.979147 c 0,0 -5.87991,31.537803 1.60362,48.375783 7.48355,16.837982 -14.43255,-11.759858 -1.60362,-48.375783 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 283.64252,261.72126 c 0,-0.0431 -1.44898,3.96362 -0.80247,9.53246 0.42679,3.67631 0.64575,8.36037 1.90705,11.72782 3.10143,7.14376 -8.41694,-7.43352 -1.10458,-21.26028 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.11350404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cscc" />
       <path
          inkscape:connector-curvature="0"
          id="path3774"
-         d="m -196.4431,10.219797 c 0,0 18.97614,-13.3634764 25.92514,-37.952273 -5.61266,22.7179099 -15.23436,30.2014566 -25.92514,37.952273 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 318.12446,294.21149 c 0,0 6.68844,-4.71017 9.13772,-13.37686 -5.91279,4.63412 -6.77642,9.57974 -9.13772,13.37686 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
       <path
          inkscape:connector-curvature="0"
          id="path3778"
-         d="m -122.40944,-169.11805 c 0,0 14.96709,27.52876 25.390604,63.61014 10.423511,36.08139 1.069078,-20.84702 -25.390604,-63.61014 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 344.21877,231.00112 c 0,0 1.60041,9.36884 7.07841,21.7522 5.35526,12.10587 4.05178,-4.80879 -7.07841,-21.7522 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="csc" />
       <path
          inkscape:connector-curvature="0"
          id="path3780"
-         d="m -109.84778,-163.23813 c 0,0 15.501638,25.65788 17.105256,39.82316 1.603616,14.16529 5.078121,-11.75985 -17.105256,-39.82316 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 349.44951,230.90023 c -0.11119,-0.0477 0.96041,8.99393 4.75948,15.37263 1.48524,4.17497 3.73499,-6.08181 -4.75948,-15.37263 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
     </g>
   </g>
 </svg>
diff --git a/interface/resources/icons/tablet-icons/clap-i.svg b/interface/resources/icons/tablet-icons/clap-i.svg
index 3e4ecb0b64..fbd9ed0f9c 100644
--- a/interface/resources/icons/tablet-icons/clap-i.svg
+++ b/interface/resources/icons/tablet-icons/clap-i.svg
@@ -9,13 +9,13 @@
    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="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
+   width="225pt"
+   height="225pt"
+   viewBox="0 0 79.374998 79.374998"
    version="1.1"
    id="svg8"
    inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="ClapWhite.svg">
+   sodipodi:docname="clap-i.svg">
   <defs
      id="defs2" />
   <sodipodi:namedview
@@ -25,17 +25,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="-2033.1122"
-     inkscape:cy="1644.4317"
+     inkscape:zoom="2.8"
+     inkscape:cx="240.0566"
+     inkscape:cy="147.59313"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g3790"
      showgrid="false"
      inkscape:window-width="2560"
      inkscape:window-height="1377"
      inkscape:window-x="1912"
      inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="true"
+     units="pt" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -51,54 +53,60 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(0,-217.62501)">
     <g
        id="g3790"
        transform="translate(-276.67857,-1.5119048)"
-       style="fill:#ffffff;opacity:1;stroke:none">
+       style="fill:#000000">
       <path
          sodipodi:nodetypes="ccscccsccscssscscsscsccc"
          inkscape:connector-curvature="0"
          id="path3764"
-         d="m -284.61607,-7.2708335 67.27976,25.7023805 c 0,0 1.13393,-13.6071425 12.85119,-19.6547614 11.71726,-6.0476191 27.97024,-49.1369046 27.97024,-49.1369046 l 5.29167,-24.946427 6.80357,-25.702384 c 0,0 2.12085,-16.96991 -10.58333,-10.20535 -29.10417,15.497021 -24.19048,48.758924 -24.19048,48.758924 0,0 -1.98438,-29.765625 -0.85044,-44.790184 0.75595,-8.69345 1.98437,-36.85267 0.85044,-53.48363 -1.13393,-16.63095 -2.64583,-18.8988 -7.55952,-18.52083 -4.91369,0.37798 -8.31548,2.64583 -12.47322,25.70238 -4.15773,23.05655 -9.4494,44.60119 -8.69345,53.67262 0.75595,9.07143 -5.29167,0.755954 -1.13393,-16.63095 4.15774,-17.3869 12.47322,-54.05059 12.85119,-59.34226 0.37798,-5.29167 -8.31547,-17.76488 -16.63095,-4.91369 -8.31548,12.85119 -23.8125,89.391366 -23.8125,89.391366 0,0 1.97651,-26.642916 19.46577,-82.682286 1.0817,-3.466 -8.50446,-5.19718 -10.77232,-1.03944 -2.26786,4.15774 -10.20535,17.38691 -12.09524,26.08036 -1.88988,8.69345 -9.82738,54.050591 -15.11904,59.720233 -5.29167,5.669645 4.49743,-7.099475 13.60714,-58.113833 -9.817,-24.71133 -28.27858,49.543233 -30.23808,75.500739 -4.9137,31.372023 7.55951,41.577381 7.18153,64.6339275 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 287.04656,288.04665 23.71378,9.0592 c 0,0 0.39967,-4.79605 4.5296,-6.92762 4.12992,-2.13158 7.40168,-15.99614 7.40168,-15.99614 l 2.5266,-9.92668 4.1934,-9.24819 c 0,0 -1.13082,-3.82467 -4.67519,-0.19524 -8.8408,9.05294 -3.51813,14.25651 -8.14833,14.16202 -3.77977,-0.75596 -0.13245,-10.86933 0.26722,-16.16497 0.26644,-3.06413 0.69941,-12.98928 0.29974,-18.85112 -0.39966,-5.86184 -0.93256,-6.66118 -2.66446,-6.52795 -1.73191,0.13322 -2.93093,0.93257 -4.39638,9.05919 -1.46546,8.12664 -3.33058,15.72038 -3.06414,18.91774 0.26644,3.19737 -4.36307,0.64443 -2.89762,-5.48385 1.46546,-6.12827 4.82299,-19.49577 4.95621,-21.36089 0.13322,-1.86512 -0.52548,-5.99423 -3.45641,-1.46464 -2.93091,4.52961 -8.39307,31.77464 -8.39307,31.77464 0,0 -4.61911,1.35544 4.75249,-29.62183 0.37058,-1.22492 -1.2231,-1.82036 -2.02245,-0.35491 -0.79933,1.46547 -2.93556,6.41177 -3.60169,9.47592 -0.66612,3.06413 -4.12526,18.76747 -5.99039,20.76582 -1.86514,1.99836 -0.77914,-1.64516 2.43172,-19.62594 -3.46015,-8.7099 -7.6029,16.6051 -8.29355,25.75422 -1.73191,11.05755 2.66446,14.65459 2.53124,22.78122 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccscssscscccccssc"
+         sodipodi:nodetypes="ccscsssccccccssc"
          inkscape:connector-curvature="0"
          id="path3766"
-         d="m -178.02678,-41.666667 18.52083,9.827381 c 0,0 17.00893,0.755952 22.30059,3.401785 5.29167,2.645834 41.19941,-54.806545 41.19941,-54.806545 0,0 -4.53572,-1.13393 -9.07143,-15.119048 -4.53571,-13.985116 -21.54464,-56.696426 -26.83631,-66.523806 -5.29167,-9.82738 -7.18155,-13.22917 -9.82738,-21.16667 -2.64583,-7.9375 -6.04762,-14.3631 -10.58333,-0.37797 -4.53572,13.98511 -6.4256,32.12797 -3.02381,41.95535 3.40178,9.82738 4.53571,7.9375 3.02381,17.00893 -1.51191,9.07143 -2.64584,28.348214 0,33.261905 2.64583,4.913688 -4.34848,-6.617405 -3.02381,-32.505955 l -41.57738,-26.08036 -2.09231,69.82276 c 0,0 10.27982,-27.83049 28.28337,-31.02091 12.79747,-2.26785 6.6667,13.23175 2.11129,34.884518 -3.82434,18.177888 -9.40354,37.438635 -9.40354,37.438635 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 326.28601,276.79194 4.85752,2.59518 c 0,0 5.99506,0.26645 7.86018,1.19902 1.86513,0.93256 14.52136,-19.31742 14.52136,-19.31742 0,0 -1.59867,-0.39967 -3.19735,-5.32893 -1.59868,-4.92926 -7.59374,-19.98353 -9.45888,-23.44734 -1.86513,-3.46381 -2.53124,-4.66283 -3.4638,-7.46051 -0.93257,-2.7977 -2.13159,-5.0625 -3.73027,-0.13323 -1.59868,4.92927 -1.66343,10.45537 -0.46441,13.91919 1.38613,5.18454 3.8952,15.07683 1.97631,17.7369 -3.13067,-0.0635 -4.1718,-8.94257 -4.84078,-11.98701 l -10.45574,-8.48036 -1.15458,18.13553 c 0,0 3.30736,-4.0697 9.65298,-5.19422 4.51067,-0.79933 2.81751,6.4678 1.21188,14.09965 -1.34794,6.40707 -3.31442,13.66355 -3.31442,13.66355 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="csccccc"
+         sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
          id="path3768"
-         d="m -255.2424,-164.77493 c 0,0 -5.17771,7.37883 -4.94448,12.62849 0.13926,3.13454 -1.06908,-4.6104 -4.94448,-2.53906 -3.87541,2.07134 -5.61266,4.00904 -5.61266,4.00904 0,0 -4.40994,-4.81085 -0.73499,-12.36121 3.67493,-7.55037 10.55714,-4.6104 11.69303,-4.00904 1.1359,0.60135 2.73952,1.9377 4.54358,2.27178 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 291.74698,236.36722 c 0,0 -1.36535,-0.56172 -0.0701,-3.22296 1.29528,-2.66125 3.72103,-1.62503 4.12138,-1.41306 -1.04349,0.50764 -3.37926,4.82292 -4.05132,4.63602 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path3770"
-         d="m -306.29087,-42.165031 c 0,0 -5.07812,-19.243405 1.60361,-44.901278 6.68174,-25.657881 -14.96708,16.83798 -1.60361,44.901278 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 278.60514,277.01718 c 0,0 -0.98806,-8.05217 1.36702,-17.09567 5.11868,-12.29479 -7.76345,3.61446 -1.36702,17.09567 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
       <path
          inkscape:connector-curvature="0"
          id="path3772"
-         d="m -297.47099,-77.979147 c 0,0 -5.87991,31.537803 1.60362,48.375783 7.48355,16.837982 -14.43255,-11.759858 -1.60362,-48.375783 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 283.64252,261.72126 c 0,-0.0431 -1.44898,3.96362 -0.80247,9.53246 0.42679,3.67631 0.64575,8.36037 1.90705,11.72782 3.10143,7.14376 -8.41694,-7.43352 -1.10458,-21.26028 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.11350404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cscc" />
       <path
          inkscape:connector-curvature="0"
          id="path3774"
-         d="m -196.4431,10.219797 c 0,0 18.97614,-13.3634764 25.92514,-37.952273 -5.61266,22.7179099 -15.23436,30.2014566 -25.92514,37.952273 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 318.12446,294.21149 c 0,0 6.68844,-4.71017 9.13772,-13.37686 -5.91279,4.63412 -6.77642,9.57974 -9.13772,13.37686 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
       <path
          inkscape:connector-curvature="0"
          id="path3778"
-         d="m -122.40944,-169.11805 c 0,0 14.96709,27.52876 25.390604,63.61014 10.423511,36.08139 1.069078,-20.84702 -25.390604,-63.61014 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 344.21877,231.00112 c 0,0 1.60041,9.36884 7.07841,21.7522 5.35526,12.10587 4.05178,-4.80879 -7.07841,-21.7522 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="csc" />
       <path
          inkscape:connector-curvature="0"
          id="path3780"
-         d="m -109.84778,-163.23813 c 0,0 15.501638,25.65788 17.105256,39.82316 1.603616,14.16529 5.078121,-11.75985 -17.105256,-39.82316 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 349.44951,230.90023 c -0.11119,-0.0477 0.96041,8.99393 4.75948,15.37263 1.48524,4.17497 3.73499,-6.08181 -4.75948,-15.37263 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
     </g>
   </g>
 </svg>
diff --git a/unpublishedScripts/marketplace/clap/clapApp.js b/unpublishedScripts/marketplace/clap/clapApp.js
index a32937d6dd..294a7171b3 100644
--- a/unpublishedScripts/marketplace/clap/clapApp.js
+++ b/unpublishedScripts/marketplace/clap/clapApp.js
@@ -15,12 +15,12 @@
 
 // Load up engine
 var APP_NAME = "CLAP";
-var ClapEngine = Script.require(Script.resolvePath("scripts/ClapEngine.js?v6"));
+var ClapEngine = Script.require(Script.resolvePath("scripts/ClapEngine.js?v9"));
 var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 
 // Define Menu
-var blackIcon = Script.resolvePath("icons/tablet-icons/clap-a.svg");
-var whiteIcon =Script.resolvePath("icons/tablet-icons/clap-i.svg");
+var blackIcon = Script.resolvePath("http://mpassets.highfidelity.com/797180be-1d5d-4465-816e-fada92aa727a-v1/icons/clap-a.svg?foxv2");
+var whiteIcon = Script.resolvePath("http://mpassets.highfidelity.com/797180be-1d5d-4465-816e-fada92aa727a-v1/icons/clap-i.svg?foxv2");
 var isActive = true;
 
 var activeButton = tablet.addButton({
diff --git a/unpublishedScripts/marketplace/clap/icons/clap-a.svg b/unpublishedScripts/marketplace/clap/icons/clap-a.svg
new file mode 100644
index 0000000000..60df3e0795
--- /dev/null
+++ b/unpublishedScripts/marketplace/clap/icons/clap-a.svg
@@ -0,0 +1,112 @@
+<?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="225pt"
+   height="225pt"
+   viewBox="0 0 79.374998 79.374998"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="clap-a.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="240.0566"
+     inkscape:cy="147.59313"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g3790"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="true"
+     units="pt" />
+  <metadata
+     id="metadata5">
+    <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,-217.62501)">
+    <g
+       id="g3790"
+       transform="translate(-276.67857,-1.5119048)"
+       style="fill:#000000">
+      <path
+         sodipodi:nodetypes="ccscccsccscssscscsscsccc"
+         inkscape:connector-curvature="0"
+         id="path3764"
+         d="m 287.04656,288.04665 23.71378,9.0592 c 0,0 0.39967,-4.79605 4.5296,-6.92762 4.12992,-2.13158 7.40168,-15.99614 7.40168,-15.99614 l 2.5266,-9.92668 4.1934,-9.24819 c 0,0 -1.13082,-3.82467 -4.67519,-0.19524 -8.8408,9.05294 -3.51813,14.25651 -8.14833,14.16202 -3.77977,-0.75596 -0.13245,-10.86933 0.26722,-16.16497 0.26644,-3.06413 0.69941,-12.98928 0.29974,-18.85112 -0.39966,-5.86184 -0.93256,-6.66118 -2.66446,-6.52795 -1.73191,0.13322 -2.93093,0.93257 -4.39638,9.05919 -1.46546,8.12664 -3.33058,15.72038 -3.06414,18.91774 0.26644,3.19737 -4.36307,0.64443 -2.89762,-5.48385 1.46546,-6.12827 4.82299,-19.49577 4.95621,-21.36089 0.13322,-1.86512 -0.52548,-5.99423 -3.45641,-1.46464 -2.93091,4.52961 -8.39307,31.77464 -8.39307,31.77464 0,0 -4.61911,1.35544 4.75249,-29.62183 0.37058,-1.22492 -1.2231,-1.82036 -2.02245,-0.35491 -0.79933,1.46547 -2.93556,6.41177 -3.60169,9.47592 -0.66612,3.06413 -4.12526,18.76747 -5.99039,20.76582 -1.86514,1.99836 -0.77914,-1.64516 2.43172,-19.62594 -3.46015,-8.7099 -7.6029,16.6051 -8.29355,25.75422 -1.73191,11.05755 2.66446,14.65459 2.53124,22.78122 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccscsssccccccssc"
+         inkscape:connector-curvature="0"
+         id="path3766"
+         d="m 326.28601,276.79194 4.85752,2.59518 c 0,0 5.99506,0.26645 7.86018,1.19902 1.86513,0.93256 14.52136,-19.31742 14.52136,-19.31742 0,0 -1.59867,-0.39967 -3.19735,-5.32893 -1.59868,-4.92926 -7.59374,-19.98353 -9.45888,-23.44734 -1.86513,-3.46381 -2.53124,-4.66283 -3.4638,-7.46051 -0.93257,-2.7977 -2.13159,-5.0625 -3.73027,-0.13323 -1.59868,4.92927 -1.66343,10.45537 -0.46441,13.91919 1.38613,5.18454 3.8952,15.07683 1.97631,17.7369 -3.13067,-0.0635 -4.1718,-8.94257 -4.84078,-11.98701 l -10.45574,-8.48036 -1.15458,18.13553 c 0,0 3.30736,-4.0697 9.65298,-5.19422 4.51067,-0.79933 2.81751,6.4678 1.21188,14.09965 -1.34794,6.40707 -3.31442,13.66355 -3.31442,13.66355 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path3768"
+         d="m 291.74698,236.36722 c 0,0 -1.36535,-0.56172 -0.0701,-3.22296 1.29528,-2.66125 3.72103,-1.62503 4.12138,-1.41306 -1.04349,0.50764 -3.37926,4.82292 -4.05132,4.63602 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3770"
+         d="m 278.60514,277.01718 c 0,0 -0.98806,-8.05217 1.36702,-17.09567 5.11868,-12.29479 -7.76345,3.61446 -1.36702,17.09567 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3772"
+         d="m 283.64252,261.72126 c 0,-0.0431 -1.44898,3.96362 -0.80247,9.53246 0.42679,3.67631 0.64575,8.36037 1.90705,11.72782 3.10143,7.14376 -8.41694,-7.43352 -1.10458,-21.26028 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.11350404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cscc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3774"
+         d="m 318.12446,294.21149 c 0,0 6.68844,-4.71017 9.13772,-13.37686 -5.91279,4.63412 -6.77642,9.57974 -9.13772,13.37686 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3778"
+         d="m 344.21877,231.00112 c 0,0 1.60041,9.36884 7.07841,21.7522 5.35526,12.10587 4.05178,-4.80879 -7.07841,-21.7522 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="csc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3780"
+         d="m 349.44951,230.90023 c -0.11119,-0.0477 0.96041,8.99393 4.75948,15.37263 1.48524,4.17497 3.73499,-6.08181 -4.75948,-15.37263 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+    </g>
+  </g>
+</svg>
diff --git a/unpublishedScripts/marketplace/clap/icons/clap-black-icon.svg b/unpublishedScripts/marketplace/clap/icons/clap-black-icon.svg
deleted file mode 100644
index 10a8e3ea98..0000000000
--- a/unpublishedScripts/marketplace/clap/icons/clap-black-icon.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="ClapBlack.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="-1800.9694"
-     inkscape:cy="1644.4317"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1377"
-     inkscape:window-x="1912"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <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">
-    <g
-       id="g3790"
-       transform="translate(-276.67857,-1.5119048)"
-       style="fill:#000000">
-      <path
-         sodipodi:nodetypes="ccscccsccscssscscsscsccc"
-         inkscape:connector-curvature="0"
-         id="path3764"
-         d="m -284.61607,-7.2708335 67.27976,25.7023805 c 0,0 1.13393,-13.6071425 12.85119,-19.6547614 11.71726,-6.0476191 27.97024,-49.1369046 27.97024,-49.1369046 l 5.29167,-24.946427 6.80357,-25.702384 c 0,0 2.12085,-16.96991 -10.58333,-10.20535 -29.10417,15.497021 -24.19048,48.758924 -24.19048,48.758924 0,0 -1.98438,-29.765625 -0.85044,-44.790184 0.75595,-8.69345 1.98437,-36.85267 0.85044,-53.48363 -1.13393,-16.63095 -2.64583,-18.8988 -7.55952,-18.52083 -4.91369,0.37798 -8.31548,2.64583 -12.47322,25.70238 -4.15773,23.05655 -9.4494,44.60119 -8.69345,53.67262 0.75595,9.07143 -5.29167,0.755954 -1.13393,-16.63095 4.15774,-17.3869 12.47322,-54.05059 12.85119,-59.34226 0.37798,-5.29167 -8.31547,-17.76488 -16.63095,-4.91369 -8.31548,12.85119 -23.8125,89.391366 -23.8125,89.391366 0,0 1.97651,-26.642916 19.46577,-82.682286 1.0817,-3.466 -8.50446,-5.19718 -10.77232,-1.03944 -2.26786,4.15774 -10.20535,17.38691 -12.09524,26.08036 -1.88988,8.69345 -9.82738,54.050591 -15.11904,59.720233 -5.29167,5.669645 4.49743,-7.099475 13.60714,-58.113833 -9.817,-24.71133 -28.27858,49.543233 -30.23808,75.500739 -4.9137,31.372023 7.55951,41.577381 7.18153,64.6339275 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccscssscscccccssc"
-         inkscape:connector-curvature="0"
-         id="path3766"
-         d="m -178.02678,-41.666667 18.52083,9.827381 c 0,0 17.00893,0.755952 22.30059,3.401785 5.29167,2.645834 41.19941,-54.806545 41.19941,-54.806545 0,0 -4.53572,-1.13393 -9.07143,-15.119048 -4.53571,-13.985116 -21.54464,-56.696426 -26.83631,-66.523806 -5.29167,-9.82738 -7.18155,-13.22917 -9.82738,-21.16667 -2.64583,-7.9375 -6.04762,-14.3631 -10.58333,-0.37797 -4.53572,13.98511 -6.4256,32.12797 -3.02381,41.95535 3.40178,9.82738 4.53571,7.9375 3.02381,17.00893 -1.51191,9.07143 -2.64584,28.348214 0,33.261905 2.64583,4.913688 -4.34848,-6.617405 -3.02381,-32.505955 l -41.57738,-26.08036 -2.09231,69.82276 c 0,0 10.27982,-27.83049 28.28337,-31.02091 12.79747,-2.26785 6.6667,13.23175 2.11129,34.884518 -3.82434,18.177888 -9.40354,37.438635 -9.40354,37.438635 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="csccccc"
-         inkscape:connector-curvature="0"
-         id="path3768"
-         d="m -255.2424,-164.77493 c 0,0 -5.17771,7.37883 -4.94448,12.62849 0.13926,3.13454 -1.06908,-4.6104 -4.94448,-2.53906 -3.87541,2.07134 -5.61266,4.00904 -5.61266,4.00904 0,0 -4.40994,-4.81085 -0.73499,-12.36121 3.67493,-7.55037 10.55714,-4.6104 11.69303,-4.00904 1.1359,0.60135 2.73952,1.9377 4.54358,2.27178 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3770"
-         d="m -306.29087,-42.165031 c 0,0 -5.07812,-19.243405 1.60361,-44.901278 6.68174,-25.657881 -14.96708,16.83798 -1.60361,44.901278 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3772"
-         d="m -297.47099,-77.979147 c 0,0 -5.87991,31.537803 1.60362,48.375783 7.48355,16.837982 -14.43255,-11.759858 -1.60362,-48.375783 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3774"
-         d="m -196.4431,10.219797 c 0,0 18.97614,-13.3634764 25.92514,-37.952273 -5.61266,22.7179099 -15.23436,30.2014566 -25.92514,37.952273 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3778"
-         d="m -122.40944,-169.11805 c 0,0 14.96709,27.52876 25.390604,63.61014 10.423511,36.08139 1.069078,-20.84702 -25.390604,-63.61014 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3780"
-         d="m -109.84778,-163.23813 c 0,0 15.501638,25.65788 17.105256,39.82316 1.603616,14.16529 5.078121,-11.75985 -17.105256,-39.82316 z"
-         style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/unpublishedScripts/marketplace/clap/icons/clap-i.svg b/unpublishedScripts/marketplace/clap/icons/clap-i.svg
new file mode 100644
index 0000000000..fbd9ed0f9c
--- /dev/null
+++ b/unpublishedScripts/marketplace/clap/icons/clap-i.svg
@@ -0,0 +1,112 @@
+<?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="225pt"
+   height="225pt"
+   viewBox="0 0 79.374998 79.374998"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="clap-i.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="240.0566"
+     inkscape:cy="147.59313"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g3790"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="true"
+     units="pt" />
+  <metadata
+     id="metadata5">
+    <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,-217.62501)">
+    <g
+       id="g3790"
+       transform="translate(-276.67857,-1.5119048)"
+       style="fill:#000000">
+      <path
+         sodipodi:nodetypes="ccscccsccscssscscsscsccc"
+         inkscape:connector-curvature="0"
+         id="path3764"
+         d="m 287.04656,288.04665 23.71378,9.0592 c 0,0 0.39967,-4.79605 4.5296,-6.92762 4.12992,-2.13158 7.40168,-15.99614 7.40168,-15.99614 l 2.5266,-9.92668 4.1934,-9.24819 c 0,0 -1.13082,-3.82467 -4.67519,-0.19524 -8.8408,9.05294 -3.51813,14.25651 -8.14833,14.16202 -3.77977,-0.75596 -0.13245,-10.86933 0.26722,-16.16497 0.26644,-3.06413 0.69941,-12.98928 0.29974,-18.85112 -0.39966,-5.86184 -0.93256,-6.66118 -2.66446,-6.52795 -1.73191,0.13322 -2.93093,0.93257 -4.39638,9.05919 -1.46546,8.12664 -3.33058,15.72038 -3.06414,18.91774 0.26644,3.19737 -4.36307,0.64443 -2.89762,-5.48385 1.46546,-6.12827 4.82299,-19.49577 4.95621,-21.36089 0.13322,-1.86512 -0.52548,-5.99423 -3.45641,-1.46464 -2.93091,4.52961 -8.39307,31.77464 -8.39307,31.77464 0,0 -4.61911,1.35544 4.75249,-29.62183 0.37058,-1.22492 -1.2231,-1.82036 -2.02245,-0.35491 -0.79933,1.46547 -2.93556,6.41177 -3.60169,9.47592 -0.66612,3.06413 -4.12526,18.76747 -5.99039,20.76582 -1.86514,1.99836 -0.77914,-1.64516 2.43172,-19.62594 -3.46015,-8.7099 -7.6029,16.6051 -8.29355,25.75422 -1.73191,11.05755 2.66446,14.65459 2.53124,22.78122 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccscsssccccccssc"
+         inkscape:connector-curvature="0"
+         id="path3766"
+         d="m 326.28601,276.79194 4.85752,2.59518 c 0,0 5.99506,0.26645 7.86018,1.19902 1.86513,0.93256 14.52136,-19.31742 14.52136,-19.31742 0,0 -1.59867,-0.39967 -3.19735,-5.32893 -1.59868,-4.92926 -7.59374,-19.98353 -9.45888,-23.44734 -1.86513,-3.46381 -2.53124,-4.66283 -3.4638,-7.46051 -0.93257,-2.7977 -2.13159,-5.0625 -3.73027,-0.13323 -1.59868,4.92927 -1.66343,10.45537 -0.46441,13.91919 1.38613,5.18454 3.8952,15.07683 1.97631,17.7369 -3.13067,-0.0635 -4.1718,-8.94257 -4.84078,-11.98701 l -10.45574,-8.48036 -1.15458,18.13553 c 0,0 3.30736,-4.0697 9.65298,-5.19422 4.51067,-0.79933 2.81751,6.4678 1.21188,14.09965 -1.34794,6.40707 -3.31442,13.66355 -3.31442,13.66355 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path3768"
+         d="m 291.74698,236.36722 c 0,0 -1.36535,-0.56172 -0.0701,-3.22296 1.29528,-2.66125 3.72103,-1.62503 4.12138,-1.41306 -1.04349,0.50764 -3.37926,4.82292 -4.05132,4.63602 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3770"
+         d="m 278.60514,277.01718 c 0,0 -0.98806,-8.05217 1.36702,-17.09567 5.11868,-12.29479 -7.76345,3.61446 -1.36702,17.09567 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3772"
+         d="m 283.64252,261.72126 c 0,-0.0431 -1.44898,3.96362 -0.80247,9.53246 0.42679,3.67631 0.64575,8.36037 1.90705,11.72782 3.10143,7.14376 -8.41694,-7.43352 -1.10458,-21.26028 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.11350404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cscc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3774"
+         d="m 318.12446,294.21149 c 0,0 6.68844,-4.71017 9.13772,-13.37686 -5.91279,4.63412 -6.77642,9.57974 -9.13772,13.37686 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3778"
+         d="m 344.21877,231.00112 c 0,0 1.60041,9.36884 7.07841,21.7522 5.35526,12.10587 4.05178,-4.80879 -7.07841,-21.7522 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="csc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3780"
+         d="m 349.44951,230.90023 c -0.11119,-0.0477 0.96041,8.99393 4.75948,15.37263 1.48524,4.17497 3.73499,-6.08181 -4.75948,-15.37263 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+    </g>
+  </g>
+</svg>
diff --git a/unpublishedScripts/marketplace/clap/icons/clap-white-icon.svg b/unpublishedScripts/marketplace/clap/icons/clap-white-icon.svg
deleted file mode 100644
index 3e4ecb0b64..0000000000
--- a/unpublishedScripts/marketplace/clap/icons/clap-white-icon.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="ClapWhite.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="-2033.1122"
-     inkscape:cy="1644.4317"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1377"
-     inkscape:window-x="1912"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <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">
-    <g
-       id="g3790"
-       transform="translate(-276.67857,-1.5119048)"
-       style="fill:#ffffff;opacity:1;stroke:none">
-      <path
-         sodipodi:nodetypes="ccscccsccscssscscsscsccc"
-         inkscape:connector-curvature="0"
-         id="path3764"
-         d="m -284.61607,-7.2708335 67.27976,25.7023805 c 0,0 1.13393,-13.6071425 12.85119,-19.6547614 11.71726,-6.0476191 27.97024,-49.1369046 27.97024,-49.1369046 l 5.29167,-24.946427 6.80357,-25.702384 c 0,0 2.12085,-16.96991 -10.58333,-10.20535 -29.10417,15.497021 -24.19048,48.758924 -24.19048,48.758924 0,0 -1.98438,-29.765625 -0.85044,-44.790184 0.75595,-8.69345 1.98437,-36.85267 0.85044,-53.48363 -1.13393,-16.63095 -2.64583,-18.8988 -7.55952,-18.52083 -4.91369,0.37798 -8.31548,2.64583 -12.47322,25.70238 -4.15773,23.05655 -9.4494,44.60119 -8.69345,53.67262 0.75595,9.07143 -5.29167,0.755954 -1.13393,-16.63095 4.15774,-17.3869 12.47322,-54.05059 12.85119,-59.34226 0.37798,-5.29167 -8.31547,-17.76488 -16.63095,-4.91369 -8.31548,12.85119 -23.8125,89.391366 -23.8125,89.391366 0,0 1.97651,-26.642916 19.46577,-82.682286 1.0817,-3.466 -8.50446,-5.19718 -10.77232,-1.03944 -2.26786,4.15774 -10.20535,17.38691 -12.09524,26.08036 -1.88988,8.69345 -9.82738,54.050591 -15.11904,59.720233 -5.29167,5.669645 4.49743,-7.099475 13.60714,-58.113833 -9.817,-24.71133 -28.27858,49.543233 -30.23808,75.500739 -4.9137,31.372023 7.55951,41.577381 7.18153,64.6339275 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccscssscscccccssc"
-         inkscape:connector-curvature="0"
-         id="path3766"
-         d="m -178.02678,-41.666667 18.52083,9.827381 c 0,0 17.00893,0.755952 22.30059,3.401785 5.29167,2.645834 41.19941,-54.806545 41.19941,-54.806545 0,0 -4.53572,-1.13393 -9.07143,-15.119048 -4.53571,-13.985116 -21.54464,-56.696426 -26.83631,-66.523806 -5.29167,-9.82738 -7.18155,-13.22917 -9.82738,-21.16667 -2.64583,-7.9375 -6.04762,-14.3631 -10.58333,-0.37797 -4.53572,13.98511 -6.4256,32.12797 -3.02381,41.95535 3.40178,9.82738 4.53571,7.9375 3.02381,17.00893 -1.51191,9.07143 -2.64584,28.348214 0,33.261905 2.64583,4.913688 -4.34848,-6.617405 -3.02381,-32.505955 l -41.57738,-26.08036 -2.09231,69.82276 c 0,0 10.27982,-27.83049 28.28337,-31.02091 12.79747,-2.26785 6.6667,13.23175 2.11129,34.884518 -3.82434,18.177888 -9.40354,37.438635 -9.40354,37.438635 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="csccccc"
-         inkscape:connector-curvature="0"
-         id="path3768"
-         d="m -255.2424,-164.77493 c 0,0 -5.17771,7.37883 -4.94448,12.62849 0.13926,3.13454 -1.06908,-4.6104 -4.94448,-2.53906 -3.87541,2.07134 -5.61266,4.00904 -5.61266,4.00904 0,0 -4.40994,-4.81085 -0.73499,-12.36121 3.67493,-7.55037 10.55714,-4.6104 11.69303,-4.00904 1.1359,0.60135 2.73952,1.9377 4.54358,2.27178 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3770"
-         d="m -306.29087,-42.165031 c 0,0 -5.07812,-19.243405 1.60361,-44.901278 6.68174,-25.657881 -14.96708,16.83798 -1.60361,44.901278 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3772"
-         d="m -297.47099,-77.979147 c 0,0 -5.87991,31.537803 1.60362,48.375783 7.48355,16.837982 -14.43255,-11.759858 -1.60362,-48.375783 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3774"
-         d="m -196.4431,10.219797 c 0,0 18.97614,-13.3634764 25.92514,-37.952273 -5.61266,22.7179099 -15.23436,30.2014566 -25.92514,37.952273 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3778"
-         d="m -122.40944,-169.11805 c 0,0 14.96709,27.52876 25.390604,63.61014 10.423511,36.08139 1.069078,-20.84702 -25.390604,-63.61014 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3780"
-         d="m -109.84778,-163.23813 c 0,0 15.501638,25.65788 17.105256,39.82316 1.603616,14.16529 5.078121,-11.75985 -17.105256,-39.82316 z"
-         style="fill:#ffffff;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/unpublishedScripts/marketplace/clap/scripts/ClapDebugger.js b/unpublishedScripts/marketplace/clap/scripts/ClapDebugger.js
index 247664c157..04a3ebc4af 100644
--- a/unpublishedScripts/marketplace/clap/scripts/ClapDebugger.js
+++ b/unpublishedScripts/marketplace/clap/scripts/ClapDebugger.js
@@ -42,7 +42,6 @@ module.exports = {
         Overlays.deleteOverlay(DEBUG_LEFT_HAND);
         Overlays.deleteOverlay(DEBUG_CLAP_LEFT);
         Overlays.deleteOverlay(DEBUG_CLAP_RIGHT);
-        Overlays.deleteOverlay(DEBUG_CLAP);
         Overlays.deleteOverlay(DEBUG_CLAP_DIRECTION);
     },
 
@@ -141,15 +140,6 @@ module.exports = {
             }
         });
 
-        DEBUG_CLAP = Overlays.addOverlay("sphere", {
-            position: MyAvatar.position,
-            color: DEBUG_VOLUME,
-            scale: {
-                x: 0.05,
-                y: 0.05,
-                z: 0.05
-            }
-        });
 
         DEBUG_CLAP_DIRECTION = Overlays.addOverlay("line3d", {
             color: DEBUG_VOLUME,
diff --git a/unpublishedScripts/marketplace/clap/scripts/ClapEngine.js b/unpublishedScripts/marketplace/clap/scripts/ClapEngine.js
index f36aa9716b..96dd05713e 100644
--- a/unpublishedScripts/marketplace/clap/scripts/ClapEngine.js
+++ b/unpublishedScripts/marketplace/clap/scripts/ClapEngine.js
@@ -17,12 +17,12 @@
 var DEG_TO_RAD = Math.PI / 180;
 // If angle is closer to 0 from 25 degrees, then "clap" can happen;
 var COS_OF_TOLERANCE = Math.cos(25 * DEG_TO_RAD);
-
+var DISTANCE = 0.3;
 var CONTROL_MAP_PACKAGE = "com.highfidelity.avatar.clap.active";
 
 var CLAP_MENU = "Clap";
 var ENABLE_PARTICLE_MENU = "Enable Clap Particles";
-var ENABLE_DEBUG_MENU = "Enable Clap Debug";
+var ENABLE_DEBUG_MENU = "Enable Claping Helper";
 
 var sounds = [
     "clap1.wav",
@@ -34,9 +34,9 @@ var sounds = [
 ];
 
 
-var ClapParticle = Script.require(Script.resolvePath("../entities/ClapParticle.json?V2"));
-var ClapAnimation = Script.require(Script.resolvePath("../animations/ClapAnimation.json?V2"));
-var ClapDebugger = Script.require(Script.resolvePath("ClapDebugger.js?V2"));
+var ClapParticle = Script.require(Script.resolvePath("../entities/ClapParticle.json?V3"));
+var ClapAnimation = Script.require(Script.resolvePath("../animations/ClapAnimation.json?V3"));
+var ClapDebugger = Script.require(Script.resolvePath("ClapDebugger.js?V3"));
 
 var settingDebug = false;
 var settingParticlesOn = true;
@@ -190,7 +190,7 @@ function update(dt) {
     var angularVelocity = Vec3.length(Vec3.subtract(leftHand.angularVelocity, rightHand.angularVelocity));
     var velocity = Vec3.length(Vec3.subtract(leftHand.velocity, rightHand.velocity));
 
-    if (matchTolerance && distance < 0.3 && !animClap) {
+    if (matchTolerance && distance < DISTANCE && !animClap) {
         if (settingDebug) {
             ClapDebugger.debugClapLine(leftHandPositionOffset, rightHandPositionOffset, true);
         }
@@ -202,7 +202,7 @@ function update(dt) {
             Script.clearTimeout(animThrottle);
             animThrottle = false;
         }
-    } else if (animClap && distance > 0.3) {
+    } else if (animClap && distance > DISTANCE) {
         if (settingDebug) {
             ClapDebugger.debugClapLine(leftHandPositionOffset, rightHandPositionOffset, false);
         }
@@ -213,14 +213,14 @@ function update(dt) {
         }, 500);
     }
 
-    if (distance < 0.22 && matchTolerance && !clapOn) {
+    if (distance < DISTANCE && matchTolerance && !clapOn) {
         clapOn = true;
 
         var midClap = Vec3.mix(rightHandPositionOffset, leftHandPositionOffset, 0.5);
         var volume = velocity / 2 + angularVelocity / 5;
 
         clap(volume, midClap, Quat.lookAtSimple(rightHandPositionOffset, leftHandPositionOffset));
-    } else if (distance > 0.22 && !matchTolerance) {
+    } else if (distance > DISTANCE && !matchTolerance) {
         clapOn = false;
     }
 }
@@ -240,13 +240,20 @@ module.exports = {
                 isChecked: settingParticlesOn
             });
         }
-        if (!Menu.menuItemExists(CLAP_MENU, ENABLE_DEBUG_MENU)) {
-            Menu.addMenuItem({
-                menuName: CLAP_MENU,
-                menuItemName: ENABLE_DEBUG_MENU,
-                isCheckable: true,
-                isChecked: settingDebug
-            });
+        if (HMD.active) {
+            if (!Menu.menuItemExists(CLAP_MENU, ENABLE_DEBUG_MENU)) {
+                Menu.addMenuItem({
+                    menuName: CLAP_MENU,
+                    menuItemName: ENABLE_DEBUG_MENU,
+                    isCheckable: true,
+                    isChecked: settingDebug
+                });
+            }
+        } else {
+            ClapDebugger.disableDebug();
+            if (Menu.menuItemExists(CLAP_MENU, ENABLE_DEBUG_MENU)) {
+                Menu.removeMenuItem(CLAP_MENU, ENABLE_DEBUG_MENU);
+            }
         }
 
 
@@ -312,7 +319,7 @@ module.exports = {
         try {
             Script.update.disconnect(update);
         } catch (e) {
-            print("Script.update connection did not exist on disconnection. Skipping")
+            print("Script.update connection did not exist on disconnection. Skipping");
         }
     }
 };