diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
deleted file mode 100644
index 2071d21356..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ /dev/null
@@ -1,400 +0,0 @@
-//used for the media picker dialog
-angular.module("umbraco")
-    .controller("Umbraco.Overlays.MediaPickerController",
-        function($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, mediaTypeHelper, eventsService, treeService, $element, $timeout, $cookies, localStorageService, localizationService) {
-
-            if (!$scope.model.title) {
-                localizationService.localize("defaultdialogs_selectMedia").then(function(value){
-                    $scope.model.title = value;
-                });
-            }
-
-            var dialogOptions = $scope.model;
-
-            $scope.disableFolderSelect = dialogOptions.disableFolderSelect;
-            $scope.onlyImages = dialogOptions.onlyImages;
-            $scope.showDetails = dialogOptions.showDetails;
-            $scope.multiPicker = (dialogOptions.multiPicker && dialogOptions.multiPicker !== "0") ? true : false;
-            $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
-            $scope.cropSize = dialogOptions.cropSize;
-            $scope.lastOpenedNode = localStorageService.get("umbLastOpenedMediaNodeId");
-            $scope.lockedFolder = true;
-
-            var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
-            var allowedUploadFiles = mediaHelper.formatFileTypes(umbracoSettings.allowedUploadFiles);
-            if ($scope.onlyImages) {
-                $scope.acceptedFileTypes = mediaHelper.formatFileTypes(umbracoSettings.imageFileTypes);
-            } else {
-                // Use whitelist of allowed file types if provided
-                if (allowedUploadFiles !== '') {
-                    $scope.acceptedFileTypes = allowedUploadFiles;
-                } else {
-                    // If no whitelist, we pass in a blacklist by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
-                    $scope.acceptedFileTypes = !mediaHelper.formatFileTypes(umbracoSettings.disallowedUploadFiles);
-                }
-            }
-
-            $scope.maxFileSize = umbracoSettings.maxFileSize + "KB";
-
-            $scope.model.selectedImages = [];
-
-            $scope.acceptedMediatypes = [];
-            mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
-                .then(function(types) {
-                    $scope.acceptedMediatypes = types;
-                });
-
-            $scope.searchOptions = {
-                pageNumber: 1,
-                pageSize: 100,
-                totalItems: 0,
-                totalPages: 0,
-                filter: ''
-            };
-
-            //preload selected item
-            $scope.target = undefined;
-            if (dialogOptions.currentTarget) {
-                $scope.target = dialogOptions.currentTarget;
-            }
-
-            function onInit() {
-                if ($scope.startNodeId !== -1) {
-                    entityResource.getById($scope.startNodeId, "media")
-                        .then(function (ent) {
-                            $scope.startNodeId = ent.id;
-                            run();
-                        });
-                } else {
-                    run();
-                }
-            }
-
-            function run() {
-                //default root item
-                if (!$scope.target) {
-                    if ($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
-                        entityResource.getById($scope.lastOpenedNode, "media")
-                            .then(ensureWithinStartNode, gotoStartNode);
-                    } else {
-                        gotoStartNode();
-                    }
-                } else {
-                    //if a target is specified, go look it up - generally this target will just contain ids not the actual full
-                    //media object so we need to look it up
-                    var id = $scope.target.udi ? $scope.target.udi : $scope.target.id
-                    var altText = $scope.target.altText;
-                    if (id) {
-                        mediaResource.getById(id)
-                            .then(function (node) {
-                                $scope.target = node;
-                                if (ensureWithinStartNode(node)) {
-                                    selectImage(node);
-                                    $scope.target.url = mediaHelper.resolveFile(node);
-                                    $scope.target.altText = altText;
-                                    $scope.openDetailsDialog();
-                                }
-                            },
-                                gotoStartNode);
-                    } else {
-                        gotoStartNode();
-                    }
-                }
-            }
-
-            $scope.upload = function(v) {
-                angular.element(".umb-file-dropzone-directive .file-select").click();
-            };
-
-            $scope.dragLeave = function(el, event) {
-                $scope.activeDrag = false;
-            };
-
-            $scope.dragEnter = function(el, event) {
-                $scope.activeDrag = true;
-            };
-
-            $scope.submitFolder = function() {
-                if ($scope.newFolderName) {
-                    $scope.creatingFolder = true;
-                    mediaResource
-                        .addFolder($scope.newFolderName, $scope.currentFolder.id)
-                        .then(function(data) {
-                            //we've added a new folder so lets clear the tree cache for that specific item
-                            treeService.clearCache({
-                                cacheKey: "__media", //this is the main media tree cache key
-                                childrenOf: data.parentId //clear the children of the parent
-                            });
-                            $scope.creatingFolder = false;
-                            $scope.gotoFolder(data);
-                            $scope.showFolderInput = false;
-                            $scope.newFolderName = "";
-                        });
-                } else {
-                    $scope.showFolderInput = false;
-                }
-            };
-
-            $scope.enterSubmitFolder = function(event) {
-                if (event.keyCode === 13) {
-                    $scope.submitFolder();
-                    event.stopPropagation();
-                }
-            };
-
-            $scope.gotoFolder = function(folder) {
-                if (!$scope.multiPicker) {
-                    deselectAllImages($scope.model.selectedImages);
-                }
-
-                if (!folder) {
-                    folder = { id: -1, name: "Media", icon: "icon-folder" };
-                }
-
-                if (folder.id > 0) {
-                    entityResource.getAncestors(folder.id, "media")
-                        .then(function(anc) {              
-                            $scope.path = _.filter(anc,
-                                function(f) {
-                                    return f.path.indexOf($scope.startNodeId) !== -1;
-                                });
-                        });
-
-                } else {
-                    $scope.path = [];
-                }
-
-                mediaTypeHelper.getAllowedImagetypes(folder.id)
-                    .then(function (types) {
-                        $scope.acceptedMediatypes = types;
-                    });
-
-                $scope.lockedFolder = folder.id === -1 && $scope.model.startNodeIsVirtual;
-
-                $scope.currentFolder = folder;
-                localStorageService.set("umbLastOpenedMediaNodeId", folder.id);
-                return getChildren(folder.id);
-            };
-
-            $scope.clickHandler = function(image, event, index) {
-                if (image.isFolder) {
-                    if ($scope.disableFolderSelect) {
-                        $scope.gotoFolder(image);
-                    } else {
-                        eventsService.emit("dialogs.mediaPicker.select", image);
-                        selectImage(image);
-                    }
-                } else {
-                    eventsService.emit("dialogs.mediaPicker.select", image);
-                    if ($scope.showDetails) {
-
-                        $scope.target = image;
-
-                        // handle both entity and full media object
-                        if (image.image) {
-                            $scope.target.url = image.image;
-                        } else {
-                            $scope.target.url = mediaHelper.resolveFile(image);
-                        }
-
-                        $scope.openDetailsDialog();
-                    } else {
-                        selectImage(image);
-                    }
-                }
-            };
-
-            $scope.clickItemName = function(item) {
-                if (item.isFolder) {
-                    $scope.gotoFolder(item);
-                }
-            };
-
-            function selectImage(image) {
-                if (image.selected) {
-                    for (var i = 0; $scope.model.selectedImages.length > i; i++) {
-                        var imageInSelection = $scope.model.selectedImages[i];
-                        if (image.key === imageInSelection.key) {
-                            image.selected = false;
-                            $scope.model.selectedImages.splice(i, 1);
-                        }
-                    }
-                } else {
-                    if (!$scope.multiPicker) {
-                        deselectAllImages($scope.model.selectedImages);
-                    }
-                    image.selected = true;
-                    $scope.model.selectedImages.push(image);
-                }
-            }
-
-            function deselectAllImages(images) {
-                for (var i = 0; i < images.length; i++) {
-                    var image = images[i];
-                    image.selected = false;
-                }
-                images.length = 0;
-            }
-
-            $scope.onUploadComplete = function(files) {
-                $scope.gotoFolder($scope.currentFolder).then(function() {
-                    if (files.length === 1 && $scope.model.selectedImages.length === 0) {
-                        selectImage($scope.images[$scope.images.length - 1]);
-                    }
-                });
-            };
-
-            $scope.onFilesQueue = function() {
-                $scope.activeDrag = false;
-            };
-
-            function ensureWithinStartNode(node) {
-                // make sure that last opened node is on the same path as start node
-                var nodePath = node.path.split(",");
-
-                if (nodePath.indexOf($scope.startNodeId.toString()) !== -1) {
-                    $scope.gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder" });
-                    return true;
-                } else {
-                    $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
-                    return false;
-                }
-            }
-
-            function gotoStartNode(err) {
-                $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
-            }
-
-            $scope.openDetailsDialog = function() {
-
-                $scope.mediaPickerDetailsOverlay = {};
-                $scope.mediaPickerDetailsOverlay.show = true;
-
-                $scope.mediaPickerDetailsOverlay.submit = function(model) {
-                    $scope.model.selectedImages.push($scope.target);
-                    $scope.model.submit($scope.model);
-
-                    $scope.mediaPickerDetailsOverlay.show = false;
-                    $scope.mediaPickerDetailsOverlay = null;
-                };
-
-                $scope.mediaPickerDetailsOverlay.close = function(oldModel) {
-                    $scope.mediaPickerDetailsOverlay.show = false;
-                    $scope.mediaPickerDetailsOverlay = null;
-                };
-            };
-
-            var debounceSearchMedia = _.debounce(function() {
-                    $scope.$apply(function() {
-                        if ($scope.searchOptions.filter) {
-                            searchMedia();
-                        } else {
-                            // reset pagination
-                            $scope.searchOptions = {
-                                pageNumber: 1,
-                                pageSize: 100,
-                                totalItems: 0,
-                                totalPages: 0,
-                                filter: ''
-                            };
-                            getChildren($scope.currentFolder.id);
-                        }
-                    });
-                }, 500);
-
-            $scope.changeSearch = function() {
-                $scope.loading = true;
-                debounceSearchMedia();
-            };
-
-            $scope.changePagination = function(pageNumber) {
-                $scope.loading = true;
-                $scope.searchOptions.pageNumber = pageNumber;
-                searchMedia();
-            };
-
-            function searchMedia() {
-                $scope.loading = true;
-                entityResource.getPagedDescendants($scope.startNodeId, "Media", $scope.searchOptions)
-                    .then(function(data) {
-                        // update image data to work with image grid
-                        angular.forEach(data.items,
-                            function(mediaItem) {
-                                // set thumbnail and src
-                                mediaItem.thumbnail = mediaHelper.resolveFileFromEntity(mediaItem, true);
-                                mediaItem.image = mediaHelper.resolveFileFromEntity(mediaItem, false);
-                                // set properties to match a media object
-                                mediaItem.properties = [];
-                                if (mediaItem.metaData) {
-                                    if (mediaItem.metaData.umbracoWidth && mediaItem.metaData.umbracoHeight) {
-                                        mediaItem.properties.push({
-                                            alias: "umbracoWidth",
-                                            value: mediaItem.metaData.umbracoWidth.Value
-                                        });
-                                        mediaItem.properties.push({
-                                            alias: "umbracoHeight",
-                                            value: mediaItem.metaData.umbracoHeight.Value
-                                        });
-                                    }
-                                    if (mediaItem.metaData.umbracoFile) {
-                                        mediaItem.properties.push({
-                                            alias: "umbracoFile",
-                                            editor: mediaItem.metaData.umbracoFile.PropertyEditorAlias,
-                                            value: mediaItem.metaData.umbracoFile.Value
-                                        });
-                                    }
-                                }
-                            });
-                        // update images
-                        $scope.images = data.items ? data.items : [];
-                        // update pagination
-                        if (data.pageNumber > 0)
-                            $scope.searchOptions.pageNumber = data.pageNumber;
-                        if (data.pageSize > 0)
-                            $scope.searchOptions.pageSize = data.pageSize;
-                        $scope.searchOptions.totalItems = data.totalItems;
-                        $scope.searchOptions.totalPages = data.totalPages;
-                        // set already selected images to selected
-                        preSelectImages();
-                        $scope.loading = false;
-                    });
-            }
-
-            function getChildren(id) {
-                $scope.loading = true;
-                return mediaResource.getChildren(id)
-                    .then(function(data) {
-                        $scope.searchOptions.filter = "";
-                        $scope.images = data.items ? data.items : [];
-                        // set already selected images to selected
-                        preSelectImages();
-                        $scope.loading = false;
-                    });
-            }
-
-            function preSelectImages() {
-                for (var folderImageIndex = 0; folderImageIndex < $scope.images.length; folderImageIndex++) {
-                    var folderImage = $scope.images[folderImageIndex];
-                    var imageIsSelected = false;
-
-                    if ($scope.model && angular.isArray($scope.model.selectedImages)) {
-                        for (var selectedImageIndex = 0;
-                            selectedImageIndex < $scope.model.selectedImages.length;
-                            selectedImageIndex++) {
-                            var selectedImage = $scope.model.selectedImages[selectedImageIndex];
-
-                            if (folderImage.key === selectedImage.key) {
-                                imageIsSelected = true;
-                            }
-                        }
-                    }
-
-                    if (imageIsSelected) {
-                        folderImage.selected = true;
-                    }
-                }
-            }
-
-            onInit();
-
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
deleted file mode 100644
index 482485c4b2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<form ng-controller="Umbraco.Overlays.MediaPickerController" id="fileupload"
-      method="POST"
-      enctype="multipart/form-data"
-      umb-image-upload="options">
-
-    <div on-drag-leave="dragLeave()"
-         on-drag-end="dragLeave()"
-         on-drag-enter="dragEnter()">
-
-        <div class="umb-control-group umb-mediapicker-upload">
-
-            <umb-load-indicator ng-if="loading">
-            </umb-load-indicator>
-
-            <div class="form-search">
-                <i class="icon-search"></i>
-                <input class="umb-search-field search-query -full-width-input"
-                       ng-model="searchOptions.filter"
-                       localize="placeholder"
-                       placeholder="@placeholders_search"
-                       ng-change="changeSearch()"
-                       type="text"
-                       no-dirty-check />
-            </div>
-
-            <div class="upload-button">
-                <umb-button type="button"
-                            label-key="general_upload"
-                            action="upload()"
-                            disabled="lockedFolder"
-                            ng-if="acceptedMediatypes.length > 0">
-                </umb-button>
-            </div>
-
-        </div>
-
-        <div class="row umb-control-group" ng-show="!searchOptions.filter">
-            <ul class="umb-breadcrumbs">
-                <li ng-hide="startNodeId != -1" class="umb-breadcrumbs__ancestor">
-                    <a href ng-click="gotoFolder()" prevent-default>Media</a>
-                    <span class="umb-breadcrumbs__seperator">&#47;</span>
-                </li>
-
-                <li ng-repeat="item in path" class="umb-breadcrumbs__ancestor">
-                    <a href ng-click="gotoFolder(item)" prevent-default>{{item.name}}</a>
-                    <span class="umb-breadcrumbs__seperator">&#47;</span>
-                </li>
-
-                <li class="umb-breadcrumbs__ancestor" ng-show="!lockedFolder">
-                    <a href ng-hide="showFolderInput" ng-click="showFolderInput = true">
-                        <i class="icon icon-add small"></i>
-                    </a>
-
-                    <input type="text"
-                           class="umb-breadcrumbs__add-ancestor"
-                           ng-show="showFolderInput"
-                           ng-model="newFolderName"
-                           ng-keydown="enterSubmitFolder($event)"
-                           on-blur="submitFolder()"
-                           focus-when="{{showFolderInput}}" />
-                </li>
-            </ul>
-            <div class="umb-loader" ng-if="creatingFolder"></div>
-        </div>
-
-        <umb-file-dropzone ng-if="acceptedMediatypes.length > 0 && !loading && !lockedFolder"
-                           accepted-mediatypes="acceptedMediatypes"
-                           parent-id="{{currentFolder.id}}"
-                           files-uploaded="onUploadComplete"
-                           files-queued="onFilesQueue"
-                           accept="{{acceptedFileTypes}}"
-                           max-file-size="{{maxFileSize}}"
-                           hide-dropzone="{{!activeDrag && images.length > 0 || searchOptions.filter }}"
-                           compact="{{ images.length > 0 }}">
-        </umb-file-dropzone>
-
-        <umb-media-grid ng-if="!loading"
-                        items="images"
-                        on-click="clickHandler"
-                        on-click-name="clickItemName"
-                        item-max-width="150"
-                        item-max-height="150"
-                        item-min-width="100"
-                        item-min-height="100"
-                        only-images={{onlyImages}}>
-        </umb-media-grid>
-
-        <div class="flex justify-center">
-            <umb-pagination ng-if="searchOptions.totalPages > 0 && !loading"
-                            page-number="searchOptions.pageNumber"
-                            total-pages="searchOptions.totalPages"
-                            on-change="changePagination(pageNumber)">
-            </umb-pagination>
-        </div>
-
-        <umb-empty-state ng-if="searchOptions.filter && images.length === 0 && !loading"
-                         position="center">
-            <localize key="general_searchNoResult"></localize>
-        </umb-empty-state>
-
-    </div>
-
-    <umb-overlay ng-if="mediaPickerDetailsOverlay.show"
-                 model="mediaPickerDetailsOverlay"
-                 position="right">
-
-        <div class="umb-control-group">
-
-            <div ng-if="target.url">
-                <umb-image-gravity src="target.url"
-                                   center="target.focalPoint">
-                </umb-image-gravity>
-            </div>
-
-            <div ng-if="cropSize">
-
-                <h5>
-                    <localize key="general_preview">Preview</localize>
-                </h5>
-
-                <umb-image-thumbnail center="target.focalPoint"
-                                     src="target.url"
-                                     height="{{cropSize.height}}"
-                                     width="{{cropSize.width}}"
-                                     max-size="400">
-                </umb-image-thumbnail>
-
-            </div>
-
-        </div>
-
-        <div class="umb-control-group">
-            <label><localize key="@general_url"></localize></label>
-            <input type="text"
-                   localize="placeholder"
-                   placeholder="@general_url"
-                   class="umb-property-editor umb-textstring"
-                   ng-model="target.url"
-                   ng-disabled="target.id" />
-        </div>
-
-        <div class="umb-control-group">
-            <label><localize key="@content_altTextOptional"></localize></label>
-            <input type="text" class="umb-property-editor umb-textstring" ng-model="target.altText" />
-        </div>
-
-
-    </umb-overlay>
-
-</form>