diff --git a/.gitignore b/.gitignore
index c6c875cd186a..d655ba897c84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ target/
 
 # IntelliJ Idea
 .idea/
+!.idea/icon.png
 out/
 *.ipr
 *.iws
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 000000000000..26d33521af10
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/icon.png b/.idea/icon.png
new file mode 100644
index 000000000000..0cfd67eed86c
Binary files /dev/null and b/.idea/icon.png differ