diff --git a/.dockerignore b/.dockerignore
index 4bd3f0aac1ab..ef8a9b903f46 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -25,19 +25,6 @@
 .idea/**/gradle.xml
 .idea/**/libraries
 
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
 # CMake
 cmake-build-*/
 
@@ -159,7 +146,7 @@ ipython_config.py
 # pyenv
 #   For a library or package, you might want to ignore these files since the code is
 #   intended to run in multiple environments; otherwise, check them in:
-# .python-version
+.python-version
 
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
diff --git a/.gitattributes b/.gitattributes
index 316846318d70..c3b9d52c6f06 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,8 @@
 # Set standard UNIX/Linux/MacOSX line endings.
-* text eol=lf
+* text=auto eol=lf
 
 # Denote all files that are truly binary and should not be modified.
 *.png binary
+*.ico binary
 *.jpg binary
 *.bz2 binary