diff --git a/platform/dvcs-impl/dvcs-impl.iml b/platform/dvcs-impl/dvcs-impl.iml
index 4c0daa71326c..43dd32b785b4 100644
--- a/platform/dvcs-impl/dvcs-impl.iml
+++ b/platform/dvcs-impl/dvcs-impl.iml
@@ -5,6 +5,7 @@
+
diff --git a/platform/dvcs-impl/resources/icons/Loading@2x.gif b/platform/dvcs-impl/resources/icons/Loading@2x.gif
new file mode 100644
index 000000000000..77c756d99cb1
Binary files /dev/null and b/platform/dvcs-impl/resources/icons/Loading@2x.gif differ
diff --git a/platform/dvcs-impl/resources/icons/Loading@2x_dark.gif b/platform/dvcs-impl/resources/icons/Loading@2x_dark.gif
new file mode 100644
index 000000000000..f95c9287108f
Binary files /dev/null and b/platform/dvcs-impl/resources/icons/Loading@2x_dark.gif differ
diff --git a/platform/dvcs-impl/resources/icons/loading.gif b/platform/dvcs-impl/resources/icons/loading.gif
new file mode 100644
index 000000000000..bfd4da223753
Binary files /dev/null and b/platform/dvcs-impl/resources/icons/loading.gif differ
diff --git a/platform/dvcs-impl/resources/icons/loading_dark.gif b/platform/dvcs-impl/resources/icons/loading_dark.gif
new file mode 100644
index 000000000000..e41778b2c6e7
Binary files /dev/null and b/platform/dvcs-impl/resources/icons/loading_dark.gif differ
diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingTreeNode.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingTreeNode.java
index 1bd175c6db10..dc424df43b81 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingTreeNode.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingTreeNode.java
@@ -18,17 +18,18 @@ package com.intellij.dvcs.push.ui;
import com.intellij.ui.ColoredTreeCellRenderer;
import com.intellij.ui.JBColor;
import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.util.ui.UIUtil;
+import com.intellij.util.ImageLoader;
+import com.intellij.util.ui.JBImageIcon;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
+import java.awt.*;
import java.net.URL;
public class LoadingTreeNode extends DefaultMutableTreeNode implements CustomRenderedTreeNode {
@NotNull protected ImageIcon myLoadingIcon;
- private static final String LOADING_ICON = "loadingSimpleIcon.gif";
- private static final String LOADING_DARK_ICON = "loadingSimpleDarkIcon.gif";
+ private static final String LOADING_ICON = "/icons/loading.gif";
@NotNull
public ImageIcon getIcon() {
@@ -37,8 +38,9 @@ public class LoadingTreeNode extends DefaultMutableTreeNode implements CustomRen
public LoadingTreeNode() {
super(null, false);
- URL loadingIconPath = getClass().getResource(UIUtil.isUnderDarcula() ? LOADING_DARK_ICON : LOADING_ICON);
- myLoadingIcon = new ImageIcon(loadingIconPath.getPath());
+ URL loadingIconUrl = getClass().getResource(LOADING_ICON);
+ Image image = ImageLoader.loadFromUrl(loadingIconUrl);
+ myLoadingIcon = new JBImageIcon(image);
}
@Override