diff --git a/img/icons/qtox.icns b/img/icons/qtox.icns
index bb96d3ae3..27c89d3db 100644
Binary files a/img/icons/qtox.icns and b/img/icons/qtox.icns differ
diff --git a/img/icons/qtox_profile.icns b/img/icons/qtox_profile.icns
new file mode 100644
index 000000000..a2f448f34
Binary files /dev/null and b/img/icons/qtox_profile.icns differ
diff --git a/res/gplv3.rtf b/osx/gplv3.rtf
similarity index 100%
rename from res/gplv3.rtf
rename to osx/gplv3.rtf
diff --git a/res/info.plist b/osx/info.plist
similarity index 95%
rename from res/info.plist
rename to osx/info.plist
index 7b137ac51..db5325176 100644
--- a/res/info.plist
+++ b/osx/info.plist
@@ -34,7 +34,7 @@
 				<string>tox</string>
 			</array>
 			<key>CFBundleURLIconFile</key>
-			<string>qtox.icns</string>
+			<string>qtox_profile.icns</string>
 		</dict>
 	</array>
 	<key>CFBundleDocumentTypes</key>
@@ -49,10 +49,10 @@
 			<key>CFBundleTypeRole</key>
         		<string>Editor</string>
         		<key>CFBundleTypeIconFile</key>
-			<string>qtox.icns</string>
+			<string>qtox_profile.icns</string>
 			<key>CFBundleTypeMIMETypes</key>
 			<array>
-				<string>tox/x-profile</string>
+				<string>application/x-tox.profile</string>
 			</array>
 			<key>LSHandlerRank</key>
         		<string>Owner</string>
diff --git a/res/makedist.sh b/osx/makedist.sh
similarity index 96%
rename from res/makedist.sh
rename to osx/makedist.sh
index 8f6fa2145..10059b9b0 100644
--- a/res/makedist.sh
+++ b/osx/makedist.sh
@@ -9,7 +9,7 @@ echo "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>
     <title>qTox</title>
     <license file=\"$PWD/gplv3.rtf\"/>
     <welcome file=\"$PWD/welcome.txt\"/>
-    <domains enable_currentUserHome=\"true\" enable_localSystem=\"true\" enable_anywhere=\"true\"/>
+    <domains enable_currentUserHome=\"true\" enable_localSystem=\"false\" enable_anywhere=\"false\"/>
     <options customize=\"never\" require-scripts=\"false\"/>
     <choices-outline>
         <line choice=\"default\">
diff --git a/res/welcome.txt b/osx/welcome.txt
similarity index 100%
rename from res/welcome.txt
rename to osx/welcome.txt
diff --git a/qtox.pro b/qtox.pro
index 0831fccfd..5733a9aa0 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -69,7 +69,7 @@ win32 {
     macx {
         BUNDLEID = im.tox.qtox
         ICON = img/icons/qtox.icns
-        QMAKE_INFO_PLIST = res/info.plist
+        QMAKE_INFO_PLIST = osx/info.plist
         LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -ltoxencryptsave -ltoxdns -lsodium -lvpx -framework OpenAL -lopencv_core -lopencv_highgui
     } else {
         # If we're building a package, static link libtox[core,av] and libsodium, since they are not provided by any package