diff --git a/src/GitHub.Api/Resources/.gitattributes b/src/GitHub.Api/Resources/.gitattributes
index df7ad1b69..7782ad6fe 100644
--- a/src/GitHub.Api/Resources/.gitattributes
+++ b/src/GitHub.Api/Resources/.gitattributes
@@ -1,10 +1,10 @@
 * text=auto
 
 # Unity files
-*.meta -text -merge=unityamlmerge
-*.unity -text -merge=unityamlmerge
-*.asset -text -merge=unityamlmerge
-*.prefab -text -merge=unityamlmerge
+*.meta -text merge=unityamlmerge diff
+*.unity -text merge=unityamlmerge diff
+*.asset -text merge=unityamlmerge diff
+*.prefab -text merge=unityamlmerge diff
 
 # Image formats
 *.psd filter=lfs diff=lfs merge=lfs -text
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
index c3cc0fb03..d228a361e 100644
--- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
+++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
@@ -283,6 +283,7 @@ private static void OnProjectWindowItemGUI(string guid, Rect itemRect)
             {
                 var scale = itemRect.height / 90f;
                 var size = new Vector2(texture.width * scale, texture.height * scale);
+                size = size / EditorGUIUtility.pixelsPerPoint;
                 var offset = new Vector2(itemRect.width * Mathf.Min(.4f * scale, .2f), itemRect.height * Mathf.Min(.2f * scale, .2f));
                 rect = new Rect(itemRect.center.x - size.x * .5f + offset.x, itemRect.center.y - size.y * .5f + offset.y, size.x, size.y);
             }