diff --git a/idea/resources/tips/Kotlin.html b/idea/resources/tips/Kotlin.html
new file mode 100644
index 00000000000..8d313976d1b
--- /dev/null
+++ b/idea/resources/tips/Kotlin.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+Kotlin is a powerful, concise and expressive language crafted by JetBrains.
+&productName; supports it out-of-the-box.
+To create a Kotlin file, right-click the target folder, and choose the corresponding option on the New menu:
+
+
+
\ No newline at end of file
diff --git a/idea/resources/tips/Kotlin_Java_convert.html b/idea/resources/tips/Kotlin_Java_convert.html
new file mode 100644
index 00000000000..79d06d5a1f2
--- /dev/null
+++ b/idea/resources/tips/Kotlin_Java_convert.html
@@ -0,0 +1,10 @@
+
+
+
+
+
+One can easily convert any Java class to the Kotlin one with the same semantics.
+To do that, just choose Code | Convert Java File to Kotlin File on the main menu:
+
+
+
\ No newline at end of file
diff --git a/idea/resources/tips/Kotlin_mix.html b/idea/resources/tips/Kotlin_mix.html
new file mode 100644
index 00000000000..3c569518446
--- /dev/null
+++ b/idea/resources/tips/Kotlin_mix.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+&productName; allows you to easily call a Java code from Kotlin:
+
+and vice versa:
+
+
+
\ No newline at end of file
diff --git a/idea/resources/tips/Kotlin_project.html b/idea/resources/tips/Kotlin_project.html
new file mode 100644
index 00000000000..09da59b07b1
--- /dev/null
+++ b/idea/resources/tips/Kotlin_project.html
@@ -0,0 +1,9 @@
+
+
+
+
+
+&productName; provides two Kotlin project types: Kotlin (JVM) and Kotlin (JavaScript):
+
+
+
\ No newline at end of file
diff --git a/idea/resources/tips/images/java_call_kotlin.png b/idea/resources/tips/images/java_call_kotlin.png
new file mode 100644
index 00000000000..018952e74ed
Binary files /dev/null and b/idea/resources/tips/images/java_call_kotlin.png differ
diff --git a/idea/resources/tips/images/java_call_kotlin@2x.png b/idea/resources/tips/images/java_call_kotlin@2x.png
new file mode 100644
index 00000000000..b370ce3a629
Binary files /dev/null and b/idea/resources/tips/images/java_call_kotlin@2x.png differ
diff --git a/idea/resources/tips/images/java_call_kotlin@2x_dark.png b/idea/resources/tips/images/java_call_kotlin@2x_dark.png
new file mode 100644
index 00000000000..f31544c1ea3
Binary files /dev/null and b/idea/resources/tips/images/java_call_kotlin@2x_dark.png differ
diff --git a/idea/resources/tips/images/java_call_kotlin_dark.png b/idea/resources/tips/images/java_call_kotlin_dark.png
new file mode 100644
index 00000000000..622efb12d0e
Binary files /dev/null and b/idea/resources/tips/images/java_call_kotlin_dark.png differ
diff --git a/idea/resources/tips/images/kotlin_call_java.png b/idea/resources/tips/images/kotlin_call_java.png
new file mode 100644
index 00000000000..96a0a493448
Binary files /dev/null and b/idea/resources/tips/images/kotlin_call_java.png differ
diff --git a/idea/resources/tips/images/kotlin_call_java@2x.png b/idea/resources/tips/images/kotlin_call_java@2x.png
new file mode 100644
index 00000000000..00d1328478c
Binary files /dev/null and b/idea/resources/tips/images/kotlin_call_java@2x.png differ
diff --git a/idea/resources/tips/images/kotlin_call_java@2x_dark.png b/idea/resources/tips/images/kotlin_call_java@2x_dark.png
new file mode 100644
index 00000000000..ef1dbdcce29
Binary files /dev/null and b/idea/resources/tips/images/kotlin_call_java@2x_dark.png differ
diff --git a/idea/resources/tips/images/kotlin_call_java_dark.png b/idea/resources/tips/images/kotlin_call_java_dark.png
new file mode 100644
index 00000000000..04484b55fd6
Binary files /dev/null and b/idea/resources/tips/images/kotlin_call_java_dark.png differ
diff --git a/idea/resources/tips/images/kotlin_class.png b/idea/resources/tips/images/kotlin_class.png
new file mode 100644
index 00000000000..94a8dc079ed
Binary files /dev/null and b/idea/resources/tips/images/kotlin_class.png differ
diff --git a/idea/resources/tips/images/kotlin_class@2x.png b/idea/resources/tips/images/kotlin_class@2x.png
new file mode 100644
index 00000000000..9cac3609b05
Binary files /dev/null and b/idea/resources/tips/images/kotlin_class@2x.png differ
diff --git a/idea/resources/tips/images/kotlin_class@2x_dark.png b/idea/resources/tips/images/kotlin_class@2x_dark.png
new file mode 100644
index 00000000000..0705d04c051
Binary files /dev/null and b/idea/resources/tips/images/kotlin_class@2x_dark.png differ
diff --git a/idea/resources/tips/images/kotlin_class_dark.png b/idea/resources/tips/images/kotlin_class_dark.png
new file mode 100644
index 00000000000..5ef74003725
Binary files /dev/null and b/idea/resources/tips/images/kotlin_class_dark.png differ
diff --git a/idea/resources/tips/images/kotlin_convert.png b/idea/resources/tips/images/kotlin_convert.png
new file mode 100644
index 00000000000..e9912fccabe
Binary files /dev/null and b/idea/resources/tips/images/kotlin_convert.png differ
diff --git a/idea/resources/tips/images/kotlin_convert@2x.png b/idea/resources/tips/images/kotlin_convert@2x.png
new file mode 100644
index 00000000000..99b58547349
Binary files /dev/null and b/idea/resources/tips/images/kotlin_convert@2x.png differ
diff --git a/idea/resources/tips/images/kotlin_convert@2x_dark.png b/idea/resources/tips/images/kotlin_convert@2x_dark.png
new file mode 100644
index 00000000000..872f05ebd1e
Binary files /dev/null and b/idea/resources/tips/images/kotlin_convert@2x_dark.png differ
diff --git a/idea/resources/tips/images/kotlin_convert_dark.png b/idea/resources/tips/images/kotlin_convert_dark.png
new file mode 100644
index 00000000000..0af75ffdd1b
Binary files /dev/null and b/idea/resources/tips/images/kotlin_convert_dark.png differ
diff --git a/idea/resources/tips/images/kotlin_project.png b/idea/resources/tips/images/kotlin_project.png
new file mode 100644
index 00000000000..92241279c5d
Binary files /dev/null and b/idea/resources/tips/images/kotlin_project.png differ
diff --git a/idea/resources/tips/images/kotlin_project@2x.png b/idea/resources/tips/images/kotlin_project@2x.png
new file mode 100644
index 00000000000..5dda870c68c
Binary files /dev/null and b/idea/resources/tips/images/kotlin_project@2x.png differ
diff --git a/idea/resources/tips/images/kotlin_project@2x_dark.png b/idea/resources/tips/images/kotlin_project@2x_dark.png
new file mode 100644
index 00000000000..7dd877317d4
Binary files /dev/null and b/idea/resources/tips/images/kotlin_project@2x_dark.png differ
diff --git a/idea/resources/tips/images/kotlin_project_dark.png b/idea/resources/tips/images/kotlin_project_dark.png
new file mode 100644
index 00000000000..6407ce6eaa8
Binary files /dev/null and b/idea/resources/tips/images/kotlin_project_dark.png differ
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index edde68e5111..06850a44c42 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -1600,6 +1600,8 @@
+
+
diff --git a/idea/src/META-INF/tipsAndTricks.xml b/idea/src/META-INF/tipsAndTricks.xml
new file mode 100644
index 00000000000..4cdf4aa55db
--- /dev/null
+++ b/idea/src/META-INF/tipsAndTricks.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file