diff --git a/misc/dist/document_icon.svg b/misc/dist/document_icon.svg
deleted file mode 100644
index 2652110fa56..00000000000
--- a/misc/dist/document_icon.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
\ No newline at end of file
diff --git a/misc/dist/document_icons/gdscript.svg b/misc/dist/document_icons/gdscript.svg
new file mode 100644
index 00000000000..ec65eb098ad
--- /dev/null
+++ b/misc/dist/document_icons/gdscript.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/misc/dist/document_icons/gdscript_extra_small.svg b/misc/dist/document_icons/gdscript_extra_small.svg
new file mode 100644
index 00000000000..1c3545ef9dc
--- /dev/null
+++ b/misc/dist/document_icons/gdscript_extra_small.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/misc/dist/document_icons/gdscript_small.svg b/misc/dist/document_icons/gdscript_small.svg
new file mode 100644
index 00000000000..468f4243a24
--- /dev/null
+++ b/misc/dist/document_icons/gdscript_small.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/misc/dist/document_icons/project.svg b/misc/dist/document_icons/project.svg
new file mode 100644
index 00000000000..aa9b936f27a
--- /dev/null
+++ b/misc/dist/document_icons/project.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/misc/dist/document_icons/project_extra_small.svg b/misc/dist/document_icons/project_extra_small.svg
new file mode 100644
index 00000000000..5482d270333
--- /dev/null
+++ b/misc/dist/document_icons/project_extra_small.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/misc/dist/document_icons/project_small.svg b/misc/dist/document_icons/project_small.svg
new file mode 100644
index 00000000000..76f501b80d5
--- /dev/null
+++ b/misc/dist/document_icons/project_small.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/misc/dist/document_icons/resource.svg b/misc/dist/document_icons/resource.svg
new file mode 100644
index 00000000000..2555e8f5c00
--- /dev/null
+++ b/misc/dist/document_icons/resource.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/misc/dist/document_icons/resource_extra_small.svg b/misc/dist/document_icons/resource_extra_small.svg
new file mode 100644
index 00000000000..4ba41b00736
--- /dev/null
+++ b/misc/dist/document_icons/resource_extra_small.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/misc/dist/document_icons/resource_small.svg b/misc/dist/document_icons/resource_small.svg
new file mode 100644
index 00000000000..502a4c6c363
--- /dev/null
+++ b/misc/dist/document_icons/resource_small.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/misc/dist/document_icons/scene.svg b/misc/dist/document_icons/scene.svg
new file mode 100644
index 00000000000..a4e1ca809e0
--- /dev/null
+++ b/misc/dist/document_icons/scene.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/misc/dist/document_icons/scene_extra_small.svg b/misc/dist/document_icons/scene_extra_small.svg
new file mode 100644
index 00000000000..155aa843b2a
--- /dev/null
+++ b/misc/dist/document_icons/scene_extra_small.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/misc/dist/document_icons/scene_small.svg b/misc/dist/document_icons/scene_small.svg
new file mode 100644
index 00000000000..d36d42f4583
--- /dev/null
+++ b/misc/dist/document_icons/scene_small.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/misc/dist/osx_tools.app/Contents/Info.plist b/misc/dist/osx_tools.app/Contents/Info.plist
index faa929b8182..a001fdf9d26 100755
--- a/misc/dist/osx_tools.app/Contents/Info.plist
+++ b/misc/dist/osx_tools.app/Contents/Info.plist
@@ -72,22 +72,67 @@
UTTypeDescription
Godot Scene
UTTypeIconFile
- Document.icns
+ Scene.icns
UTTypeConformsTo
public.data
UTTypeTagSpecification
- com.apple.ostype
- TSCN
public.filename-extension
scn
tscn
public.mime-type
- scene/x-scn
+ application/x-godot-scene
+
+
+
+ UTTypeIdentifier
+ public.gd
+ UTTypeReferenceURL
+
+ UTTypeDescription
+ Godot Script
+ UTTypeIconFile
+ GDScript.icns
+ UTTypeConformsTo
+
+ public.data
+
+ UTTypeTagSpecification
+
+ public.filename-extension
+
+ gd
+
+ public.mime-type
+ text/x-gdscript
+
+
+
+ UTTypeIdentifier
+ public.res
+ UTTypeReferenceURL
+
+ UTTypeDescription
+ Godot Resource
+ UTTypeIconFile
+ Resource.icns
+ UTTypeConformsTo
+
+ public.data
+
+ UTTypeTagSpecification
+
+ public.filename-extension
+
+ res
+ tres
+
+ public.mime-type
+ application/x-godot-resource
@@ -98,21 +143,19 @@
UTTypeDescription
Godot Project
UTTypeIconFile
- Document.icns
+ Project.icns
UTTypeConformsTo
public.data
UTTypeTagSpecification
- com.apple.ostype
- GODP
public.filename-extension
godot
public.mime-type
- project/x-godot
+ text/x-godot-project
diff --git a/misc/dist/osx_tools.app/Contents/Resources/Document.icns b/misc/dist/osx_tools.app/Contents/Resources/Document.icns
deleted file mode 100644
index 06d7c65298e..00000000000
Binary files a/misc/dist/osx_tools.app/Contents/Resources/Document.icns and /dev/null differ
diff --git a/misc/dist/osx_tools.app/Contents/Resources/GDScript.icns b/misc/dist/osx_tools.app/Contents/Resources/GDScript.icns
new file mode 100644
index 00000000000..b08e8df3398
Binary files /dev/null and b/misc/dist/osx_tools.app/Contents/Resources/GDScript.icns differ
diff --git a/misc/dist/osx_tools.app/Contents/Resources/Project.icns b/misc/dist/osx_tools.app/Contents/Resources/Project.icns
new file mode 100644
index 00000000000..10e31528e4c
Binary files /dev/null and b/misc/dist/osx_tools.app/Contents/Resources/Project.icns differ
diff --git a/misc/dist/osx_tools.app/Contents/Resources/Resource.icns b/misc/dist/osx_tools.app/Contents/Resources/Resource.icns
new file mode 100644
index 00000000000..9648cb616eb
Binary files /dev/null and b/misc/dist/osx_tools.app/Contents/Resources/Resource.icns differ
diff --git a/misc/dist/osx_tools.app/Contents/Resources/Scene.icns b/misc/dist/osx_tools.app/Contents/Resources/Scene.icns
new file mode 100644
index 00000000000..c8c3dee07e5
Binary files /dev/null and b/misc/dist/osx_tools.app/Contents/Resources/Scene.icns differ