diff --git a/.gitignore b/.gitignore
index 5a3c1478090f..cefcd7dba77b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,10 @@
 /out
 /*/out/
 /example/*/out
-.idea
+# The star is required for further !/.idea/ to work, see https://git-scm.com/docs/gitignore
+/.idea/*
+# Icon for JetBrains Toolbox
+!/.idea/icon.png
 *.iml
 
 settings.xml
diff --git a/.idea/icon.png b/.idea/icon.png
new file mode 100644
index 000000000000..180d0163b476
Binary files /dev/null and b/.idea/icon.png differ