diff --git a/plugins/github/github.iml b/plugins/github/github.iml
index 435080cfd90a..f9bf2af0bc3f 100644
--- a/plugins/github/github.iml
+++ b/plugins/github/github.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -16,6 +17,7 @@
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="platform-impl" />
     <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
 
diff --git a/plugins/github/resources/org/jetbrains/plugins/github/github_icon.png b/plugins/github/resources/org/jetbrains/plugins/github/github_icon.png
new file mode 100644
index 000000000000..6e0c459fe429
Binary files /dev/null and b/plugins/github/resources/org/jetbrains/plugins/github/github_icon.png differ
diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java
index b914554ad992..2bcd95f7a554 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java
@@ -43,11 +43,10 @@ import java.util.regex.Pattern;
  * @date 9/27/11
  */
 public class GithubCreateGistAction extends DumbAwareAction {
-  public static final Icon ICON = IconLoader.getIcon("/icons/github.png");
   private static final Logger LOG = Logger.getInstance(GithubCreateGistAction.class);
 
   protected GithubCreateGistAction() {
-    super("Create Gist...", "Create github gist", ICON);
+    super("Create Gist...", "Create github gist", GithubUtil.GITHUB_ICON);
   }
 
   @Override
diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java
index 604e9eb7cc06..02f101be1f31 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java
@@ -41,12 +41,11 @@ import javax.swing.*;
  * @date 12/10/10
  */
 public class GithubOpenInBrowserAction extends DumbAwareAction {
-  public static final Icon ICON = IconLoader.getIcon("/icons/github.png");
   public static final String CANNOT_OPEN_IN_BROWSER = "Cannot open in browser";
   private static final Logger LOG = Logger.getInstance(GithubOpenInBrowserAction.class.getName());
 
   protected GithubOpenInBrowserAction() {
-    super("Open in browser", "Open corresponding GitHub link in browser", ICON);
+    super("Open in browser", "Open corresponding GitHub link in browser", GithubUtil.GITHUB_ICON);
   }
 
   @Override
diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java
index 910079479ff0..9a18c5e636f0 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java
@@ -46,12 +46,11 @@ import javax.swing.*;
  * @date 12/8/10
  */
 public class GithubRebaseAction extends DumbAwareAction {
-  public static final Icon ICON = IconLoader.getIcon("/icons/github.png");
   private static final Logger LOG = Logger.getInstance(GithubRebaseAction.class.getName());
   private static final String CANNOT_PERFORM_GITHUB_REBASE = "Cannot perform github rebase";
 
   public GithubRebaseAction() {
-    super("Rebase my GitHub fork", "Rebase your GitHub forked repository relative to the origin", ICON);
+    super("Rebase my GitHub fork", "Rebase your GitHub forked repository relative to the origin", GithubUtil.GITHUB_ICON);
   }
 
   public void update(AnActionEvent e) {
diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
index 9ffdc2bdf642..3134de7f1fb7 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
@@ -46,11 +46,10 @@ import java.util.List;
  * @author oleg
  */
 public class GithubShareAction extends DumbAwareAction {
-  public static final Icon ICON = IconLoader.getIcon("/icons/github.png");
   private static final Logger LOG = Logger.getInstance(GithubShareAction.class.getName());
 
   public GithubShareAction() {
-    super("Share project on GitHub", "Easily share project on GitHub", ICON);
+    super("Share project on GitHub", "Easily share project on GitHub", GithubUtil.GITHUB_ICON);
   }
 
   public void update(AnActionEvent e) {
diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
index c75af97136a2..b9cf47431b05 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.net.HttpConfigurable;
@@ -42,6 +43,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.github.ui.GithubLoginDialog;
 
+import javax.swing.*;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -53,6 +55,8 @@ import java.util.List;
 public class GithubUtil {
   private static final String API_URL = "/api/v2/xml";
   private static final Logger LOG = Logger.getInstance(GithubUtil.class.getName());
+  public static final Icon GITHUB_ICON = IconLoader.getIcon("/org/jetbrains/plugins/github/github_icon.png");
+
 
   public static String getHttpsUrl() {
     return "https://" + GithubSettings.getInstance().getHost();
diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java
index 3b22418f2818..b5dfe06f98a9 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java
@@ -6,6 +6,7 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.IconLoader;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.github.GithubSettings;
+import org.jetbrains.plugins.github.GithubUtil;
 
 import javax.swing.*;
 
@@ -13,7 +14,6 @@ import javax.swing.*;
  * @author oleg
  */
 public class GitHubSettingsConfigurable implements SearchableConfigurable {
-  public static final Icon ICON = IconLoader.getIcon("/icons/github.png");
   private GithubSettingsPanel mySettingsPane;
   private final GithubSettings mySettings;
 
@@ -26,7 +26,7 @@ public class GitHubSettingsConfigurable implements SearchableConfigurable {
   }
 
   public Icon getIcon() {
-    return ICON;
+    return GithubUtil.GITHUB_ICON;
   }
 
   public String getHelpTopic() {