diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 8a313292bb1..00000000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.dmm merge=merge-dmm
diff --git a/.gitconfig b/.gitconfig
deleted file mode 100644
index de5ff6f2542..00000000000
--- a/.gitconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-[merge "merge-dmm"]
-    name = mapmerge driver
-    driver = ./mapmerge.sh %O %A %B
-    recursive = text
-
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index 9f00003bf1c..d410be0da53 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 1685c6e994c..735a55bd2a4 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ