Merge remote-tracking branch 'origin/version-1.8.3' into v2

# Conflicts:
#	app/Http/Controllers/FileFunctions/EditItemsController.php
#	config/vuefilemanager.php
#	public/mix-manifest.json

resources/js/store/modules/fileFunctions.js

@@ -113,7 +113,7 @@ const actions = {
 			})
 			.catch(() => Vue.prototype.$isSomethingWrong())
 	},
-	createFolder: ({ commit, getters, dispatch }, folderName) => {
+	createFolder: ({ commit, getters, dispatch }, folder) => {
 
 		// Get route
 		let route = getters.sharedDetail && !getters.sharedDetail.protected
@@ -123,7 +123,8 @@ const actions = {
 		axios
 			.post(route, {
 				parent_id: getters.currentFolder.unique_id,
-				name: folderName
+				name: folder.name,
+				icon: folder.icon
 			})
 			.then(response => {
 				commit('ADD_NEW_FOLDER', response.data)
@@ -158,7 +159,7 @@ const actions = {
 			.post(route, {
 				name: data.name,
 				type: data.type,
-				folder_icon: data.folder_icon,
+				icon: data.icon,
 				_method: 'patch'
 			})
 			.then(response => {