diff --git a/core/src/main/java/org/jivesoftware/resource/SparkRes.java b/core/src/main/java/org/jivesoftware/resource/SparkRes.java
index ae060af47..8b6a713c4 100644
--- a/core/src/main/java/org/jivesoftware/resource/SparkRes.java
+++ b/core/src/main/java/org/jivesoftware/resource/SparkRes.java
@@ -188,7 +188,6 @@ public class SparkRes {
         MESSAGE_AWAY("MESSAGE_AWAY"),
         MESSAGE_DND("MESSAGE_DND"),
         MESSAGE_NEW_TRAY("MESSAGE_NEW_TRAY"),
-        MESSAGE_NEW_TRAY_LINUX("MESSAGE_NEW_TRAY_LINUX"),
         MINUS_SIGN("MINUS_SIGN"),
         MOBILE_PHONE_IMAGE("MOBILE_PHONE_IMAGE"),
         MODERATOR_IMAGE("MODERATOR_IMAGE"),
@@ -325,19 +324,12 @@ public class SparkRes {
         TRANSFER_IMAGE_24x24("TRANSFER_IMAGE_24x24"),
         TRANSPORT_ICON("TRANSPORT_ICON"),
         TRAY_AWAY("TRAY_AWAY"),
-        TRAY_AWAY_LINUX("TRAY_AWAY_LINUX"),
         TRAY_CONNECTING("TRAY_CONNECTING"),
-        TRAY_CONNECTING_LINUX("TRAY_CONNECTING_LINUX"),
         TRAY_DND("TRAY_DND"),
-        TRAY_DND_LINUX("TRAY_DND_LINUX"),
         TRAY_IMAGE("TRAY_IMAGE"),
-        TRAY_IMAGE_LINUX("TRAY_IMAGE_LINUX"),
         TRAY_OFFLINE("TRAY_OFFLINE"),
-        TRAY_OFFLINE_LINUX("TRAY_OFFLINE_LINUX"),
         TRAY_XAWAY("TRAY_XAWAY"),
-        TRAY_XAWAY_LINUX("TRAY_XAWAY_LINUX"),
         TYPING_TRAY("TYPING_TRAY"),
-        TYPING_TRAY_LINUX("TYPING_TRAY_LINUX"),
         UNBLOCK_CONTACT_16x16("UNBLOCK_CONTACT_16x16"),
         UNRECOVERABLE_ERROR("UNRECOVERABLE_ERROR"),
         UPLOAD_ICON("UPLOAD_ICON"),
diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/systray/SysTrayPlugin.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/systray/SysTrayPlugin.java
index f9ee68e2d..c12fcfe8c 100644
--- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/systray/SysTrayPlugin.java
+++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/systray/SysTrayPlugin.java
@@ -103,34 +103,18 @@ public class SysTrayPlugin implements Plugin, NativeHandler, ChatStateListener {
         //XEP-0085 support (replaces the obsolete XEP-0022)
         ChatStateManager.getInstance(SparkManager.getConnection()).addChatStateListener(this);
 
-        if (Spark.isLinux()) {
-            newMessageIcon = SparkRes.getImageIcon(SparkRes.Icon.MESSAGE_NEW_TRAY_LINUX);
-            typingIcon = SparkRes.getImageIcon(SparkRes.Icon.TYPING_TRAY_LINUX);
-        } else {
-            newMessageIcon = SparkRes.getImageIcon(SparkRes.Icon.MESSAGE_NEW_TRAY);
-            typingIcon = SparkRes.getImageIcon(SparkRes.Icon.TYPING_TRAY);
-        }
+        newMessageIcon = SparkRes.getImageIcon(SparkRes.Icon.MESSAGE_NEW_TRAY);
+        typingIcon = SparkRes.getImageIcon(SparkRes.Icon.TYPING_TRAY);
 
         availableIcon = Default.getImageIcon(Default.TRAY_IMAGE);
-        if (Spark.isLinux()) {
-            if (availableIcon == null) {
-                availableIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_IMAGE_LINUX);
-            }
-            awayIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_AWAY_LINUX);
-            xawayIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_XAWAY_LINUX);
-            dndIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_DND_LINUX);
-            offlineIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_OFFLINE_LINUX);
-            connectingIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_CONNECTING_LINUX);
-        } else {
-            if (availableIcon == null) {
-                availableIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_IMAGE);
-            }
-            awayIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_AWAY);
-            xawayIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_XAWAY);
-            dndIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_DND);
-            offlineIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_OFFLINE);
-            connectingIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_CONNECTING);
+        if (availableIcon == null) {
+            availableIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_IMAGE);
         }
+        awayIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_AWAY);
+        xawayIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_XAWAY);
+        dndIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_DND);
+        offlineIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_OFFLINE);
+        connectingIcon = SparkRes.getImageIcon(SparkRes.Icon.TRAY_CONNECTING);
 
         popupMenu.add(openMenu);
 
@@ -139,7 +123,6 @@ public class SysTrayPlugin implements Plugin, NativeHandler, ChatStateListener {
             public void actionPerformed(ActionEvent event) {
                 SparkManager.getMainWindow().bringFrameIntoFocus();
             }
-
         });
 
         popupMenu.add(minimizeMenu);
diff --git a/core/src/main/resources/spark.properties b/core/src/main/resources/spark.properties
index 0424771b9..b947ffb6d 100644
--- a/core/src/main/resources/spark.properties
+++ b/core/src/main/resources/spark.properties
@@ -35,18 +35,12 @@ PRIVACY_DEACTIVATE_LIST = images/icons/privacy_list_deactivate.png
 
 #MainWindow
 MAIN_IMAGE = images/spark-64x64.png
-TRAY_IMAGE = images/spark-16x16.png
-TRAY_AWAY = images/icons/Away.png
-TRAY_XAWAY = images/icons/XAway.png
-TRAY_DND = images/icons/DoNotDisturb.png
-TRAY_OFFLINE = images/spark_tray_offline-16x16.png
-TRAY_CONNECTING = images/icons/spark_tray_connecting-16x16.png
-TRAY_IMAGE_LINUX = images/spark-24x24.png
-TRAY_AWAY_LINUX = images/icons/Away-24x24.png
-TRAY_XAWAY_LINUX = images/icons/XAway-24x24.png
-TRAY_DND_LINUX = images/icons/DoNotDisturb-24x24.png
-TRAY_OFFLINE_LINUX = images/spark_tray_offline-24x24.png
-TRAY_CONNECTING_LINUX = images/icons/spark_tray_connecting-24x24.png
+TRAY_IMAGE = images/spark-24x24.png
+TRAY_AWAY = images/icons/Away-24x24.png
+TRAY_XAWAY = images/icons/XAway-24x24.png
+TRAY_DND = images/icons/DoNotDisturb-24x24.png
+TRAY_OFFLINE = images/spark_tray_offline-24x24.png
+TRAY_CONNECTING = images/icons/spark_tray_connecting-24x24.png
 SPARK_IMAGE_32x32 = images/spark-32x32.png
 MAIN_IMAGE_ICO = images/icon_16.ico
 MAIN_ICNS_FILE = images/message.icns
@@ -219,10 +213,8 @@ IM_XA = images/icons/im_xa.png
 INVISIBLE = images/icons/im_unavailable_stale.png
 MESSAGE_AWAY = images/icons/Away.png
 MESSAGE_DND = images/icons/DoNotDisturb.png
-MESSAGE_NEW_TRAY = images/icons/spark_tray_message-16x16.png
-MESSAGE_NEW_TRAY_LINUX = images/icons/spark_tray_message-24x24.png
+MESSAGE_NEW_TRAY = images/icons/spark_tray_message-24x24.png
 TYPING_TRAY = images/icons/edit.png
-TYPING_TRAY_LINUX = images/icons/edit.png
 OFFLINE_IMAGE = images/Offline.png
 ERASER_IMAGE = images/icons/clear.png
 TOOLBAR_BACKGROUND = images/toolbar.png