diff --git a/src/java/org/jivesoftware/resource/spark.properties b/src/java/org/jivesoftware/resource/spark.properties
index f1691358..823b0227 100644
--- a/src/java/org/jivesoftware/resource/spark.properties
+++ b/src/java/org/jivesoftware/resource/spark.properties
@@ -346,3 +346,5 @@ ACCEPT_INVITE_IMAGE = images/accept.png
 REJECT_INVITE_IMAGE = images/reject.png
 INVITE_MORE_IMAGE = images/invitemore.png
 
+# Lanuage
+LANGUAGE_ICON = images/language_plugin.png
\ No newline at end of file
diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/language/LanguagePlugin.java b/src/java/org/jivesoftware/sparkimpl/plugin/language/LanguagePlugin.java
index f73813db..27e327dd 100644
--- a/src/java/org/jivesoftware/sparkimpl/plugin/language/LanguagePlugin.java
+++ b/src/java/org/jivesoftware/sparkimpl/plugin/language/LanguagePlugin.java
@@ -20,6 +20,7 @@
 package org.jivesoftware.sparkimpl.plugin.language;
 
 import org.jivesoftware.resource.Res;
+import org.jivesoftware.resource.SparkRes;
 import org.jivesoftware.spark.SparkManager;
 import org.jivesoftware.spark.plugin.Plugin;
 import org.jivesoftware.spark.util.log.Log;
@@ -57,14 +58,15 @@ public class LanguagePlugin implements Plugin {
         final JMenu actionsMenu = SparkManager.getMainWindow().getMenuByName(Res.getString("menuitem.actions"));
 
         languageMenu = new JMenu(Res.getString("menuitem.languages"));
+        languageMenu.setIcon(SparkRes.getImageIcon("LANGUAGE_ICON"));
 
         locales = Locale.getAvailableLocales();
 
         // Load files
         URL sparkJar = getClass().getClassLoader().getResource("spark.jar");
         if (sparkJar == null) {
-            // Do not initialize
-            return;
+            sparkJar =  getClass().getProtectionDomain().getCodeSource().getLocation();
+            if (sparkJar == null) return;
         }
 
         try {
diff --git a/src/resources/images/language_plugin.png b/src/resources/images/language_plugin.png
new file mode 100644
index 00000000..b5847c7b
Binary files /dev/null and b/src/resources/images/language_plugin.png differ