diff --git a/.gitattributes b/.gitattributes
index a196c95..179a13c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,18 @@
+# Normalize line endings to LF in the repository
+* text=auto eol=lf
+
+# Never convert line endings in binary files
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.webp binary
+*.ico binary
+
 .gitattributes export-ignore
 .gitignore export-ignore
 .travis.yml export-ignore
 
-# Auto detect text files and perform LF normalization
-* text=auto
 
 # Custom for Visual Studio
 *.cs     diff=csharp
diff --git a/.gitignore b/.gitignore
index 58bcbf8..1d9c698 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,32 +1,33 @@
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# =========================
-# Operating System Files
-# =========================
-
-# OSX
-# =========================
-
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
 .DS_Store
 .AppleDouble
 .LSOverride
 
 # Icon must end with two \r
-Icon

+Icon
+
 
 # Thumbnails
 ._*