diff --git a/python/gen/icons/PythonIcons.java b/python/gen/icons/PythonIcons.java
index 584c8a9561e4..c6b70836416f 100644
--- a/python/gen/icons/PythonIcons.java
+++ b/python/gen/icons/PythonIcons.java
@@ -47,6 +47,7 @@ public class PythonIcons {
 
     }
     public static final Icon Dotnet = load("/icons/com/jetbrains/python/dotnet.png"); // 16x16
+    public static final Icon Function = load("/icons/com/jetbrains/python/function.png"); // 16x16
     public static final Icon InterpreterGear = load("/icons/com/jetbrains/python/interpreterGear.png"); // 16x16
     public static final Icon IpythonNotebook = load("/icons/com/jetbrains/python/IpythonNotebook.png"); // 16x16
     public static final Icon Jython = load("/icons/com/jetbrains/python/jython.png"); // 16x16
diff --git a/python/resources/icons/com/jetbrains/python/function.png b/python/resources/icons/com/jetbrains/python/function.png
new file mode 100644
index 000000000000..82adbe1dc0b4
Binary files /dev/null and b/python/resources/icons/com/jetbrains/python/function.png differ
diff --git a/python/resources/icons/com/jetbrains/python/function@2x.png b/python/resources/icons/com/jetbrains/python/function@2x.png
new file mode 100644
index 000000000000..92f589d42d89
Binary files /dev/null and b/python/resources/icons/com/jetbrains/python/function@2x.png differ
diff --git a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
index 2e8e7196a80c..68ad9386e4a4 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
@@ -131,8 +131,11 @@ public class PyFunctionImpl extends PyBaseElementImpl<PyFunctionStub> implements
         }
         return PlatformIcons.PROPERTY_ICON;
       }
+      if (getContainingClass() != null) {
+        return PlatformIcons.METHOD_ICON;
+      }
     }
-    return PlatformIcons.METHOD_ICON;
+    return PythonIcons.Python.Function;
   }
 
   @Nullable