diff --git a/include/text.php b/include/text.php
index 7d1e22170..1bc19da34 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1166,7 +1166,7 @@ function list_smilies() {
 			if(strpos($e['shortname'],':tone') === 0)
 				continue;
 			$texts[] = $e['shortname'];
-			$icons[] = '<img height="16" width="16" src="images/emoji/' . $e['unicode'] . '.png' . '" alt="' . $e['name'] . '" />';
+			$icons[] = '<img class="smiley emoji" height="16" width="16" src="images/emoji/' . $e['unicode'] . '.png' . '" alt="' . $e['name'] . '" />';
 		}
 	}
 
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 328f9df02..b6e316121 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -312,3 +312,8 @@ code.inline-code {
 .overline {
 	text-decoration: overline;
 }
+
+img.smiley.emoji:hover {
+	width: 32px;
+	height: 32px;
+}
\ No newline at end of file