diff --git a/.gitattributes b/.gitattributes
index f52521ed3..5f98e6248 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,11 @@
 # Auto detect text files and perform LF normalization
 * text=auto
 
+# Unix files that are always LF
 *.sh text eol=lf
 
-# Custom for Visual Studio
+# Windows files that are always CRLF
+[Dd]esktop.ini text eol=crlf
+
+# Diff settings
 *.cs diff=csharp
diff --git a/.gitignore b/.gitignore
index 1eb77d0dc..bda77b86b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -543,3 +543,12 @@ $RECYCLE.BIN/
 
 # Windows shortcuts
 *.lnk
+
+#     _     ____   _____
+#    / \   / ___| |  ___|
+#   / _ \  \___ \ | |_
+#  / ___ \  ___) ||  _|
+# /_/   \_\|____/ |_|
+
+# Files that could be ignored by above rules, that we want to ship
+!ArchiSteamFarm/overlay/**
diff --git a/ArchiSteamFarm/overlay/variant-base/win/desktop.ini b/ArchiSteamFarm/overlay/variant-base/win/desktop.ini
new file mode 100644
index 000000000..af1ebddc9
--- /dev/null
+++ b/ArchiSteamFarm/overlay/variant-base/win/desktop.ini
@@ -0,0 +1,2 @@
+[.ShellClassInfo]
+IconResource=ArchiSteamFarm.exe,0
diff --git a/ArchiSteamFarm/overlay/variant-specific/generic/desktop.ini b/ArchiSteamFarm/overlay/variant-specific/generic/desktop.ini
new file mode 100644
index 000000000..e835c22e8
--- /dev/null
+++ b/ArchiSteamFarm/overlay/variant-specific/generic/desktop.ini
@@ -0,0 +1,2 @@
+[.ShellClassInfo]
+IconResource=ArchiSteamFarm.dll,0