diff --git a/res/drawable-xhdpi/emo_im_angel.png b/res/drawable-xhdpi/emo_im_angel.png
deleted file mode 100644
index 2cbb7dace..000000000
Binary files a/res/drawable-xhdpi/emo_im_angel.png and /dev/null differ
diff --git a/res/drawable-xhdpi/emo_im_cool.png b/res/drawable-xhdpi/emo_im_cool.png
deleted file mode 100644
index 3813bc6a2..000000000
Binary files a/res/drawable-xhdpi/emo_im_cool.png and /dev/null differ
diff --git a/res/drawable-xhdpi/emo_im_crying.png b/res/drawable-xhdpi/emo_im_crying.png
deleted file mode 100644
index 3982d7052..000000000
Binary files a/res/drawable-xhdpi/emo_im_crying.png and /dev/null differ
diff --git a/res/drawable-xhdpi/emo_im_happy.png b/res/drawable-xhdpi/emo_im_happy.png
deleted file mode 100644
index f1e47237f..000000000
Binary files a/res/drawable-xhdpi/emo_im_happy.png and /dev/null differ
diff --git a/res/drawable-xhdpi/emo_im_kissing.png b/res/drawable-xhdpi/emo_im_kissing.png
deleted file mode 100644
index 21e5d304f..000000000
Binary files a/res/drawable-xhdpi/emo_im_kissing.png and /dev/null differ
diff --git a/res/drawable-xhdpi/emo_im_laughing.png b/res/drawable-xhdpi/emo_im_laughing.png
deleted file mode 100644
index 03aa60a77..000000000
Binary files a/res/drawable-xhdpi/emo_im_laughing.png and /dev/null differ
diff --git a/res/drawable-xhdpi/emo_im_money_mouth.png b/res/drawable-xhdpi/emo_im_money_mouth.png
deleted file mode 100644
index 957bc906b..000000000
Binary files a/res/drawable-xhdpi/emo_im_money_mouth.png and /dev/null differ
diff --git a/res/drawable-xhdpi/emo_im_sad.png b/res/drawable-xhdpi/emo_im_sad.png
deleted file mode 100644
index bcfe71b4c..000000000
Binary files a/res/drawable-xhdpi/emo_im_sad.png and /dev/null differ
diff --git a/res/drawable-xhdpi/emo_im_surprised.png b/res/drawable-xhdpi/emo_im_surprised.png
deleted file mode 100644
index 961a9bbfc..000000000
Binary files a/res/drawable-xhdpi/emo_im_surprised.png and /dev/null differ
diff --git a/res/drawable-xhdpi/emo_im_tongue_sticking_out.png b/res/drawable-xhdpi/emo_im_tongue_sticking_out.png
deleted file mode 100644
index 7a1235c78..000000000
Binary files a/res/drawable-xhdpi/emo_im_tongue_sticking_out.png and /dev/null differ
diff --git a/res/drawable-xhdpi/emo_im_undecided.png b/res/drawable-xhdpi/emo_im_undecided.png
deleted file mode 100644
index 72bf2f2ed..000000000
Binary files a/res/drawable-xhdpi/emo_im_undecided.png and /dev/null differ
diff --git a/res/drawable-xhdpi/emo_im_winking.png b/res/drawable-xhdpi/emo_im_winking.png
deleted file mode 100644
index b8fd6d9e3..000000000
Binary files a/res/drawable-xhdpi/emo_im_winking.png and /dev/null differ
diff --git a/res/drawable-xhdpi/emo_im_wtf.png b/res/drawable-xhdpi/emo_im_wtf.png
deleted file mode 100644
index b22179523..000000000
Binary files a/res/drawable-xhdpi/emo_im_wtf.png and /dev/null differ
diff --git a/res/drawable-xhdpi/emo_im_yelling.png b/res/drawable-xhdpi/emo_im_yelling.png
deleted file mode 100644
index 59798cbe0..000000000
Binary files a/res/drawable-xhdpi/emo_im_yelling.png and /dev/null differ
diff --git a/src/org/linphone/ui/BubbleChat.java b/src/org/linphone/ui/BubbleChat.java
index 7ff74ef65..e4a6c53cb 100644
--- a/src/org/linphone/ui/BubbleChat.java
+++ b/src/org/linphone/ui/BubbleChat.java
@@ -66,36 +66,6 @@ import android.widget.TextView;
 @SuppressLint("SimpleDateFormat")
 public class BubbleChat {
 	private static final HashMap<String, Integer> emoticons = new HashMap<String, Integer>();
-	static {
-	    emoticons.put(":)", R.drawable.emo_im_happy);
-	    emoticons.put(":-)", R.drawable.emo_im_happy);
-	    emoticons.put(":(", R.drawable.emo_im_sad);
-	    emoticons.put(":-(", R.drawable.emo_im_sad);
-	    emoticons.put(":-P", R.drawable.emo_im_tongue_sticking_out);
-	    emoticons.put(":P", R.drawable.emo_im_tongue_sticking_out);
-	    emoticons.put(";-)", R.drawable.emo_im_winking);
-	    emoticons.put(";)", R.drawable.emo_im_winking);
-	    emoticons.put(":-D", R.drawable.emo_im_laughing);
-	    emoticons.put(":D", R.drawable.emo_im_laughing);
-	    emoticons.put("8-)", R.drawable.emo_im_cool);
-	    emoticons.put("8)", R.drawable.emo_im_cool);
-	    emoticons.put("O:)", R.drawable.emo_im_angel);
-	    emoticons.put("O:-)", R.drawable.emo_im_angel);
-	    emoticons.put(":-*", R.drawable.emo_im_kissing);
-	    emoticons.put(":*", R.drawable.emo_im_kissing);
-	    emoticons.put(":-/", R.drawable.emo_im_undecided);
-	    emoticons.put(":/ ", R.drawable.emo_im_undecided); // The space after is needed to avoid bad display of links
-	    emoticons.put(":-\\", R.drawable.emo_im_undecided);
-	    emoticons.put(":\\", R.drawable.emo_im_undecided);
-	    emoticons.put(":-O", R.drawable.emo_im_surprised);
-	    emoticons.put(":O", R.drawable.emo_im_surprised);
-	    emoticons.put(":-@", R.drawable.emo_im_yelling);
-	    emoticons.put(":@", R.drawable.emo_im_yelling);
-	    emoticons.put("O.o", R.drawable.emo_im_wtf);
-	    emoticons.put("o.O", R.drawable.emo_im_wtf);
-	    emoticons.put(":'(", R.drawable.emo_im_crying);
-	    emoticons.put("$.$", R.drawable.emo_im_money_mouth);
-	}
 	
 	private RelativeLayout view;
 	private ImageView statusView;