diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index edb626d6..93a75ac6 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -11,6 +11,8 @@
 			<array>
 				<string>kdbx</string>
 			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>FileTypeIcon</string>
 			<key>CFBundleTypeName</key>
 			<string>kdbxFileType</string>
 			<key>CFBundleTypeRole</key>
@@ -19,6 +21,8 @@
 			<array>
 				<string>com.hicknhack.macpass.kdbx</string>
 			</array>
+			<key>LSTypeIsPackage</key>
+			<integer>0</integer>
 			<key>NSDocumentClass</key>
 			<string>MPDocument</string>
 		</dict>
@@ -27,6 +31,8 @@
 			<array>
 				<string>kdb</string>
 			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>FileTypeIcon</string>
 			<key>CFBundleTypeName</key>
 			<string>kdbFileType</string>
 			<key>CFBundleTypeRole</key>
@@ -35,6 +41,8 @@
 			<array>
 				<string>com.hicknhack.macpass.kdb</string>
 			</array>
+			<key>LSTypeIsPackage</key>
+			<integer>0</integer>
 			<key>NSDocumentClass</key>
 			<string>MPDocument</string>
 		</dict>
diff --git a/Filetype Icon/macpass_ft_icon_128x128.png b/MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_128x128.png
similarity index 100%
rename from Filetype Icon/macpass_ft_icon_128x128.png
rename to MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_128x128.png
diff --git a/Filetype Icon/macpass_ft_icon_128x128@2x.png b/MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_128x128@2x.png
similarity index 100%
rename from Filetype Icon/macpass_ft_icon_128x128@2x.png
rename to MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_128x128@2x.png
diff --git a/Filetype Icon/macpass_ft_icon_16x16.png b/MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_16x16.png
similarity index 100%
rename from Filetype Icon/macpass_ft_icon_16x16.png
rename to MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_16x16.png
diff --git a/Filetype Icon/macpass_ft_icon_16x16@2x.png b/MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_16x16@2x.png
similarity index 100%
rename from Filetype Icon/macpass_ft_icon_16x16@2x.png
rename to MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_16x16@2x.png
diff --git a/Filetype Icon/macpass_ft_icon_256x256.png b/MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_256x256.png
similarity index 100%
rename from Filetype Icon/macpass_ft_icon_256x256.png
rename to MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_256x256.png
diff --git a/Filetype Icon/macpass_ft_icon_256x256@2x.png b/MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_256x256@2x.png
similarity index 100%
rename from Filetype Icon/macpass_ft_icon_256x256@2x.png
rename to MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_256x256@2x.png
diff --git a/Filetype Icon/macpass_ft_icon_32x32.png b/MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_32x32.png
similarity index 100%
rename from Filetype Icon/macpass_ft_icon_32x32.png
rename to MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_32x32.png
diff --git a/Filetype Icon/macpass_ft_icon_32x32@2x.png b/MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_32x32@2x.png
similarity index 100%
rename from Filetype Icon/macpass_ft_icon_32x32@2x.png
rename to MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_32x32@2x.png
diff --git a/Filetype Icon/macpass_ft_icon_512x512.png b/MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_512x512.png
similarity index 100%
rename from Filetype Icon/macpass_ft_icon_512x512.png
rename to MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_512x512.png
diff --git a/Filetype Icon/macpass_ft_icon_512x512@2x.png b/MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_512x512@2x.png
similarity index 100%
rename from Filetype Icon/macpass_ft_icon_512x512@2x.png
rename to MacPass/MacPassImages.xcassets/FileTypeIcon.iconset/icon_512x512@2x.png