diff --git a/interface/resources/icons/tablet-icons/EmoteAppIcon.svg b/interface/resources/icons/tablet-icons/EmoteAppIcon.svg
deleted file mode 100644
index cef6e8771b..0000000000
--- a/interface/resources/icons/tablet-icons/EmoteAppIcon.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100.8" style="enable-background:new 0 0 100 100.8;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<path class="st0" d="M97.4,47.7c-3-2.7-7.3-2.6-10.4,0.2c-2,1.8-4.1,3.7-6.2,5.4c-1.5,1.2-3.1,1.4-4.8,0.6c-1.3-0.6-2-1.7-2.1-3.7
-	c-0.2-2.7-0.4-5.2-0.5-7.9c-0.2-2.7-0.3-5.3-0.5-8l-0.1-1.7c-0.3-4.9-0.6-9.7-0.9-14.5c-0.2-1.9-1.1-3.7-2.8-5
-	c-2.2-1.7-5-2.1-7.6-1.1c-2.3,0.9-4.1,3.1-4.5,5.6c-0.3,1.8-0.4,3.8-0.5,5.7c-0.1,0.5-0.1,0.9-0.1,1.4c-0.1,0.3-0.1,0.7-0.1,1
-	c-0.2-0.9-0.4-1.7-0.6-2.6c-0.7-2.7-1.3-5.3-1.9-8.1c-0.8-3.5-3.4-5.9-6.5-6.2c-2.2-0.2-4.5,0.5-6.1,2c-1.5,1.5-2.3,3.7-2.1,6
-	c0.3,3.5,0.7,6.8,1.2,10.2c0.1,1.1,0.3,2.2,0.4,3.3c-1-2.2-1.9-4.6-3.1-6.8c-1.3-3.1-4.6-4.7-8-4.1c-3.5,0.7-5.9,3.4-6,6.8
-	c0,1.4,0.4,2.9,0.8,4.5c0.8,2.5,1.5,4.9,2.2,7.4c0,0.1,0.1,0.2,0.1,0.3c-2.6-2.8-6.1-3.3-9.3-1.4c-3.7,2-4.7,6.1-2.8,10.1
-	c2.8,5.4,5.4,10.8,8.2,16.3c2.8,5.4,5.4,10.9,8.2,16.3c4.4,8.9,13,14.7,22.8,15.6c0.8,0.1,1.7,0.1,2.6,0.1c8.9,0,17.2-4.1,22.5-11.1
-	C82.8,79,87,73.4,91,67.9c2.3-3.3,4.8-6.5,7.1-9.8C100.7,54.6,100.4,50.4,97.4,47.7z M36.4,59.3c1.5-0.7,2.1-2.2,1.5-4
-	c-0.8-2.8-1.6-5.5-2.5-8.3c-0.8-2.8-1.6-5.5-2.5-8.3c-0.5-1.7-1-3.4-1.5-5.1c-0.5-1.7-1-3.5-1.5-5.2c-0.7-2.2,0.1-2.7,0.4-2.8
-	c0.5-0.1,1.5-0.5,2.5,1.7c1.6,3.7,3.3,7.4,4.8,11c1.5,3.6,3.1,7.3,4.7,10.9c0.1,0.2,0.2,0.4,0.3,0.6c0.1,0.3,0.2,0.5,0.3,0.7
-	c0.4,0.9,1.3,3,3.8,2.3c2.7-0.6,2.5-3.2,2.3-4.1l-2.9-23.1c-0.1-1.5-0.3-3-0.5-4.5l-0.5-4.2c-0.1-0.8,0-1.8,1.1-2
-	c0.4-0.1,1.3-0.3,1.8,1.5c1.1,4.9,2.3,9.9,3.5,14.8c1.1,4.9,2.2,9.8,3.4,14.7l0.1,0.3c0.2,1,0.7,3.6,3.4,3.4
-	c2.7-0.2,2.8-2.6,2.9-3.7v-0.4c0.3-4.4,0.6-8.7,0.8-13.4l0.7-12.8c0.1-1.3,0.2-1.7,0.8-2c0.5-0.2,0.9-0.2,1.3,0
-	c0.5,0.3,0.8,0.9,0.9,1.7c0.1,1,0.2,2.1,0.2,3.3c0,0.6,0.1,1.2,0.1,1.7c0.5,7.9,0.9,15.9,1.4,23.9c0,1.4,0.1,2.8,0.4,4.2
-	c0.7,3.4,3,6,6,7.3c3.2,1.2,6.7,0.8,9.6-1.1c1.4-1,2.8-2.1,4-3.3c0.5-0.4,0.9-0.8,1.5-1.3c0.6-0.7,1.3-1.2,2.1-1.8
-	c0.6-0.4,1.5-0.5,1.9,0c0.5,0.5,0.7,1,0.2,1.8c-0.5,0.8-1.1,1.5-1.6,2.2c-0.5,0.7-1.1,1.5-1.6,2.2c-1.9,2.7-3.8,5.3-5.7,8
-	c-3.5,4.8-7,9.8-10.7,14.6c-4.4,5.7-10.3,8.7-18.2,8.9c-8.9-0.6-15.3-4.8-19.1-12.3C33.3,71.3,30.1,65,27,58.8
-	c-2.2-4.5-4.4-9-6.7-13.6c-0.2-0.4-0.4-0.9-0.5-1.4c0-0.7,0.2-1.1,0.8-1.3c0.8-0.3,1.3-0.2,1.8,0.5c1.1,1.5,2.2,3.2,3.3,4.8l6.2,9.4
-	l0.2,0.2c0.1,0.1,0.1,0.1,0.2,0.2c0.1,0.1,0.2,0.3,0.3,0.4C34,59.9,35.4,59.7,36.4,59.3z"/>
-<path class="st0" d="M78.3,22.7c1.4,0.2,2.8,1.1,3.3,2.6c0.6,1.3,0.4,2.9-0.3,4c-0.4,0.5-0.5,1.1-0.4,1.7c0.1,0.5,0.4,1,0.9,1.4
-	l0.2,0.2c0.4,0.2,0.7,0.2,1.1,0.2c0.6,0,1.2-0.3,1.4-0.4l0.1-0.2l0.2-0.3c1.6-2.5,1.9-5.5,0.8-8.4c-1.1-2.9-3.6-4.8-6.6-5.3
-	c-0.5-0.1-1.1,0-1.6,0.3c-0.4,0.4-0.8,0.9-0.9,1.5c-0.1,0.5,0,1.1,0.3,1.6C77.1,22.2,77.6,22.6,78.3,22.7z"/>
-<path class="st0" d="M85.5,17.8c2.2,0.4,4.1,1.8,5,4c0.8,2.1,0.6,4.4-0.5,6.1c-0.7,1-0.5,2.3,0.5,3.2l0.2,0.1
-	c0.4,0.2,0.7,0.2,1.1,0.2c0.9,0,1.6-0.5,1.8-1c2-3.1,2.5-6.9,1-10.3c-1.5-3.5-4.7-6-8.4-6.6c-0.6-0.2-1.2,0-1.7,0.3
-	c-0.5,0.3-0.8,0.8-0.9,1.4c-0.1,0.5,0,1.1,0.3,1.6C84.3,17.3,84.9,17.7,85.5,17.8z"/>
-<path class="st0" d="M15.3,33.3c0.1-0.6,0-1.2-0.4-1.8c-0.9-1.1-1.1-2.8-0.5-4.1c0.6-1.3,1.7-2.3,3.1-2.6c1.2-0.2,2-1.2,1.8-2.6
-	v-0.2c-0.2-0.6-0.4-0.8-0.6-1c-0.4-0.4-1-0.6-1.2-0.7l-0.3-0.1l-0.3,0.1c-3,0.5-5.3,2.6-6.5,5.3c-1.2,2.9-0.8,5.9,0.9,8.5
-	c0.3,0.6,0.8,0.9,1.4,1c0.1,0,0.2,0,0.3,0c0.5,0,0.9-0.2,1.4-0.4C14.9,34.4,15.2,34,15.3,33.3z"/>
-<path class="st0" d="M9.8,20.5c0.6-0.1,1.2-0.4,1.5-0.9c0.4-0.4,0.5-1,0.4-1.6l-0.1-0.2c-0.1-0.5-0.3-0.7-0.6-1
-	c-0.6-0.7-1.4-0.9-2.1-0.6c-3.6,0.6-6.5,3.1-8,6.5c-1.4,3.5-0.9,7.6,1.2,10.6c0.4,0.5,0.8,0.8,1.4,0.9c0.1,0,0.3,0,0.4,0
-	c0.5,0,0.9-0.1,1.2-0.2c0.6-0.3,0.9-0.8,1-1.4c0.1-0.6-0.1-1.2-0.4-1.7c-1.3-1.9-1.5-4.2-0.7-6.3C6,22.3,7.7,20.9,9.8,20.5z"/>
-</svg>
diff --git a/interface/resources/icons/tablet-icons/emote-a.svg b/interface/resources/icons/tablet-icons/emote-a.svg
new file mode 100644
index 0000000000..981bb77566
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/emote-a.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<g>
+	<path d="M39.8,10.7c0.8,0.1,1.5,0.7,1.8,1.4s0.2,1.6-0.2,2.2c-0.3,0.4-0.2,1,0.3,1.4c0.2,0.1,0.4,0.1,0.5,0.1
+		c0.3,0,0.6-0.1,0.6-0.2l0.1-0.1l0.1-0.1c0.8-1.2,1-2.8,0.4-4.1C42.8,10,41.6,9,40.1,8.8c-0.3-0.1-0.5,0-0.7,0.1
+		C39.2,9,39,9.3,39,9.5C38.8,10.1,39.2,10.6,39.8,10.7z"/>
+	<path d="M42.5,8.1c1.2,0.2,2.2,1,2.7,2.1c0.4,1.1,0.3,2.4-0.3,3.3c-0.2,0.2-0.2,0.5-0.2,0.7s0.2,0.5,0.5,0.7
+		c0.2,0.1,0.4,0.1,0.5,0.1c0.4,0,0.7-0.2,0.8-0.5c1-1.5,1.2-3.4,0.5-5.1s-2.3-3-4.2-3.3c-0.5-0.1-1,0.2-1.1,0.8
+		C41.6,7.5,41.9,8,42.5,8.1z M42.1,7L42.1,7L42.1,7L42.1,7z"/>
+	<path d="M6.7,14.3c-0.4-0.6-0.5-1.5-0.2-2.2c0.3-0.8,1-1.3,1.9-1.4c0.6-0.1,0.9-0.6,0.8-1.1C9.1,9.3,9,9,8.7,8.9
+		C8.5,8.8,8.3,8.7,8,8.8C6.5,9,5.3,10,4.7,11.4s-0.4,2.9,0.4,4.1l0.1,0.1l0.1,0.1c0.1,0,0.4,0.2,0.6,0.2c0.1,0,0.3,0,0.6-0.2
+		C6.9,15.4,7,14.8,6.7,14.3z"/>
+	<path d="M5.6,8.1C5.9,8,6.1,7.9,6.3,7.7C6.5,7.5,6.5,7.2,6.5,7C6.4,6.7,6.2,6.4,6,6.3C5.8,6.1,5.6,6.1,5.3,6.1
+		C3.5,6.5,1.9,7.7,1.1,9.5c-0.7,1.7-0.5,3.6,0.5,5.1c0.1,0.3,0.4,0.5,0.8,0.5c0.1,0,0.3,0,0.6-0.2c0.2-0.2,0.4-0.4,0.4-0.6
+		c0-0.3,0-0.5-0.2-0.7c-0.6-1-0.8-2.2-0.3-3.3C3.4,9.1,4.4,8.3,5.6,8.1z"/>
+	<path d="M48.8,25.1c-0.7-0.7-1.8-0.7-2.6-0.2c-0.4,0.3-0.7,0.5-1,0.8L44.9,26c-0.3,0.3-0.6,0.5-0.9,0.8c-0.6,0.6-1.2,1.1-1.9,1.6
+		c-1.2,0.8-2.7,1-4.1,0.5c-1.3-0.5-2.3-1.6-2.6-3c-0.1-0.6-0.2-1.3-0.2-2c-0.2-2.8-0.3-5.6-0.5-8.5l-0.3-5.2c0-0.7-0.1-1.4-0.2-2.2
+		c-0.1-0.8-0.5-1.5-1.1-1.8s-1.2-0.3-1.8,0c-1,0.5-1.1,1.6-1.1,2.1c-0.1,1.4-0.2,2.8-0.2,4.2c0,0.9-0.1,1.8-0.1,2.7
+		c-0.1,2.4-0.3,4.8-0.4,7.2v0.2c0,0.8-0.1,0.9-0.5,0.9s-0.4-0.1-0.6-0.9L27,16.4c-0.8-3.3-1.5-6.7-2.3-10c-0.3-1.3-1.2-1.9-2.4-1.7
+		c-1.1,0.2-1.7,1.2-1.6,2.4C20.7,8,20.9,9,21,9.9c0.1,0.6,0.2,1.3,0.2,1.9c0.5,3.8,0.9,7.6,1.4,11.3l0.1,1.1
+		c0.1,0.8-0.1,0.9-0.4,0.9c-0.3,0.1-0.4,0.1-0.7-0.6L20,20.7c-1.2-2.9-2.5-5.7-3.7-8.6c-0.8-1.9-2-1.9-2.8-1.5
+		c-0.6,0.2-1.5,0.9-0.9,2.9c0.3,1,0.6,1.9,0.9,2.9c0.3,0.9,0.5,1.8,0.8,2.7c0.5,1.8,1,3.5,1.6,5.3l1.1,3.7c0.2,0.6,0,0.7-0.2,0.8
+		c-0.1,0.1-0.3,0.1-0.7-0.4c-0.1-0.1-0.2-0.2-0.2-0.3l-3.8-5.7c-0.5-0.7-0.9-1.4-1.4-2.1c-0.6-0.8-1.4-1-2.3-0.6s-1.3,1.1-1.2,2
+		c0.1,0.5,0.3,0.9,0.4,1.2c0.8,1.6,1.6,3.2,2.4,4.8c2.1,4.2,4.2,8.5,6.4,12.8c2.3,4.5,6.2,7,11.5,7.3l0,0l0,0
+		c4.7-0.2,8.2-1.9,10.7-5.2c2.1-2.8,4.2-5.7,6.2-8.5c0.9-1.3,1.8-2.5,2.7-3.7c0.2-0.3,0.4-0.5,0.6-0.8c0.4-0.6,0.8-1.1,1.2-1.7
+		C49.5,26.7,49.5,25.8,48.8,25.1z"/>
+</g>
+</svg>
diff --git a/interface/resources/icons/tablet-icons/emote-i.svg b/interface/resources/icons/tablet-icons/emote-i.svg
new file mode 100644
index 0000000000..57a957052e
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/emote-i.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M39.8,10.7c0.8,0.1,1.5,0.7,1.8,1.4s0.2,1.6-0.2,2.2c-0.3,0.4-0.2,1,0.3,1.4c0.2,0.1,0.4,0.1,0.5,0.1
+		c0.3,0,0.6-0.1,0.6-0.2l0.1-0.1l0.1-0.1c0.8-1.2,1-2.8,0.4-4.1C42.8,10,41.6,9,40.1,8.8c-0.3-0.1-0.5,0-0.7,0.1
+		C39.2,9,39,9.3,39,9.5C38.8,10.1,39.2,10.6,39.8,10.7z"/>
+	<path class="st0" d="M42.5,8.1c1.2,0.2,2.2,1,2.7,2.1c0.4,1.1,0.3,2.4-0.3,3.3c-0.2,0.2-0.2,0.5-0.2,0.7s0.2,0.5,0.5,0.7
+		c0.2,0.1,0.4,0.1,0.5,0.1c0.4,0,0.7-0.2,0.8-0.5c1-1.5,1.2-3.4,0.5-5.1s-2.3-3-4.2-3.3c-0.5-0.1-1,0.2-1.1,0.8
+		C41.6,7.5,41.9,8,42.5,8.1z M42.1,7L42.1,7L42.1,7L42.1,7z"/>
+	<path class="st0" d="M6.7,14.3c-0.4-0.6-0.5-1.5-0.2-2.2c0.3-0.8,1-1.3,1.9-1.4c0.6-0.1,0.9-0.6,0.8-1.1C9.1,9.3,9,9,8.7,8.9
+		C8.5,8.8,8.3,8.7,8,8.8C6.5,9,5.3,10,4.7,11.4s-0.4,2.9,0.4,4.1l0.1,0.1l0.1,0.1c0.1,0,0.4,0.2,0.6,0.2c0.1,0,0.3,0,0.6-0.2
+		C6.9,15.4,7,14.8,6.7,14.3z"/>
+	<path class="st0" d="M5.6,8.1C5.9,8,6.1,7.9,6.3,7.7C6.5,7.5,6.5,7.2,6.5,7C6.4,6.7,6.2,6.4,6,6.3C5.8,6.1,5.6,6.1,5.3,6.1
+		C3.5,6.5,1.9,7.7,1.1,9.5c-0.7,1.7-0.5,3.6,0.5,5.1c0.1,0.3,0.4,0.5,0.8,0.5c0.1,0,0.3,0,0.6-0.2c0.2-0.2,0.4-0.4,0.4-0.6
+		c0-0.3,0-0.5-0.2-0.7c-0.6-1-0.8-2.2-0.3-3.3C3.4,9.1,4.4,8.3,5.6,8.1z"/>
+	<path class="st0" d="M48.8,25.1c-0.7-0.7-1.8-0.7-2.6-0.2c-0.4,0.3-0.7,0.5-1,0.8L44.9,26c-0.3,0.3-0.6,0.5-0.9,0.8
+		c-0.6,0.6-1.2,1.1-1.9,1.6c-1.2,0.8-2.7,1-4.1,0.5c-1.3-0.5-2.3-1.6-2.6-3c-0.1-0.6-0.2-1.3-0.2-2c-0.2-2.8-0.3-5.6-0.5-8.5
+		l-0.3-5.2c0-0.7-0.1-1.4-0.2-2.2c-0.1-0.8-0.5-1.5-1.1-1.8s-1.2-0.3-1.8,0c-1,0.5-1.1,1.6-1.1,2.1c-0.1,1.4-0.2,2.8-0.2,4.2
+		c0,0.9-0.1,1.8-0.1,2.7c-0.1,2.4-0.3,4.8-0.4,7.2v0.2c0,0.8-0.1,0.9-0.5,0.9s-0.4-0.1-0.6-0.9L27,16.4c-0.8-3.3-1.5-6.7-2.3-10
+		c-0.3-1.3-1.2-1.9-2.4-1.7c-1.1,0.2-1.7,1.2-1.6,2.4C20.7,8,20.9,9,21,9.9c0.1,0.6,0.2,1.3,0.2,1.9c0.5,3.8,0.9,7.6,1.4,11.3
+		l0.1,1.1c0.1,0.8-0.1,0.9-0.4,0.9c-0.3,0.1-0.4,0.1-0.7-0.6L20,20.7c-1.2-2.9-2.5-5.7-3.7-8.6c-0.8-1.9-2-1.9-2.8-1.5
+		c-0.6,0.2-1.5,0.9-0.9,2.9c0.3,1,0.6,1.9,0.9,2.9c0.3,0.9,0.5,1.8,0.8,2.7c0.5,1.8,1,3.5,1.6,5.3l1.1,3.7c0.2,0.6,0,0.7-0.2,0.8
+		c-0.1,0.1-0.3,0.1-0.7-0.4c-0.1-0.1-0.2-0.2-0.2-0.3l-3.8-5.7c-0.5-0.7-0.9-1.4-1.4-2.1c-0.6-0.8-1.4-1-2.3-0.6s-1.3,1.1-1.2,2
+		c0.1,0.5,0.3,0.9,0.4,1.2c0.8,1.6,1.6,3.2,2.4,4.8c2.1,4.2,4.2,8.5,6.4,12.8c2.3,4.5,6.2,7,11.5,7.3l0,0l0,0
+		c4.7-0.2,8.2-1.9,10.7-5.2c2.1-2.8,4.2-5.7,6.2-8.5c0.9-1.3,1.8-2.5,2.7-3.7c0.2-0.3,0.4-0.5,0.6-0.8c0.4-0.6,0.8-1.1,1.2-1.7
+		C49.5,26.7,49.5,25.8,48.8,25.1z"/>
+</g>
+</svg>
diff --git a/scripts/system/emote.js b/scripts/system/emote.js
index d484078b7b..6dfd1ae1ef 100644
--- a/scripts/system/emote.js
+++ b/scripts/system/emote.js
@@ -46,7 +46,8 @@ var activeTimer = false; // Used to cancel active timer if a user plays an anima
 var activeEmote = false; // To keep track of the currently playing emote
 
 button = tablet.addButton({
-    icon: "icons/tablet-icons/EmoteAppIcon.svg",
+    icon: "icons/tablet-icons/emote-i.svg",
+    activeIcon: "icons/tablet-icons/emote-a.svg",
     text: EMOTE_LABEL,
     sortOrder: EMOTE_APP_SORT_ORDER
 });