diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java b/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
index 73d61ef4fb33..c5fb12287a49 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
@@ -99,7 +99,7 @@ public class FunctionalExpressionCompletionProvider extends CompletionProvider<C
               LookupElementBuilder.create(functionalInterfaceMethod, paramsString + " -> ")
                 .withPresentableText(paramsString + " -> {}")
                 .withTypeText(functionalInterfaceType.getPresentableText())
-                .withIcon(AllIcons.Nodes.Function);
+                .withIcon(AllIcons.Nodes.Lambda);
             builder.putUserData(LAMBDA_ITEM, true);
             result.consume(builder.withAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE));
           }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java
index 6c098e7c367c..c61e6240d89e 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java
@@ -264,6 +264,6 @@ public class PsiLambdaExpressionImpl extends JavaStubPsiElement<FunctionalExpres
   @Nullable
   @Override
   public Icon getIcon(int flags) {
-    return AllIcons.Nodes.Function;
+    return AllIcons.Nodes.Lambda;
   }
 }
diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaLambdaNodeProvider.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaLambdaNodeProvider.java
index 13ed6f5ac4f1..b835af898d6b 100644
--- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaLambdaNodeProvider.java
+++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaLambdaNodeProvider.java
@@ -56,7 +56,7 @@ public class JavaLambdaNodeProvider
   @NotNull
   @Override
   public ActionPresentation getPresentation() {
-    return new ActionPresentationData(getCheckBoxText(), null, AllIcons.Nodes.Function);
+    return new ActionPresentationData(getCheckBoxText(), null, AllIcons.Nodes.Lambda);
   }
 
   @NotNull
diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaLambdaTreeElement.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaLambdaTreeElement.java
index 4287e4d4fc3c..abe09c029fcf 100644
--- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaLambdaTreeElement.java
+++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaLambdaTreeElement.java
@@ -87,6 +87,6 @@ public class JavaLambdaTreeElement extends JavaClassTreeElementBase<PsiLambdaExp
 
   @Override
   public Icon getIcon(boolean open) {
-    return AllIcons.Nodes.Function;
+    return AllIcons.Nodes.Lambda;
   }
 }
diff --git a/platform/script-debugger/debugger-ui/src/VariableView.kt b/platform/script-debugger/debugger-ui/src/VariableView.kt
index 26461ca71b5d..d452b32eecef 100644
--- a/platform/script-debugger/debugger-ui/src/VariableView.kt
+++ b/platform/script-debugger/debugger-ui/src/VariableView.kt
@@ -440,7 +440,7 @@ class VariableView(override val variableName: String, private val variable: Vari
     fun getIcon(value: Value): Icon {
       val type = value.type
       return when (type) {
-        ValueType.FUNCTION -> AllIcons.Nodes.Function
+        ValueType.FUNCTION -> AllIcons.Nodes.Lambda
         ValueType.ARRAY -> AllIcons.Debugger.Db_array
         else -> if (type.isObjectType) AllIcons.Debugger.Value else AllIcons.Debugger.Db_primitive
       }
diff --git a/plugins/sh/src/com/intellij/sh/ShStructureViewFactory.java b/plugins/sh/src/com/intellij/sh/ShStructureViewFactory.java
index 2d48e7e2b48b..bba1b674b9d3 100644
--- a/plugins/sh/src/com/intellij/sh/ShStructureViewFactory.java
+++ b/plugins/sh/src/com/intellij/sh/ShStructureViewFactory.java
@@ -130,7 +130,7 @@ public class ShStructureViewFactory implements PsiStructureViewFactory {
     public Icon getIcon(boolean open) {
       if (!myElement.isValid()) return null;
       if (myElement instanceof ShFunctionDefinition) {
-        return AllIcons.Nodes.Function;
+        return AllIcons.Nodes.Lambda;
       }
       return myElement.getIcon(0);
     }
diff --git a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
index 225f0290f077..39989911bd03 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
@@ -2,6 +2,7 @@
 package com.jetbrains.python.psi.impl;
 
 import com.google.common.collect.ImmutableMap;
+import com.intellij.icons.AllIcons;
 import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.openapi.util.Key;
@@ -128,7 +129,7 @@ public class PyFunctionImpl extends PyBaseElementImpl<PyFunctionStub> implements
     if (getContainingClass() != null) {
       return PlatformIcons.METHOD_ICON;
     }
-    return PythonIcons.Python.Function;
+    return AllIcons.Nodes.Function;
   }
 
   @Override
diff --git a/python/src/com/jetbrains/python/testing/pyTestFixtures/PyTestFixtureAsParameterProvider.kt b/python/src/com/jetbrains/python/testing/pyTestFixtures/PyTestFixtureAsParameterProvider.kt
index ca7a41fd6bd8..2d870b4850c1 100644
--- a/python/src/com/jetbrains/python/testing/pyTestFixtures/PyTestFixtureAsParameterProvider.kt
+++ b/python/src/com/jetbrains/python/testing/pyTestFixtures/PyTestFixtureAsParameterProvider.kt
@@ -1,16 +1,16 @@
 package com.jetbrains.python.testing.pyTestFixtures
 
+import com.intellij.icons.AllIcons
 import com.intellij.openapi.module.Module
 import com.jetbrains.python.psi.PyFunction
 import com.jetbrains.python.psi.types.TypeEvalContext
 import com.jetbrains.python.testing.PyTestFunctionParameter
 import com.jetbrains.python.testing.PyTestFunctionParameterProvider
-import icons.PythonIcons
 
 /**
  * Test fixtures for pytest tests and other fixtures
  */
 internal object PyTestFixtureAsParameterProvider : PyTestFunctionParameterProvider {
   override fun getArguments(function: PyFunction, evalContext: TypeEvalContext, module: Module) =
-    getFixtures(module, function, evalContext).map { PyTestFunctionParameter(it.name, PythonIcons.Python.Function) }
+    getFixtures(module, function, evalContext).map { PyTestFunctionParameter(it.name, AllIcons.Nodes.Function) }
 }