diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml
index 3b8b70c360..56ef69985b 100644
--- a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml
+++ b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml
@@ -2275,7 +2275,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="items">items</key>
     <key alias="urls">URL(s)</key>
     <key alias="urlsSelected">URL(s) selected</key>
-    <key alias="itemsSelected">items selected</key>
+    <key alias="itemsSelected">item(s) selected</key>
     <key alias="invalidDate">Invalid date</key>
     <key alias="invalidNumber">Not a number</key>
     <key alias="invalidNumberStepSize">Not a valid numeric step size</key>
diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
index 9136f09c5e..0ee6e48050 100644
--- a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
+++ b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
@@ -2371,7 +2371,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="items">items</key>
     <key alias="urls">URL(s)</key>
     <key alias="urlsSelected">URL(s) selected</key>
-    <key alias="itemsSelected">items selected</key>
+    <key alias="itemsSelected">item(s) selected</key>
     <key alias="invalidDate">Invalid date</key>
     <key alias="invalidNumber">Not a number</key>
     <key alias="invalidNumberStepSize">Not a valid numeric step size</key>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card.html b/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card.html
index e54cc3e898..a4aa220eb5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card.html
@@ -12,13 +12,14 @@
             <umb-icon icon="icon-block"></umb-icon>
             <localize key="mediaPicker_notAllowed">Not allowed</localize>
         </p>
-
+        
         <!-- IMAGE and SVG-->
         <img ng-if="vm.loading === false && vm.thumbnail"
             ng-class="{'trashed': vm.media.trashed}"
             ng-src="{{vm.thumbnail}}"
             title="{{vm.media.name}}"
-            alt="{{vm.media.name}}" />
+            alt="{{vm.media.name}}"
+            draggable="false" />
 
         <umb-file-icon ng-if="vm.loading === false && vm.icon"
             icon="{{vm.icon}}"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
index 6c562a865b..b21eacfae0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -49,7 +49,7 @@
         $attrs.$observe('readonly', (value) => {
             vm.readonly = value !== undefined;
 
-            vm.sortableOptions.disabled = vm.readonly;
+            vm.sortableOptions.disabled = vm.readonly || vm.singleBlockMode;
             vm.blockEditorApi.readonly = vm.readonly;
 
             if (deleteAllBlocksAction) {
@@ -107,11 +107,13 @@
 
             inlineEditing = vm.model.config.useInlineEditingAsDefault;
             liveEditing = vm.model.config.useLiveEditing;
+
             vm.singleBlockMode =
                 vm.model.config.validationLimit.min == 1 &&
                 vm.model.config.validationLimit.max == 1 &&
                 vm.model.config.blocks.length == 1 &&
                 vm.model.config.useSingleBlockMode;
+            
             vm.blockEditorApi.singleBlockMode = vm.singleBlockMode;
 
             vm.validationLimit = vm.model.config.validationLimit;
@@ -123,16 +125,32 @@
             }
 
             // We need to ensure that the property model value is an object, this is needed for modelObject to recive a reference and keep that updated.
-            if(typeof vm.model.value !== 'object' || vm.model.value === null) {// testing if we have null or undefined value or if the value is set to another type than Object.
+            if (typeof vm.model.value !== 'object' || vm.model.value === null) {// testing if we have null or undefined value or if the value is set to another type than Object.
                 vm.model.value = {};
             }
 
             var scopeOfExistence = $scope;
-            if(vm.umbVariantContentEditors && vm.umbVariantContentEditors.getScope) {
+            if (vm.umbVariantContentEditors && vm.umbVariantContentEditors.getScope) {
                 scopeOfExistence = vm.umbVariantContentEditors.getScope();
             } else if(vm.umbElementEditorContent && vm.umbElementEditorContent.getScope) {
                 scopeOfExistence = vm.umbElementEditorContent.getScope();
             }
+
+            vm.sortableOptions = {
+                axis: "y",
+                containment: "parent",
+                cursor: "grabbing",
+                handle: ".blockelement__draggable-element",
+                cancel: "input,textarea,select,option",
+                classes: ".blockelement--dragging",
+                distance: 5,
+                tolerance: "pointer",
+                scroll: true,
+                disabled: vm.readonly || vm.singleBlockMode,
+                update: function (ev, ui) {
+                    setDirty();
+                }
+            };
             
             copyAllBlocksAction = {
                 labelKey: "clipboard_labelForCopyAllEntries",
@@ -167,9 +185,9 @@
 
             if (vm.umbProperty) {
                 if (vm.singleBlockMode) {
-                vm.umbProperty.setPropertyActions(propertyActionsForSingleBlockMode);
+                  vm.umbProperty.setPropertyActions(propertyActionsForSingleBlockMode);
                 } else {
-                vm.umbProperty.setPropertyActions(propertyActions);
+                  vm.umbProperty.setPropertyActions(propertyActions);
                 }
             }
 
@@ -519,6 +537,7 @@
         }
 
         vm.requestShowCreate = requestShowCreate;
+        
         function requestShowCreate(createIndex, mouseEvent) {
 
             if (vm.blockTypePicker) {
@@ -539,12 +558,15 @@
             }
 
         }
+        
         vm.requestShowClipboard = requestShowClipboard;
+        
         function requestShowClipboard(createIndex) {
             showCreateDialog(createIndex, true);
         }
 
         vm.showCreateDialog = showCreateDialog;
+        
         function showCreateDialog(createIndex, openClipboard) {
 
             if (vm.blockTypePicker) {
@@ -616,6 +638,7 @@
             editorService.open(blockPickerModel);
 
         };
+
         function userFlowWhenBlockWasCreated(createIndex) {
             if (vm.layout.length > createIndex) {
                 var blockObject = vm.layout[createIndex].$block;
@@ -676,7 +699,7 @@
                 return b.date - a.date
             });
 
-            if(firstTime !== true && vm.clipboardItems.length > oldAmount) {
+            if (firstTime !== true && vm.clipboardItems.length > oldAmount) {
                 jumpClipboard();
             }
 
@@ -686,7 +709,7 @@
         var jumpClipboardTimeout;
         function jumpClipboard() {
 
-            if(jumpClipboardTimeout) {
+            if (jumpClipboardTimeout) {
                 return;
             }
 
@@ -745,8 +768,8 @@
 
             if (vm.singleBlockMode) {
                 if (vm.layout.length > 0) {
-                deleteBlock(vm.layout[0].$block);
-                index = 1;
+                  deleteBlock(vm.layout[0].$block);
+                  index = 1;
                 }
             }
 
@@ -835,28 +858,13 @@
             singleBlockMode: vm.singleBlockMode
         };
 
-        vm.sortableOptions = {
-            axis: "y",
-            containment: "parent",
-            cursor: "grabbing",
-            handle: ".blockelement__draggable-element",
-            cancel: "input,textarea,select,option",
-            classes: ".blockelement--dragging",
-            distance: 5,
-            tolerance: "pointer",
-            scroll: true,
-            disabled: vm.readonly,
-            update: function (ev, ui) {
-                setDirty();
-            }
-        };
-
         function onAmountOfBlocksChanged() {
 
             // enable/disable property actions
             if (copyAllBlocksAction) {
                 copyAllBlocksAction.isDisabled = vm.layout.length === 0;
             }
+            
             if (deleteAllBlocksAction) {
                 deleteAllBlocksAction.isDisabled = vm.layout.length === 0 || vm.readonly;
             }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 52f147bce0..4deb10d0de 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -103,20 +103,6 @@ function contentPickerController($scope, $q, $routeParams, $location, entityReso
         }
     };
 
-    // sortable options
-    $scope.sortableOptions = {
-        axis: "y",
-        containment: "parent",
-        distance: 10,
-        opacity: 0.7,
-        tolerance: "pointer",
-        scroll: true,
-        zIndex: 6000,
-        update: function (e, ui) {
-            setDirty();
-        }
-    };
-
     let removeAllEntriesAction = {
         labelKey: "clipboard_labelForRemoveAllEntries",
         labelTokens: [],
@@ -153,6 +139,21 @@ function contentPickerController($scope, $q, $routeParams, $location, entityReso
         $scope.maxNumberOfItems = $scope.model.config.maxNumber ? parseInt($scope.model.config.maxNumber) : 0;
     }
 
+    // sortable options
+    $scope.sortableOptions = {
+        axis: "y",
+        containment: "parent",
+        distance: 10,
+        opacity: 0.7,
+        tolerance: "pointer",
+        scroll: true,
+        zIndex: 6000,
+        disabled: $scope.readonly || $scope.maxNumberOfItems === 1,
+        update: function (e, ui) {
+          setDirty();
+        }
+    };
+
     //Umbraco persists boolean for prevalues as "0" or "1" so we need to convert that!
     $scope.model.config.multiPicker = Object.toBoolean($scope.model.config.multiPicker);
     $scope.model.config.showOpenButton = Object.toBoolean($scope.model.config.showOpenButton);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index 6c2f8ba58a..9e8561cc57 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -34,9 +34,9 @@
 
             <!-- Both min and max items -->
             <span ng-if="minNumberOfItems && maxNumberOfItems && minNumberOfItems !== maxNumberOfItems">
-                <span ng-if="renderModel.length < maxNumberOfItems">Add between {{minNumberOfItems}} and {{maxNumberOfItems}} items</span>
+                <span ng-if="renderModel.length < maxNumberOfItems">Add between {{minNumberOfItems}} and {{maxNumberOfItems}} item(s)</span>
                 <span ng-if="renderModel.length > maxNumberOfItems">
-                    <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected"> items selected</localize>
+                    <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected"> item(s) selected</localize>
                 </span>
             </span>
 
@@ -44,7 +44,7 @@
             <span ng-if="minNumberOfItems && maxNumberOfItems && minNumberOfItems === maxNumberOfItems">
                 <span ng-if="renderModel.length < maxNumberOfItems">Add {{minNumberOfItems - renderModel.length}} item(s)</span>
                 <span ng-if="renderModel.length > maxNumberOfItems">
-                    <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected"> items selected</localize>
+                    <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected"> item(s) selected</localize>
                 </span>
             </span>
 
@@ -52,7 +52,7 @@
             <span ng-if="!minNumberOfItems && maxNumberOfItems">
                 <span ng-if="renderModel.length < maxNumberOfItems">Add up to {{maxNumberOfItems}} items</span>
                 <span ng-if="renderModel.length > maxNumberOfItems">
-                    <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected">items selected</localize>
+                    <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected">item(s) selected</localize>
                 </span>
             </span>
 
@@ -71,12 +71,12 @@
 
         <div ng-messages="contentPickerForm.minCount.$error" show-validation-on-submit>
             <div class="help-inline" ng-message="minCount">
-                <localize key="validation_minCount">You need to add at least</localize> {{minNumberOfItems}} <localize key="validation_items">items</localize>
+                <localize key="validation_minCount">You need to add at least</localize> {{minNumberOfItems}} <localize key="validation_items">item(s)</localize>
             </div>
         </div>
         <div ng-messages="contentPickerForm.maxCount.$error" show-validation-on-submit>
             <div class="help-inline" ng-message="maxCount">
-                <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected">items selected</localize>
+                <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected">item(s) selected</localize>
             </div>
         </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html
index a5757860c9..d5cad18630 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html
@@ -38,7 +38,7 @@
                         <div class="__showcase">
 
                             <div ng-if="media.$uploadProgress < 100" class="__upload-progress-container">
-                                <div  class="__upload-progress">
+                                <div class="__upload-progress">
                                     <umb-progress-bar class="__upload-progress-bar" percentage="{{media.$uploadProgress}}"></umb-progress-bar>
                                     <div class="__upload-progress-label" ng-if="media.$uploadProgress === 0">Waiting...</div>
                                     <div class="__upload-progress-label" ng-if="media.$uploadProgress > 0">{{media.$uploadProgress}}%</div>
@@ -49,7 +49,8 @@
                                 ng-if="media.$dataURL"
                                 ng-src="{{media.$dataURL}}"
                                 title="{{media.name}}"
-                                alt="{{media.name}}" />
+                                alt="{{media.name}}"
+                                draggable="false" />
 
                             <umb-file-icon ng-if="!media.$dataURL && media.$icon"
                                 icon="{{media.$icon}}"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.component.js
index 67488c55dd..7811135bc0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.component.js
@@ -77,7 +77,7 @@
             vm.allowEditMedia = !vm.readonly;
             vm.allowDropMedia = !vm.readonly;
 
-            vm.sortableOptions.disabled = vm.readonly;
+            vm.sortableOptions.disabled = vm.readonly || vm.singleMode;
         });
 
         vm.$onInit = function() {
@@ -91,7 +91,7 @@
 
             vm.validationLimit = vm.model.config.validationLimit || {};
             // If single-mode we only allow 1 item as the maximum:
-            if(vm.model.config.multiple === false) {
+            if (vm.model.config.multiple === false) {
                 vm.validationLimit.max = 1;
             }
             vm.model.config.crops = vm.model.config.crops || [];
@@ -109,6 +109,20 @@
             unsubscribe.push(mediaUploader.on('uploadSuccess', _handleMediaUploadSuccess));
             unsubscribe.push(mediaUploader.on('queueCompleted', _handleMediaQueueCompleted));
 
+            vm.sortableOptions = {
+                cursor: "grabbing",
+                handle: "umb-media-card, .umb-media-card",
+                cancel: "input,textarea,select,option",
+                classes: ".umb-media-card--dragging",
+                distance: 5,
+                tolerance: "pointer",
+                scroll: true,
+                disabled: vm.readonly || vm.singleMode,
+                update: function (ev, ui) {
+                  setDirty();
+                }
+            };
+
             copyAllMediasAction = {
                 labelKey: "clipboard_labelForCopyAllEntries",
                 labelTokens: [vm.model.label],
@@ -137,7 +151,7 @@
                 vm.umbProperty.setPropertyActions(propertyActions);
             }
 
-            if(vm.model.value === null || !Array.isArray(vm.model.value)) {
+            if (vm.model.value === null || !Array.isArray(vm.model.value)) {
                 vm.model.value = [];
             }
 
@@ -231,7 +245,7 @@
         function addMediaAt(createIndex, $event) {
             if (!vm.allowAddMedia) return;
 
-            var mediaPicker = {
+            const mediaPicker = {
                 startNodeId: vm.model.config.startNodeId,
                 startNodeIsVirtual: vm.model.config.startNodeIsVirtual,
                 dataTypeKey: vm.model.dataTypeKey,
@@ -248,7 +262,7 @@
                     } else {
                         requestPasteFromClipboard(createIndex, item.data, item.type);
                     }
-                    if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
+                    if (!(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
                         mediaPicker.close();
                     }
                 },
@@ -281,7 +295,7 @@
             };
 
             mediaPicker.clipboardItems = clipboardService.retrieveEntriesOfType(clipboardService.TYPES.MEDIA, vm.allowedTypes || null);
-            mediaPicker.clipboardItems.sort( (a, b) => {
+            mediaPicker.clipboardItems.sort((a, b) => {
                 return b.date - a.date
             });
 
@@ -392,7 +406,7 @@
             // make a clone to avoid editing model directly.
             var mediaEntryClone = Utilities.copy(mediaEntry);
 
-            var mediaEditorModel = {
+            const mediaEditorModel = {
                 $parentScope: $scope, // pass in a $parentScope, this maintains the scope inheritance in infinite editing
                 $parentForm: vm.propertyForm, // pass in a $parentForm, this maintains the FormController hierarchy with the infinite editing view (if it contains a form)
                 createFlow: options.createFlow === true,
@@ -502,20 +516,6 @@
             });
         }
 
-        vm.sortableOptions = {
-            cursor: "grabbing",
-            handle: "umb-media-card, .umb-media-card",
-            cancel: "input,textarea,select,option",
-            classes: ".umb-media-card--dragging",
-            distance: 5,
-            tolerance: "pointer",
-            scroll: true,
-            disabled: vm.readonly,
-            update: function (ev, ui) {
-                setDirty();
-            }
-        };
-
         function onAmountOfMediaChanged() {
 
             // enable/disable property actions
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index 09facf96b5..6f201eaf3f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -21,12 +21,18 @@ function multiUrlPickerController($scope, localizationService, entityResource, i
 
     $scope.renderModel = [];
 
-    if ($scope.model.config && parseInt($scope.model.config.maxNumber) !== 1 && $scope.umbProperty) {
-        var propertyActions = [
-          removeAllEntriesAction
-        ];
+    if ($scope.model.config) {
 
-        $scope.umbProperty.setPropertyActions(propertyActions);
+        $scope.minNumberOfItems = $scope.model.config.minNumber ? parseInt($scope.model.config.minNumber) : 0;
+        $scope.maxNumberOfItems = $scope.model.config.maxNumber ? parseInt($scope.model.config.maxNumber) : 0;
+
+        if ($scope.umbProperty && $scope.maxNumberOfItems !== 1) {
+            let propertyActions = [
+               removeAllEntriesAction
+            ];
+
+            $scope.umbProperty.setPropertyActions(propertyActions);
+        }
     }
 
     if (!Array.isArray($scope.model.value)) {
@@ -41,7 +47,7 @@ function multiUrlPickerController($scope, localizationService, entityResource, i
         tolerance: "pointer",
         scroll: true,
         zIndex: 6000,
-        disabled: $scope.readonly,
+        disabled: $scope.readonly || $scope.maxNumberOfItems === 1,
         update: function () {
             setDirty();
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
index 60593b071d..cb0fcc7d9c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.PropertyEditors.MultiUrlPickerController" class="umb-property-editor umb-contentpicker">
+<div ng-controller="Umbraco.PropertyEditors.MultiUrlPickerController" class="umb-property-editor umb-contentpicker">
     <p ng-if="(renderModel|filter:{trashed:true}).length == 1"><localize key="contentPicker_pickedTrashedItem">You have picked a content item currently deleted or in the recycle bin</localize></p>
     <p ng-if="(renderModel|filter:{trashed:true}).length > 1"><localize key="contentPicker_pickedTrashedItems">You have picked content items currently deleted or in the recycle bin</localize></p>
 
@@ -29,12 +29,11 @@
 
         <div class="umb-contentpicker__min-max-help">
 
-
             <!-- Both min and max items -->
             <span ng-if="model.config.minNumber && model.config.maxNumber && model.config.minNumber !== model.config.maxNumber">
                 <span ng-if="renderModel.length < model.config.maxNumber">Add between {{model.config.minNumber}} and {{model.config.maxNumber}} items</span>
                 <span ng-if="renderModel.length > model.config.maxNumber">
-                    <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_itemsSelected"> items selected</localize>
+                    <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_itemsSelected"> item(s) selected</localize>
                 </span>
             </span>