diff --git a/platform/core-api/src/com/intellij/ui/OffsetIcon.java b/platform/core-api/src/com/intellij/ui/OffsetIcon.java
new file mode 100644
index 000000000000..c1d89cbc28c6
--- /dev/null
+++ b/platform/core-api/src/com/intellij/ui/OffsetIcon.java
@@ -0,0 +1,102 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+
+package com.intellij.ui;
+
+import com.intellij.util.IconUtil;
+import com.intellij.util.ui.JBUI.CachingScalableJBIcon;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.Icon;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.util.Objects;
+
+import static com.intellij.util.ui.JBUI.ScaleType.OBJ_SCALE;
+import static java.lang.Math.ceil;
+
+public final class OffsetIcon extends CachingScalableJBIcon<OffsetIcon> {
+  private int myWidth;
+  private int myHeight;
+
+  private final int myOffset;
+  private final Icon myIcon;
+  private Icon myScaledIcon;
+  private int myScaledOffset;
+
+  {
+    getScaleContext().addUpdateListener(this::updateSize);
+    setAutoUpdateScaleContext(false);
+  }
+
+  public OffsetIcon(@NotNull Icon icon) {
+    this(20, icon);
+  }
+
+  public OffsetIcon(int offset, @NotNull Icon icon) {
+    myOffset = offset;
+    myIcon = icon;
+    updateSize();
+  }
+
+  private OffsetIcon(@NotNull OffsetIcon icon) {
+    super(icon);
+    myWidth = icon.myWidth;
+    myHeight = icon.myHeight;
+    myOffset = icon.myOffset;
+    myIcon = icon.myIcon;
+    myScaledIcon = null;
+    myScaledOffset = icon.myScaledOffset;
+  }
+
+  @NotNull
+  @Override
+  protected OffsetIcon copy() {
+    return new OffsetIcon(this);
+  }
+
+  @NotNull
+  public Icon getIcon() {
+    return myIcon;
+  }
+
+  public int hashCode() {
+    return myIcon.hashCode();
+  }
+
+  public boolean equals(Object obj) {
+    return obj instanceof OffsetIcon && Objects.equals(((OffsetIcon)obj).myIcon, myIcon);
+  }
+
+  @Override
+  public void paintIcon(Component c, Graphics g, int x, int y) {
+    getScaleContext().update();
+    if (myScaledIcon == null) {
+      float scale = getScale();
+      myScaledIcon = scale == 1f ? myIcon : IconUtil.scale(myIcon, null, scale);
+    }
+    myScaledIcon.paintIcon(c, g, myScaledOffset + x, y);
+  }
+
+  @Override
+  public int getIconWidth() {
+    getScaleContext().update();
+    return (int)ceil(scaleVal(myWidth, OBJ_SCALE)) + myScaledOffset;
+  }
+
+  @Override
+  public int getIconHeight() {
+    getScaleContext().update();
+    return (int)ceil(scaleVal(myHeight, OBJ_SCALE));
+  }
+
+  private void updateSize() {
+    myWidth = myIcon.getIconWidth();
+    myHeight = myIcon.getIconHeight();
+    myScaledOffset = (int)ceil(scaleVal(myOffset));
+  }
+
+  @Override
+  public String toString() {
+    return "OffsetIcon: offset=" + myOffset + "; icon=" + myIcon;
+  }
+}