diff --git a/data/emoticons/animated/emoticons.py b/data/emoticons/animated/emoticons.py
index 39bb43339..b22f92258 100644
--- a/data/emoticons/animated/emoticons.py
+++ b/data/emoticons/animated/emoticons.py
@@ -23,7 +23,7 @@ emoticons = {
 	':-/': 'frowning.png',
 	'(})': 'hugleft.png',
 	':$': 'blush.png',
-	'(Y)': 'yes.png',
+	'(Y)': 'thumbup.png',
 	':-@': 'angry.png',
 	':-D': 'biggrin.png',
 	'(U)': 'brheart.png',
@@ -41,7 +41,7 @@ emoticons = {
 	'B-)': 'coolglasses.png',
 	'(Z)': 'boy.png',
 	'(E)': 'mail.png',
-	'(N)': 'no.png',
+	'(N)': 'thumbdown.png',
 	'(P)': 'photo.png',
 	'(K)': 'kiss.png',
 	':-*': 'kiss.png',
diff --git a/data/emoticons/animated/no.png b/data/emoticons/animated/no.png
deleted file mode 100644
index 37cd41a56..000000000
Binary files a/data/emoticons/animated/no.png and /dev/null differ
diff --git a/data/emoticons/animated/thumbdown.png b/data/emoticons/animated/thumbdown.png
new file mode 100644
index 000000000..a6ce7f1d3
Binary files /dev/null and b/data/emoticons/animated/thumbdown.png differ
diff --git a/data/emoticons/animated/thumbup.png b/data/emoticons/animated/thumbup.png
new file mode 100644
index 000000000..b2da92bcd
Binary files /dev/null and b/data/emoticons/animated/thumbup.png differ
diff --git a/data/emoticons/animated/yes.png b/data/emoticons/animated/yes.png
deleted file mode 100644
index 61930fe9e..000000000
Binary files a/data/emoticons/animated/yes.png and /dev/null differ
diff --git a/data/emoticons/static-big/emoticons.py b/data/emoticons/static-big/emoticons.py
index d687d15ce..194ba649a 100644
--- a/data/emoticons/static-big/emoticons.py
+++ b/data/emoticons/static-big/emoticons.py
@@ -67,10 +67,10 @@ emoticons = {
 	'(W)': 'brflower.png',
 	'(Z)': 'boy.png',
 	'(E)': 'mail.png',
-	'(N)': 'no.png',
+	'(N)': 'thumbdown.png',
 	'(P)': 'photo.png',
 	'(K)': 'kiss.png',
-	'(Y)': 'yes.png',
+	'(Y)': 'thumbup.png',
 	'(})': 'hugleft.png',
 	'(U)': 'brheart.png',
 	'(F)': 'flower.png',
diff --git a/data/emoticons/static-big/no.png b/data/emoticons/static-big/no.png
deleted file mode 100644
index 37cd41a56..000000000
Binary files a/data/emoticons/static-big/no.png and /dev/null differ
diff --git a/data/emoticons/static-big/thumbdown.png b/data/emoticons/static-big/thumbdown.png
new file mode 100644
index 000000000..a6ce7f1d3
Binary files /dev/null and b/data/emoticons/static-big/thumbdown.png differ
diff --git a/data/emoticons/static-big/thumbup.png b/data/emoticons/static-big/thumbup.png
new file mode 100644
index 000000000..b2da92bcd
Binary files /dev/null and b/data/emoticons/static-big/thumbup.png differ
diff --git a/data/emoticons/static-big/yes.png b/data/emoticons/static-big/yes.png
deleted file mode 100644
index 61930fe9e..000000000
Binary files a/data/emoticons/static-big/yes.png and /dev/null differ
diff --git a/data/emoticons/static/emoticons.py b/data/emoticons/static/emoticons.py
index d687d15ce..194ba649a 100644
--- a/data/emoticons/static/emoticons.py
+++ b/data/emoticons/static/emoticons.py
@@ -67,10 +67,10 @@ emoticons = {
 	'(W)': 'brflower.png',
 	'(Z)': 'boy.png',
 	'(E)': 'mail.png',
-	'(N)': 'no.png',
+	'(N)': 'thumbdown.png',
 	'(P)': 'photo.png',
 	'(K)': 'kiss.png',
-	'(Y)': 'yes.png',
+	'(Y)': 'thumbup.png',
 	'(})': 'hugleft.png',
 	'(U)': 'brheart.png',
 	'(F)': 'flower.png',
diff --git a/data/emoticons/static/no.png b/data/emoticons/static/no.png
deleted file mode 100644
index 3454aa8c5..000000000
Binary files a/data/emoticons/static/no.png and /dev/null differ
diff --git a/data/emoticons/static/thumbdown.png b/data/emoticons/static/thumbdown.png
new file mode 100644
index 000000000..9cffa0fa0
Binary files /dev/null and b/data/emoticons/static/thumbdown.png differ
diff --git a/data/emoticons/static/thumbup.png b/data/emoticons/static/thumbup.png
new file mode 100644
index 000000000..deb8aa440
Binary files /dev/null and b/data/emoticons/static/thumbup.png differ
diff --git a/data/emoticons/static/yes.png b/data/emoticons/static/yes.png
deleted file mode 100644
index c64b81016..000000000
Binary files a/data/emoticons/static/yes.png and /dev/null differ