From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 2 Sep 2016 15:25:09 +0000 (+0200)
Subject: Added HD smilies
X-Git-Tag: 3.0.0_Beta_1~331
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=61b1c63a089fbde9f8f8da93ece902e321cbef98;p=GitHub%2FWoltLab%2FWCF.git

Added HD smilies

Images from emojione.com
---

diff --git a/com.woltlab.wcf/smiley.xml b/com.woltlab.wcf/smiley.xml
index 008ceb8d1a..148459597b 100644
--- a/com.woltlab.wcf/smiley.xml
+++ b/com.woltlab.wcf/smiley.xml
@@ -3,158 +3,155 @@
 	<import>
 		<smiley name=":)">
 			<title>smile</title>
-			<path>images/smilies/smile.png</path>
+			<path>images/smilies/smile_emojione.png</path>
 			<aliases><![CDATA[:-)
 (:]]></aliases>
 		</smiley>
 		<smiley name=":(">
 			<title>sad</title>
-			<path>images/smilies/sad.png</path>
+			<path>images/smilies/sad_emojione.png</path>
 			<aliases><![CDATA[:-(
 ):]]></aliases>
 		</smiley>
 		<smiley name=";)">
 			<title>wink</title>
-			<path>images/smilies/wink.png</path>
+			<path>images/smilies/wink_emojione.png</path>
 			<aliases><![CDATA[;-)
 (;]]></aliases>
 		</smiley>
 		<smiley name=":P">
 			<title>tongue</title>
-			<path>images/smilies/tongue.png</path>
+			<path>images/smilies/tongue_emojione.png</path>
 			<aliases><![CDATA[:-P]]></aliases>
 		</smiley>
 		<smiley name="^^">
 			<title>grin</title>
-			<path>images/smilies/grin.png</path>
+			<path>images/smilies/grin_emojione.png</path>
 			<aliases><![CDATA[^.^
 ^_^
 ^-^]]></aliases>
 		</smiley>
 		<smiley name=":D">
 			<title>biggrin</title>
-			<path>images/smilies/biggrin.png</path>
+			<path>images/smilies/biggrin_emojione.png</path>
 			<aliases><![CDATA[:-D]]></aliases>
 		</smiley>
 		<smiley name=";(">
 			<title>crying</title>
-			<path>images/smilies/crying.png</path>
+			<path>images/smilies/crying_emojione.png</path>
 			<aliases><![CDATA[;-(
 :'(
 ;_;]]></aliases>
 		</smiley>
 		<smiley name="X(">
 			<title>angry</title>
-			<path>images/smilies/angry.png</path>
+			<path>images/smilies/angry_emojione.png</path>
 			<aliases><![CDATA[>.<
 >_<]]></aliases>
 		</smiley>
 		<smiley name=":*">
 			<title>kiss</title>
-			<path>images/smilies/kiss.png</path>
+			<path>images/smilies/kiss_emojione.png</path>
 			<aliases><![CDATA[:-*
 *:]]></aliases>
 		</smiley>
 		<smiley name=":|">
 			<title>mellow</title>
-			<path>images/smilies/mellow.png</path>
+			<path>images/smilies/mellow_emojione.png</path>
 		</smiley>
 		<smiley name="8o">
 			<title>w00t</title>
-			<path>images/smilies/w00t.png</path>
+			<path>images/smilies/w00t_emojione.png</path>
 		</smiley>
 		<smiley name="=O">
 			<title>scared</title>
-			<path>images/smilies/scared.png</path>
+			<path>images/smilies/scared_emojione.png</path>
 		</smiley>
 		<smiley name="&lt;X">
 			<title>sick</title>
-			<path>images/smilies/sick.png</path>
+			<path>images/smilies/sick_emojione.png</path>
 		</smiley>
 		<smiley name="||">
 			<title>tired</title>
-			<path>images/smilies/tired.png</path>
+			<path>images/smilies/tired_emojione.png</path>
 		</smiley>
 		<smiley name=":/">
 			<title>unsure</title>
-			<path>images/smilies/unsure.png</path>
+			<path>images/smilies/unsure_emojione.png</path>
 		</smiley>
 		<smiley name=":S">
 			<title>wacko</title>
-			<path>images/smilies/wacko.png</path>
+			<path>images/smilies/wacko_emojione.png</path>
 		</smiley>
 		<smiley name="X/">
 			<title>pinch</title>
-			<path>images/smilies/pinch.png</path>
+			<path>images/smilies/pinch_emojione.png</path>
 		</smiley>
 		<smiley name="8)">
 			<title>cool</title>
-			<path>images/smilies/cool.png</path>
+			<path>images/smilies/cool_emojione.png</path>
 		</smiley>
 		<smiley name="?(">
 			<title>confused</title>
-			<path>images/smilies/confused.png</path>
+			<path>images/smilies/confused_emojione.png</path>
 		</smiley>
 		<smiley name=":huh:">
 			<title>Huh</title>
-			<path>images/smilies/huh.png</path>
+			<path>images/smilies/huh_emojione.png</path>
 		</smiley>
 		<smiley name=":rolleyes:">
 			<title>rolleyes</title>
-			<path>images/smilies/rolleyes.png</path>
+			<path>images/smilies/rolleyes_emojione.png</path>
 		</smiley>
 		<smiley name=":love:">
 			<title>love</title>
-			<path>images/smilies/love.png</path>
+			<path>images/smilies/love_emojione.png</path>
 		</smiley>
 		<smiley name="8|">
 			<title>blink</title>
-			<path>images/smilies/blink.png</path>
+			<path>images/smilies/blink_emojione.png</path>
 			<aliases><![CDATA[o.O]]></aliases>
 		</smiley>
 		<smiley name=":cursing:">
 			<title>cursing</title>
-			<path>images/smilies/cursing.png</path>
+			<path>images/smilies/cursing_emojione.png</path>
 		</smiley>
 		<smiley name=":thumbdown:">
 			<title>thumbdown</title>
-			<path>images/smilies/thumbdown.png</path>
-		</smiley>
-		<smiley name=":thumbsup:">
-			<title>thumbsup</title>
-			<path>images/smilies/thumbsup.png</path>
+			<path>images/smilies/thumbdown_emojione.png</path>
 		</smiley>
 		<smiley name=":thumbup:">
 			<title>thumbup</title>
-			<path>images/smilies/thumbup.png</path>
+			<path>images/smilies/thumbup_emojione.png</path>
+			<aliases><![CDATA[:thumbsup:]]></aliases>
 		</smiley>
 		<smiley name=":sleeping:">
 			<title>sleeping</title>
-			<path>images/smilies/sleeping.png</path>
+			<path>images/smilies/sleeping_emojione.png</path>
 		</smiley>
 		<smiley name=":whistling:">
 			<title>whistling</title>
-			<path>images/smilies/whistling.png</path>
+			<path>images/smilies/whistling_emojione.png</path>
 		</smiley>
 		<smiley name=":evil:">
 			<title>evil</title>
-			<path>images/smilies/evil.png</path>
+			<path>images/smilies/evil_emojione.png</path>
 		</smiley>
 		<smiley name=":saint:">
 			<title>saint</title>
-			<path>images/smilies/saint.png</path>
+			<path>images/smilies/saint_emojione.png</path>
 		</smiley>
 		<smiley name="&lt;3">
 			<title>heart</title>
-			<path>images/smilies/heart.png</path>
+			<path>images/smilies/heart_emojione.png</path>
 		</smiley>
 		<smiley name=":!:">
 			<title>attention</title>
-			<path>images/smilies/attention.png</path>
+			<path>images/smilies/attention_emojione.png</path>
 		</smiley>
 		<smiley name=":?:">
 			<title>question</title>
-			<path>images/smilies/question.png</path>
+			<path>images/smilies/question_emojione.png</path>
 		</smiley>
 	</import>
 </data>
diff --git a/wcfsetup/install/files/acp/templates/smileyList.tpl b/wcfsetup/install/files/acp/templates/smileyList.tpl
index a312333b14..9b216af2bd 100644
--- a/wcfsetup/install/files/acp/templates/smileyList.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyList.tpl
@@ -47,7 +47,7 @@
 						{foreach from=$objects item=smiley}
 							<li class="sortableNode sortableNoNesting smileyRow" data-object-id="{@$smiley->smileyID}">
 								<span class="sortableNodeLabel">
-									<a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}"><img src="{$smiley->getURL()}" alt=""/ > {lang}{$smiley->smileyTitle}{/lang}</a> <span class="badge">{$smiley->smileyCode}</span>{foreach from=$smiley->getAliases() item='alias'} <span class="badge" style="margin-left: 5px">{$alias}</span>{/foreach}
+									<a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}"><img src="{$smiley->getURL()}" alt="" class="smiley"> {lang}{$smiley->smileyTitle}{/lang}</a> <span class="badge">{$smiley->smileyCode}</span>{foreach from=$smiley->getAliases() item='alias'} <span class="badge" style="margin-left: 5px">{$alias}</span>{/foreach}
 									
 									<span class="statusDisplay sortableButtonContainer">
 										<a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}"><span title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip icon icon16 fa-pencil"></a>
diff --git a/wcfsetup/install/files/images/smilies/angry.png b/wcfsetup/install/files/images/smilies/angry.png
deleted file mode 100644
index e16d826e3b..0000000000
Binary files a/wcfsetup/install/files/images/smilies/angry.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/angry_emojione.png b/wcfsetup/install/files/images/smilies/angry_emojione.png
new file mode 100644
index 0000000000..cfc4a6ecde
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/angry_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/attention.png b/wcfsetup/install/files/images/smilies/attention.png
deleted file mode 100644
index e75f040d8c..0000000000
Binary files a/wcfsetup/install/files/images/smilies/attention.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/attention_emojione.png b/wcfsetup/install/files/images/smilies/attention_emojione.png
new file mode 100644
index 0000000000..2c14406422
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/attention_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/biggrin.png b/wcfsetup/install/files/images/smilies/biggrin.png
deleted file mode 100644
index 3772ea7c98..0000000000
Binary files a/wcfsetup/install/files/images/smilies/biggrin.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/biggrin_emojione.png b/wcfsetup/install/files/images/smilies/biggrin_emojione.png
new file mode 100644
index 0000000000..418d94c811
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/biggrin_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/blink.png b/wcfsetup/install/files/images/smilies/blink.png
deleted file mode 100644
index d5661376bf..0000000000
Binary files a/wcfsetup/install/files/images/smilies/blink.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/blink_emojione.png b/wcfsetup/install/files/images/smilies/blink_emojione.png
new file mode 100644
index 0000000000..bd0ac55ec8
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/blink_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/confused.png b/wcfsetup/install/files/images/smilies/confused.png
deleted file mode 100644
index 1a42f191e9..0000000000
Binary files a/wcfsetup/install/files/images/smilies/confused.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/confused_emojione.png b/wcfsetup/install/files/images/smilies/confused_emojione.png
new file mode 100644
index 0000000000..cad0e23132
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/confused_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/cool.png b/wcfsetup/install/files/images/smilies/cool.png
deleted file mode 100644
index 727de8150d..0000000000
Binary files a/wcfsetup/install/files/images/smilies/cool.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/cool_emojione.png b/wcfsetup/install/files/images/smilies/cool_emojione.png
new file mode 100644
index 0000000000..2001173511
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/cool_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/crying.png b/wcfsetup/install/files/images/smilies/crying.png
deleted file mode 100644
index 05aea3d451..0000000000
Binary files a/wcfsetup/install/files/images/smilies/crying.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/crying_emojione.png b/wcfsetup/install/files/images/smilies/crying_emojione.png
new file mode 100644
index 0000000000..52e3517a1e
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/crying_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/cursing.png b/wcfsetup/install/files/images/smilies/cursing.png
deleted file mode 100644
index 591bb65da5..0000000000
Binary files a/wcfsetup/install/files/images/smilies/cursing.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/cursing_emojione.png b/wcfsetup/install/files/images/smilies/cursing_emojione.png
new file mode 100644
index 0000000000..9d739bd40a
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/cursing_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/evil.png b/wcfsetup/install/files/images/smilies/evil.png
deleted file mode 100644
index bf810603c7..0000000000
Binary files a/wcfsetup/install/files/images/smilies/evil.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/evil_emojione.png b/wcfsetup/install/files/images/smilies/evil_emojione.png
new file mode 100644
index 0000000000..cc2c5f1ec7
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/evil_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/grin.png b/wcfsetup/install/files/images/smilies/grin.png
deleted file mode 100644
index 8950626671..0000000000
Binary files a/wcfsetup/install/files/images/smilies/grin.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/grin_emojione.png b/wcfsetup/install/files/images/smilies/grin_emojione.png
new file mode 100644
index 0000000000..30957a6596
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/grin_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/heart.png b/wcfsetup/install/files/images/smilies/heart.png
deleted file mode 100644
index 4aa3120bbb..0000000000
Binary files a/wcfsetup/install/files/images/smilies/heart.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/heart_emojione.png b/wcfsetup/install/files/images/smilies/heart_emojione.png
new file mode 100644
index 0000000000..638cb72dc4
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/heart_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/huh.png b/wcfsetup/install/files/images/smilies/huh.png
deleted file mode 100644
index ef3f6d95f0..0000000000
Binary files a/wcfsetup/install/files/images/smilies/huh.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/huh_emojione.png b/wcfsetup/install/files/images/smilies/huh_emojione.png
new file mode 100644
index 0000000000..f99026a3bc
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/huh_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/kiss.png b/wcfsetup/install/files/images/smilies/kiss.png
deleted file mode 100644
index e7bf28255e..0000000000
Binary files a/wcfsetup/install/files/images/smilies/kiss.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/kiss_emojione.png b/wcfsetup/install/files/images/smilies/kiss_emojione.png
new file mode 100644
index 0000000000..0ff808fd61
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/kiss_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/love.png b/wcfsetup/install/files/images/smilies/love.png
deleted file mode 100644
index aa9dd52211..0000000000
Binary files a/wcfsetup/install/files/images/smilies/love.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/love_emojione.png b/wcfsetup/install/files/images/smilies/love_emojione.png
new file mode 100644
index 0000000000..73fbee29d4
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/love_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/mellow.png b/wcfsetup/install/files/images/smilies/mellow.png
deleted file mode 100644
index 78c4c9fa42..0000000000
Binary files a/wcfsetup/install/files/images/smilies/mellow.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/mellow_emojione.png b/wcfsetup/install/files/images/smilies/mellow_emojione.png
new file mode 100644
index 0000000000..065d193afe
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/mellow_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/pinch.png b/wcfsetup/install/files/images/smilies/pinch.png
deleted file mode 100644
index 171f28a5ae..0000000000
Binary files a/wcfsetup/install/files/images/smilies/pinch.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/pinch_emojione.png b/wcfsetup/install/files/images/smilies/pinch_emojione.png
new file mode 100644
index 0000000000..2954017f6c
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/pinch_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/question.png b/wcfsetup/install/files/images/smilies/question.png
deleted file mode 100644
index 95bd6cbaa7..0000000000
Binary files a/wcfsetup/install/files/images/smilies/question.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/question_emojione.png b/wcfsetup/install/files/images/smilies/question_emojione.png
new file mode 100644
index 0000000000..5a58f3458a
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/question_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/rolleyes.png b/wcfsetup/install/files/images/smilies/rolleyes.png
deleted file mode 100644
index 2e68be7b94..0000000000
Binary files a/wcfsetup/install/files/images/smilies/rolleyes.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/rolleyes_emojione.png b/wcfsetup/install/files/images/smilies/rolleyes_emojione.png
new file mode 100644
index 0000000000..2f77b9fc3b
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/rolleyes_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/sad.png b/wcfsetup/install/files/images/smilies/sad.png
deleted file mode 100644
index 17f9febdc2..0000000000
Binary files a/wcfsetup/install/files/images/smilies/sad.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/sad_emojione.png b/wcfsetup/install/files/images/smilies/sad_emojione.png
new file mode 100644
index 0000000000..6ae71f233b
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/sad_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/saint.png b/wcfsetup/install/files/images/smilies/saint.png
deleted file mode 100644
index f5fc8cc919..0000000000
Binary files a/wcfsetup/install/files/images/smilies/saint.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/saint_emojione.png b/wcfsetup/install/files/images/smilies/saint_emojione.png
new file mode 100644
index 0000000000..57f5151124
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/saint_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/scared.png b/wcfsetup/install/files/images/smilies/scared.png
deleted file mode 100644
index 62a6caed85..0000000000
Binary files a/wcfsetup/install/files/images/smilies/scared.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/scared_emojione.png b/wcfsetup/install/files/images/smilies/scared_emojione.png
new file mode 100644
index 0000000000..eb8b347cef
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/scared_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/sick.png b/wcfsetup/install/files/images/smilies/sick.png
deleted file mode 100644
index 2ef69f5f2a..0000000000
Binary files a/wcfsetup/install/files/images/smilies/sick.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/sick_emojione.png b/wcfsetup/install/files/images/smilies/sick_emojione.png
new file mode 100644
index 0000000000..a566c109c2
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/sick_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/sleeping.png b/wcfsetup/install/files/images/smilies/sleeping.png
deleted file mode 100644
index 59897d13f7..0000000000
Binary files a/wcfsetup/install/files/images/smilies/sleeping.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/sleeping_emojione.png b/wcfsetup/install/files/images/smilies/sleeping_emojione.png
new file mode 100644
index 0000000000..9ecf600d6d
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/sleeping_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/smile.png b/wcfsetup/install/files/images/smilies/smile.png
deleted file mode 100644
index 34e0a9ccbc..0000000000
Binary files a/wcfsetup/install/files/images/smilies/smile.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/smile_emojione.png b/wcfsetup/install/files/images/smilies/smile_emojione.png
new file mode 100644
index 0000000000..e9e53c03d4
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/smile_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/thumbdown.png b/wcfsetup/install/files/images/smilies/thumbdown.png
deleted file mode 100644
index b46bc4a9bb..0000000000
Binary files a/wcfsetup/install/files/images/smilies/thumbdown.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/thumbdown_emojione.png b/wcfsetup/install/files/images/smilies/thumbdown_emojione.png
new file mode 100644
index 0000000000..b63da2f20a
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/thumbdown_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/thumbsup.png b/wcfsetup/install/files/images/smilies/thumbsup.png
deleted file mode 100644
index 6f648625e0..0000000000
Binary files a/wcfsetup/install/files/images/smilies/thumbsup.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/thumbsup_emojione.png b/wcfsetup/install/files/images/smilies/thumbsup_emojione.png
new file mode 100644
index 0000000000..5bba6dc6d5
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/thumbsup_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/thumbup.png b/wcfsetup/install/files/images/smilies/thumbup.png
deleted file mode 100644
index 1ac0eb1882..0000000000
Binary files a/wcfsetup/install/files/images/smilies/thumbup.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/thumbup_emojione.png b/wcfsetup/install/files/images/smilies/thumbup_emojione.png
new file mode 100644
index 0000000000..f9e6f13a34
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/thumbup_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/tired.png b/wcfsetup/install/files/images/smilies/tired.png
deleted file mode 100644
index cf463eccf0..0000000000
Binary files a/wcfsetup/install/files/images/smilies/tired.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/tired_emojione.png b/wcfsetup/install/files/images/smilies/tired_emojione.png
new file mode 100644
index 0000000000..490fb56695
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/tired_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/tongue.png b/wcfsetup/install/files/images/smilies/tongue.png
deleted file mode 100644
index 68f91ab0de..0000000000
Binary files a/wcfsetup/install/files/images/smilies/tongue.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/tongue_emojione.png b/wcfsetup/install/files/images/smilies/tongue_emojione.png
new file mode 100644
index 0000000000..25757341f9
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/tongue_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/unsure.png b/wcfsetup/install/files/images/smilies/unsure.png
deleted file mode 100644
index 2abb2befc2..0000000000
Binary files a/wcfsetup/install/files/images/smilies/unsure.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/unsure_emojione.png b/wcfsetup/install/files/images/smilies/unsure_emojione.png
new file mode 100644
index 0000000000..7074afcf5b
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/unsure_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/w00t.png b/wcfsetup/install/files/images/smilies/w00t.png
deleted file mode 100644
index 4a129caf36..0000000000
Binary files a/wcfsetup/install/files/images/smilies/w00t.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/w00t_emojione.png b/wcfsetup/install/files/images/smilies/w00t_emojione.png
new file mode 100644
index 0000000000..c3bea9f251
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/w00t_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/wacko.png b/wcfsetup/install/files/images/smilies/wacko.png
deleted file mode 100644
index a30bdf4893..0000000000
Binary files a/wcfsetup/install/files/images/smilies/wacko.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/wacko_emojione.png b/wcfsetup/install/files/images/smilies/wacko_emojione.png
new file mode 100644
index 0000000000..f0dae7b789
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/wacko_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/whistling.png b/wcfsetup/install/files/images/smilies/whistling.png
deleted file mode 100644
index f70f532cce..0000000000
Binary files a/wcfsetup/install/files/images/smilies/whistling.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/whistling_emojione.png b/wcfsetup/install/files/images/smilies/whistling_emojione.png
new file mode 100644
index 0000000000..39d325fd8e
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/whistling_emojione.png differ
diff --git a/wcfsetup/install/files/images/smilies/wink.png b/wcfsetup/install/files/images/smilies/wink.png
deleted file mode 100644
index 87ebba3242..0000000000
Binary files a/wcfsetup/install/files/images/smilies/wink.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/smilies/wink_emojione.png b/wcfsetup/install/files/images/smilies/wink_emojione.png
new file mode 100644
index 0000000000..7ea7810a37
Binary files /dev/null and b/wcfsetup/install/files/images/smilies/wink_emojione.png differ
diff --git a/wcfsetup/install/files/style/ui/redactor.scss b/wcfsetup/install/files/style/ui/redactor.scss
index e45282a7c8..b3dbbec6f0 100644
--- a/wcfsetup/install/files/style/ui/redactor.scss
+++ b/wcfsetup/install/files/style/ui/redactor.scss
@@ -500,10 +500,24 @@
 	margin: 0 0 20px 20px;
 }
 
+.smiley,
+.jsSmiley > img {
+	&[src$="_emojione.png"] {
+		max-height: 20px;
+	}
+}
+
 .smiley {
 	margin: 0 1px;
 }
 
+@include screen-md-down {
+	.jsSmiley {
+		display: inline-block;
+		padding: 10px;
+	}
+}
+
 .wysiwygTextarea {
 	background-color: transparent !important;
 	border: 1px solid $wcfContentBorderInner !important;
diff --git a/wcfsetup/install/files/tmp/.htaccess b/wcfsetup/install/files/tmp/.htaccess
new file mode 100644
index 0000000000..3418e55a68
--- /dev/null
+++ b/wcfsetup/install/files/tmp/.htaccess
@@ -0,0 +1 @@
+deny from all
\ No newline at end of file