diff --git a/src/Umbraco.Core/Events/RecycleBinEventArgs.cs b/src/Umbraco.Core/Events/RecycleBinEventArgs.cs
index 9dd82922e1..4a51e76108 100644
--- a/src/Umbraco.Core/Events/RecycleBinEventArgs.cs
+++ b/src/Umbraco.Core/Events/RecycleBinEventArgs.cs
@@ -1,128 +1,32 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Events
 {
-    public class RecycleBinEventArgs : CancellableEventArgs, IEquatable<RecycleBinEventArgs>, IDeletingMediaFilesEventArgs
+    public class RecycleBinEventArgs : CancellableEventArgs, IEquatable<RecycleBinEventArgs>
     {
-        public RecycleBinEventArgs(Guid nodeObjectType, Dictionary<int, IEnumerable<Property>> allPropertyData, bool emptiedSuccessfully)
-            : base(false)
+        public RecycleBinEventArgs(Guid nodeObjectType, EventMessages eventMessages)
+            : base(true, eventMessages)
         {
-            AllPropertyData = allPropertyData;
             NodeObjectType = nodeObjectType;
-            Ids = AllPropertyData.Select(x => x.Key);
-            RecycleBinEmptiedSuccessfully = emptiedSuccessfully;
-            Files = new List<string>();
-        }
-
-        public RecycleBinEventArgs(Guid nodeObjectType, bool emptiedSuccessfully)
-            : base(false)
-        {
-            AllPropertyData = new Dictionary<int, IEnumerable<Property>>();
-            NodeObjectType = nodeObjectType;
-            Ids = new int[0];
-            RecycleBinEmptiedSuccessfully = emptiedSuccessfully;
-            Files = new List<string>();
-        }
-
-        public RecycleBinEventArgs(Guid nodeObjectType, Dictionary<int, IEnumerable<Property>> allPropertyData)
-            : base(true)
-        {
-            AllPropertyData = allPropertyData;
-            NodeObjectType = nodeObjectType;
-            Ids = AllPropertyData.Select(x => x.Key);
-            Files = new List<string>();
         }
 
         public RecycleBinEventArgs(Guid nodeObjectType)
             : base(true)
         {
-            AllPropertyData = new Dictionary<int, IEnumerable<Property>>();
             NodeObjectType = nodeObjectType;
-            Ids = new int[0];
-            Files = new List<string>();
-        }
 
-        /// <summary>
-        /// Backwards compatibility constructor
-        /// </summary>
-        /// <param name="nodeObjectType"></param>
-        /// <param name="allPropertyData"></param>
-        /// <param name="files"></param>
-        /// <param name="emptiedSuccessfully"></param>
-        internal RecycleBinEventArgs(Guid nodeObjectType, Dictionary<int, IEnumerable<Property>> allPropertyData, List<string> files, bool emptiedSuccessfully)
-            : base(false)
-        {
-            AllPropertyData = allPropertyData;
-            NodeObjectType = nodeObjectType;
-            Ids = AllPropertyData.Select(x => x.Key);
-            RecycleBinEmptiedSuccessfully = emptiedSuccessfully;
-            Files = files;
         }
-
-        /// <summary>
-        /// Backwards compatibility constructor
-        /// </summary>
-        /// <param name="nodeObjectType"></param>
-        /// <param name="allPropertyData"></param>
-        /// <param name="files"></param>
-        internal RecycleBinEventArgs(Guid nodeObjectType, Dictionary<int, IEnumerable<Property>> allPropertyData, List<string> files)
-            : base(true)
-        {
-            AllPropertyData = allPropertyData;
-            NodeObjectType = nodeObjectType;
-            Ids = AllPropertyData.Select(x => x.Key);
-            Files = files;
-        }
-
-        [Obsolete("Use the other ctor that specifies all property data instead")]
-        public RecycleBinEventArgs(Guid nodeObjectType, IEnumerable<int> ids, List<string> files, bool emptiedSuccessfully)
-            : base(false)
-        {
-            NodeObjectType = nodeObjectType;
-            Ids = ids;
-            Files = files;
-            RecycleBinEmptiedSuccessfully = emptiedSuccessfully;
-        }
-
-        [Obsolete("Use the other ctor that specifies all property data instead")]
-        public RecycleBinEventArgs(Guid nodeObjectType, IEnumerable<int> ids, List<string> files)
-            : base(true)
-        {
-            NodeObjectType = nodeObjectType;
-            Ids = ids;
-            Files = files;
-        }
-
+        
         /// <summary>
         /// Gets the Id of the node object type of the items
         /// being deleted from the Recycle Bin.
         /// </summary>
-        public Guid NodeObjectType { get; private set; }
-
-        /// <summary>
-        /// Gets the list of Ids for each of the items being deleted from the Recycle Bin.
-        /// </summary>
-        public IEnumerable<int> Ids { get; private set; }
-
-        /// <summary>
-        /// Gets the list of Files that should be deleted as part
-        /// of emptying the Recycle Bin.
-        /// </summary>
-        /// <remarks>
-        /// This list can be appended to during an event handling operation, generally this is done based on the property data contained in these event args
-        /// </remarks>
-        public List<string> Files { get; private set; }
-
-        public List<string> MediaFilesToDelete { get { return Files; } }
-
-        /// <summary>
-        /// Gets the list of all property data associated with a content id
-        /// </summary>
-        public Dictionary<int, IEnumerable<Property>> AllPropertyData { get; private set; }
-
+        public Guid NodeObjectType { get; }
+        
         /// <summary>
         /// Boolean indicating whether the Recycle Bin was emptied successfully
         /// </summary>
@@ -142,7 +46,7 @@ namespace Umbraco.Core.Events
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
-            return base.Equals(other) && AllPropertyData.Equals(other.AllPropertyData) && Files.Equals(other.Files) && Ids.Equals(other.Ids) && NodeObjectType.Equals(other.NodeObjectType) && RecycleBinEmptiedSuccessfully == other.RecycleBinEmptiedSuccessfully;
+            return base.Equals(other) && NodeObjectType.Equals(other.NodeObjectType) && RecycleBinEmptiedSuccessfully == other.RecycleBinEmptiedSuccessfully;
         }
 
         public override bool Equals(object obj)
@@ -158,9 +62,6 @@ namespace Umbraco.Core.Events
             unchecked
             {
                 int hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ AllPropertyData.GetHashCode();
-                hashCode = (hashCode * 397) ^ Files.GetHashCode();
-                hashCode = (hashCode * 397) ^ Ids.GetHashCode();
                 hashCode = (hashCode * 397) ^ NodeObjectType.GetHashCode();
                 hashCode = (hashCode * 397) ^ RecycleBinEmptiedSuccessfully.GetHashCode();
                 return hashCode;
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index f12533a5de..77bd1f6280 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -250,7 +250,8 @@ namespace Umbraco.Core.Migrations.Install
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 1041, EditorAlias = Constants.PropertyEditors.Aliases.Tags, DbType = "Ntext",
                 Configuration = "{\"group\":\"default\"}" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 1043, EditorAlias = Constants.PropertyEditors.Aliases.ImageCropper, DbType = "Ntext" });
-            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.DefaultContentListView, EditorAlias = Constants.PropertyEditors.Aliases.ListView, DbType = "Nvarchar" });
+            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.DefaultContentListView, EditorAlias = Constants.PropertyEditors.Aliases.ListView, DbType = "Nvarchar",
+                Configuration = "{\"pageSize\":100, \"orderBy\":\"updateDate\", \"orderDirection\":\"desc\", \"layouts\":" + layouts + ", \"includeProperties\":[{\"alias\":\"updateDate\",\"header\":\"Last edited\",\"isSystem\":1},{\"alias\":\"owner\",\"header\":\"Updated by\",\"isSystem\":1}]}" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.DefaultMediaListView, EditorAlias = Constants.PropertyEditors.Aliases.ListView, DbType = "Nvarchar",
                 Configuration = "{\"pageSize\":100, \"orderBy\":\"updateDate\", \"orderDirection\":\"desc\", \"layouts\":" + layouts + ", \"includeProperties\":[{\"alias\":\"updateDate\",\"header\":\"Last edited\",\"isSystem\":1},{\"alias\":\"owner\",\"header\":\"Updated by\",\"isSystem\":1}]}" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = Constants.DataTypes.DefaultMembersListView, EditorAlias = Constants.PropertyEditors.Aliases.ListView, DbType = "Nvarchar",
diff --git a/src/Umbraco.Core/Models/MediaExtensions.cs b/src/Umbraco.Core/Models/MediaExtensions.cs
index 2267843120..1f219d5e10 100644
--- a/src/Umbraco.Core/Models/MediaExtensions.cs
+++ b/src/Umbraco.Core/Models/MediaExtensions.cs
@@ -21,6 +21,7 @@ namespace Umbraco.Core.Models
             var val = media.Properties[propertyType];
             if (val == null) return string.Empty;
 
+            //fixme doesn't take into account variants
             var jsonString = val.GetValue() as string;
             if (jsonString == null) return string.Empty;
 
diff --git a/src/Umbraco.Core/Models/Property.cs b/src/Umbraco.Core/Models/Property.cs
index 0ff1c534c4..9e3f5fc2e0 100644
--- a/src/Umbraco.Core/Models/Property.cs
+++ b/src/Umbraco.Core/Models/Property.cs
@@ -89,7 +89,7 @@ namespace Umbraco.Core.Models
         /// Gets the list of values.
         /// </summary>
         [DataMember]
-        public List<PropertyValue> Values
+        public IReadOnlyCollection<PropertyValue> Values
         {
             get => _values;
             set
diff --git a/src/Umbraco.Core/Models/PropertyTagsExtensions.cs b/src/Umbraco.Core/Models/PropertyTagsExtensions.cs
index 7e5254201f..3121da85bd 100644
--- a/src/Umbraco.Core/Models/PropertyTagsExtensions.cs
+++ b/src/Umbraco.Core/Models/PropertyTagsExtensions.cs
@@ -112,6 +112,7 @@ namespace Umbraco.Core.Models
         private static void RemoveTags(this Property property, IEnumerable<string> tags, TagsStorageType storageType, char delimiter)
         {
             // already empty = nothing to do
+            //fixme doesn't take into account variants
             var value = property.GetValue()?.ToString();
             if (string.IsNullOrWhiteSpace(value)) return;
 
@@ -145,6 +146,7 @@ namespace Umbraco.Core.Models
         {
             if (property == null) throw new ArgumentNullException(nameof(property));
 
+            //fixme doesn't take into account variants
             var value = property.GetValue()?.ToString();
             if (string.IsNullOrWhiteSpace(value)) return Enumerable.Empty<string>();
 
@@ -154,6 +156,7 @@ namespace Umbraco.Core.Models
                     return value.Split(new[] { delimiter }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
 
                 case TagsStorageType.Json:
+                    //fixme doesn't take into account variants
                     return JsonConvert.DeserializeObject<JArray>(property.GetValue().ToString()).Select(x => x.ToString().Trim());
 
                 default:
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
index bf6fda3758..a3fb50149d 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
@@ -39,14 +39,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="entityId"></param>
         /// <returns></returns>
         EntityPermissionCollection GetPermissionsForEntity(int entityId);
-
-        ///// <summary>
-        ///// Gets the implicit/inherited list of permissions for the content item
-        ///// </summary>
-        ///// <param name="path"></param>
-        ///// <returns></returns>
-        //IEnumerable<EntityPermission> GetPermissionsForPath(string path);
-
+        
         /// <summary>
         /// Used to add/update a permission for a content item
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index 17e00b3e76..84ff426e91 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -476,6 +476,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                     if (!tagConfigurations.TryGetValue(property.PropertyType.PropertyEditorAlias, out var tagConfiguration))
                         continue;
 
+                    //fixme doesn't take into account variants
                     property.SetTagsValue(property.GetValue(), tagConfiguration);
                 }
 
diff --git a/src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs b/src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs
index a4b6e52b3d..58fde70467 100644
--- a/src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs
@@ -67,7 +67,7 @@ namespace Umbraco.Core.PropertyEditors
                 : JsonConvert.DeserializeObject<Dictionary<string, object>>(configurationJson);
 
         /// <inheritdoc />
-        public virtual object FromConfigurationEditor(Dictionary<string, object> editorValues, object configuration)
+        public virtual object FromConfigurationEditor(IDictionary<string, object> editorValues, object configuration)
         {
             // by default, return the posted dictionary
             // but only keep entries that have a non-null/empty value
@@ -80,7 +80,7 @@ namespace Umbraco.Core.PropertyEditors
         }
 
         /// <inheritdoc />
-        public virtual Dictionary<string, object> ToConfigurationEditor(object configuration)
+        public virtual IDictionary<string, object> ToConfigurationEditor(object configuration)
         {
             // editors that do not override ToEditor/FromEditor have their configuration
             // as a dictionary of <string, object> and, by default, we merge their default
@@ -100,7 +100,7 @@ namespace Umbraco.Core.PropertyEditors
         }
 
         /// <inheritdoc />
-        public virtual Dictionary<string, object> ToValueEditor(object configuration)
+        public virtual IDictionary<string, object> ToValueEditor(object configuration)
             => ToConfigurationEditor(configuration);
 
         /// <summary>
@@ -133,4 +133,4 @@ namespace Umbraco.Core.PropertyEditors
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/PropertyEditors/ConfigurationEditorOfTConfiguration.cs b/src/Umbraco.Core/PropertyEditors/ConfigurationEditorOfTConfiguration.cs
index ae48d51a52..15676f134c 100644
--- a/src/Umbraco.Core/PropertyEditors/ConfigurationEditorOfTConfiguration.cs
+++ b/src/Umbraco.Core/PropertyEditors/ConfigurationEditorOfTConfiguration.cs
@@ -113,7 +113,7 @@ namespace Umbraco.Core.PropertyEditors
         }
 
         /// <inheritdoc />
-        public sealed override object FromConfigurationEditor(Dictionary<string, object> editorValues, object configuration)
+        public sealed override object FromConfigurationEditor(IDictionary<string, object> editorValues, object configuration)
         {
             return FromConfigurationEditor(editorValues, (TConfiguration) configuration);
         }
@@ -123,7 +123,7 @@ namespace Umbraco.Core.PropertyEditors
         /// </summary>
         /// <param name="editorValues">The configuration object posted by the editor.</param>
         /// <param name="configuration">The current configuration object.</param>
-        public virtual TConfiguration FromConfigurationEditor(Dictionary<string, object> editorValues, TConfiguration configuration)
+        public virtual TConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, TConfiguration configuration)
         {
             // note - editorValue contains a mix of Clr types (string, int...) and JToken
             // turning everything back into a JToken... might not be fastest but is simplest
@@ -144,7 +144,7 @@ namespace Umbraco.Core.PropertyEditors
         }
 
         /// <inheritdoc />
-        public sealed override Dictionary<string, object> ToConfigurationEditor(object configuration)
+        public sealed override IDictionary<string, object> ToConfigurationEditor(object configuration)
         {
             return ToConfigurationEditor((TConfiguration) configuration);
         }
@@ -152,7 +152,6 @@ namespace Umbraco.Core.PropertyEditors
         /// <summary>
         /// Converts configuration values to values for the editor.
         /// </summary>
-        /// <param name="defaultConfiguration">The default configuration.</param>
         /// <param name="configuration">The configuration.</param>
         public virtual Dictionary<string, object> ToConfigurationEditor(TConfiguration configuration)
         {
@@ -170,4 +169,4 @@ namespace Umbraco.Core.PropertyEditors
             return ObjectExtensions.ToObjectDictionary(configuration, FieldNamer);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/PropertyEditors/IConfigurationEditor.cs b/src/Umbraco.Core/PropertyEditors/IConfigurationEditor.cs
index 0bbd42a966..cd8c8be030 100644
--- a/src/Umbraco.Core/PropertyEditors/IConfigurationEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/IConfigurationEditor.cs
@@ -39,18 +39,18 @@ namespace Umbraco.Core.PropertyEditors
         /// </summary>
         /// <param name="editorValues">The values posted by the configuration editor.</param>
         /// <param name="configuration">The current configuration object.</param>
-        object FromConfigurationEditor(Dictionary<string, object> editorValues, object configuration);
+        object FromConfigurationEditor(IDictionary<string, object> editorValues, object configuration);
 
         /// <summary>
         /// Converts the configuration object to values for the configuration editor.
         /// </summary>
         /// <param name="configuration">The configuration.</param>
-        Dictionary<string, object> ToConfigurationEditor(object configuration);
+        IDictionary<string, object> ToConfigurationEditor(object configuration);
 
         /// <summary>
         /// Converts the configuration object to values for the value editror.
         /// </summary>
         /// <param name="configuration">The configuration.</param>
-        Dictionary<string, object> ToValueEditor(object configuration);
+        IDictionary<string, object> ToValueEditor(object configuration);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
index b08a7ed55d..93128ca67c 100644
--- a/src/Umbraco.Core/Services/IContentService.cs
+++ b/src/Umbraco.Core/Services/IContentService.cs
@@ -329,7 +329,7 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Empties the recycle bin.
         /// </summary>
-        void EmptyRecycleBin();
+        OperationResult EmptyRecycleBin();
 
         /// <summary>
         /// Sorts documents.
diff --git a/src/Umbraco.Core/Services/IMediaService.cs b/src/Umbraco.Core/Services/IMediaService.cs
index 749ade323e..3fd4199490 100644
--- a/src/Umbraco.Core/Services/IMediaService.cs
+++ b/src/Umbraco.Core/Services/IMediaService.cs
@@ -248,7 +248,7 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Empties the Recycle Bin by deleting all <see cref="IMedia"/> that resides in the bin
         /// </summary>
-        void EmptyRecycleBin();
+        OperationResult EmptyRecycleBin();
 
         /// <summary>
         /// Deletes all media of specified type. All children of deleted media is moved to Recycle Bin.
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 789ae30cab..c5f20878ae 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -1518,11 +1518,11 @@ namespace Umbraco.Core.Services.Implement
         /// <summary>
         /// Empties the Recycle Bin by deleting all <see cref="IContent"/> that resides in the bin
         /// </summary>
-        public void EmptyRecycleBin()
+        public OperationResult EmptyRecycleBin()
         {
             var nodeObjectType = Constants.ObjectTypes.Document;
             var deleted = new List<IContent>();
-            var evtMsgs = EventMessagesFactory.Get(); // todo - and then?
+            var evtMsgs = EventMessagesFactory.Get();
 
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -1533,11 +1533,11 @@ namespace Umbraco.Core.Services.Implement
                 // are managed by Delete, and not here.
 
                 // no idea what those events are for, keep a simplified version
-                var recycleBinEventArgs = new RecycleBinEventArgs(nodeObjectType);
+                var recycleBinEventArgs = new RecycleBinEventArgs(nodeObjectType, evtMsgs);
                 if (scope.Events.DispatchCancelable(EmptyingRecycleBin, this, recycleBinEventArgs))
                 {
                     scope.Complete();
-                    return; // causes rollback
+                    return OperationResult.Cancel(evtMsgs);
                 }
 
                 // emptying the recycle bin means deleting whetever is in there - do it properly!
@@ -1557,6 +1557,8 @@ namespace Umbraco.Core.Services.Implement
 
                 scope.Complete();
             }
+
+            return OperationResult.Succeed(evtMsgs);
         }
 
         #endregion
@@ -2311,7 +2313,7 @@ namespace Umbraco.Core.Services.Implement
             content.WriterId = userId;
 
             foreach (var property in blueprint.Properties)
-                content.SetValue(property.Alias, property.GetValue());
+                content.SetValue(property.Alias, property.GetValue()); //fixme doesn't take into account variants
 
             return content;
         }
diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index dec4e56714..504750874c 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -1185,7 +1185,7 @@ namespace Umbraco.Core.Services.Implement
         /// <summary>
         /// Empties the Recycle Bin by deleting all <see cref="IMedia"/> that resides in the bin
         /// </summary>
-        public void EmptyRecycleBin()
+        public OperationResult EmptyRecycleBin()
         {
             var nodeObjectType = Constants.ObjectTypes.Media;
             var deleted = new List<IMedia>();
@@ -1206,12 +1206,12 @@ namespace Umbraco.Core.Services.Implement
                 // emptying the recycle bin means deleting whetever is in there - do it properly!
                 // are managed by Delete, and not here.
                 // no idea what those events are for, keep a simplified version
-                var args = new RecycleBinEventArgs(nodeObjectType);
+                var args = new RecycleBinEventArgs(nodeObjectType, evtMsgs);
 
                 if (scope.Events.DispatchCancelable(EmptyingRecycleBin, this, args))
                 {
                     scope.Complete();
-                    return;
+                    return OperationResult.Cancel(evtMsgs);
                 }
                 // emptying the recycle bin means deleting whetever is in there - do it properly!
                 var query = Query<IMedia>().Where(x => x.ParentId == Constants.System.RecycleBinMedia);
@@ -1227,6 +1227,8 @@ namespace Umbraco.Core.Services.Implement
                 Audit(AuditType.Delete, "Empty Media Recycle Bin performed by user", 0, Constants.System.RecycleBinMedia);
                 scope.Complete();
             }
+
+            return OperationResult.Succeed(evtMsgs);
         }
 
         #endregion
diff --git a/src/Umbraco.Core/Services/Implement/NotificationService.cs b/src/Umbraco.Core/Services/Implement/NotificationService.cs
index 0b57958724..c24e82c14f 100644
--- a/src/Umbraco.Core/Services/Implement/NotificationService.cs
+++ b/src/Umbraco.Core/Services/Implement/NotificationService.cs
@@ -368,6 +368,8 @@ namespace Umbraco.Core.Services.Implement
             var props = content.Properties.ToArray();
             foreach (var p in props)
             {
+                //fixme doesn't take into account variants
+
                 var newText = p.GetValue() != null ? p.GetValue().ToString() : "";
                 var oldText = newText;
 
diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index f08acbe74d..8040e6397b 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -135,6 +135,7 @@ namespace Umbraco.Core
         /// <returns></returns>
         public static bool DetectIsJson(this string input)
         {
+            if (input.IsNullOrWhiteSpace()) return false;
             input = input.Trim();
             return (input.StartsWith("{") && input.EndsWith("}"))
                    || (input.StartsWith("[") && input.EndsWith("]"));
diff --git a/src/Umbraco.Tests/Cache/CacheRefresherComponentTests.cs b/src/Umbraco.Tests/Cache/CacheRefresherComponentTests.cs
index 4399380f92..e79b26cd1d 100644
--- a/src/Umbraco.Tests/Cache/CacheRefresherComponentTests.cs
+++ b/src/Umbraco.Tests/Cache/CacheRefresherComponentTests.cs
@@ -86,7 +86,7 @@ namespace Umbraco.Tests.Cache
                 new EventDefinition<IMediaService, DeleteEventArgs<IMedia>>(null, serviceContext.MediaService, new DeleteEventArgs<IMedia>(Enumerable.Empty<IMedia>())),
                 new EventDefinition<IMediaService, MoveEventArgs<IMedia>>(null, serviceContext.MediaService, new MoveEventArgs<IMedia>(new MoveEventInfo<IMedia>(null, "", -1)), "Moved"),
                 new EventDefinition<IMediaService, MoveEventArgs<IMedia>>(null, serviceContext.MediaService, new MoveEventArgs<IMedia>(new MoveEventInfo<IMedia>(null, "", -1)), "Trashed"),
-                new EventDefinition<IMediaService, RecycleBinEventArgs>(null, serviceContext.MediaService, new RecycleBinEventArgs(Guid.NewGuid(), new Dictionary<int, IEnumerable<Property>>(), true)),
+                new EventDefinition<IMediaService, RecycleBinEventArgs>(null, serviceContext.MediaService, new RecycleBinEventArgs(Guid.NewGuid())),
 
                 new EventDefinition<IContentService, SaveEventArgs<IContent>>(null, serviceContext.ContentService, new SaveEventArgs<IContent>(Enumerable.Empty<IContent>()), "Saved"),
                 new EventDefinition<IContentService, DeleteEventArgs<IContent>>(null, serviceContext.ContentService, new DeleteEventArgs<IContent>(Enumerable.Empty<IContent>()), "Deleted"),
@@ -97,7 +97,7 @@ namespace Umbraco.Tests.Cache
 
                 new EventDefinition<IContentService, CopyEventArgs<IContent>>(null, serviceContext.ContentService, new CopyEventArgs<IContent>(null, null, -1)),
                 new EventDefinition<IContentService, MoveEventArgs<IContent>>(null, serviceContext.ContentService, new MoveEventArgs<IContent>(new MoveEventInfo<IContent>(null, "", -1)), "Trashed"),
-                new EventDefinition<IContentService, RecycleBinEventArgs>(null, serviceContext.ContentService, new RecycleBinEventArgs(Guid.NewGuid(), new Dictionary<int, IEnumerable<Property>>(), true)),
+                new EventDefinition<IContentService, RecycleBinEventArgs>(null, serviceContext.ContentService, new RecycleBinEventArgs(Guid.NewGuid())),
                 new EventDefinition<IContentService, PublishEventArgs<IContent>>(null, serviceContext.ContentService, new PublishEventArgs<IContent>(Enumerable.Empty<IContent>()), "Published"),
                 new EventDefinition<IContentService, PublishEventArgs<IContent>>(null, serviceContext.ContentService, new PublishEventArgs<IContent>(Enumerable.Empty<IContent>()), "UnPublished"),
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
index 2ffdc3f1dd..e4ba9b337c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
@@ -181,11 +181,13 @@
 
             var firstAllowedLayout = {};
 
-            for (var i = 0; layouts.length > i; i++) {
-                var layout = layouts[i];
-                if (layout.selected === true) {
-                    firstAllowedLayout = layout;
-                    break;
+            if (layouts != null) {
+                for (var i = 0; layouts.length > i; i++) {
+                    var layout = layouts[i];
+                    if (layout.selected === true) {
+                        firstAllowedLayout = layout;
+                        break;
+                    }
                 }
             }
 
diff --git a/src/Umbraco.Web/Editors/ImagesController.cs b/src/Umbraco.Web/Editors/ImagesController.cs
index ee4d4658cd..f8f49ba2da 100644
--- a/src/Umbraco.Web/Editors/ImagesController.cs
+++ b/src/Umbraco.Web/Editors/ImagesController.cs
@@ -40,6 +40,7 @@ namespace Umbraco.Web.Editors
             if (imageProp == null)
                 return Request.CreateResponse(HttpStatusCode.NotFound);
 
+            //fixme doesn't take into account variants
             var imagePath = imageProp.GetValue().ToString();
             return GetBigThumbnail(imagePath);
         }
@@ -78,6 +79,7 @@ namespace Umbraco.Web.Editors
             if (imageProp == null)
                 return new HttpResponseMessage(HttpStatusCode.NotFound);
 
+            //fixme doesn't take into account variants
             var imagePath = imageProp.GetValue().ToString();
             return GetResized(imagePath, width);
         }
diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
index 4102c3fe90..6da8b39297 100644
--- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
@@ -106,14 +106,28 @@ namespace Umbraco.Web.Models.Mapping
             SetChildItemsTabPosition(display, listViewConfig, listViewTab);
         }
 
+        private static int GetTabNumberFromConfig(IDictionary<string, object> listViewConfig)
+        {
+            if (!listViewConfig.TryGetValue("displayAtTabNumber", out var displayTabNum))
+                return -1;
+            switch (displayTabNum)
+            {
+                case int i:
+                    return i;
+                case string s when int.TryParse(s, out var parsed):
+                    return parsed;
+            }
+            return -1;
+        }
+
         private static void SetChildItemsTabPosition<TPersisted>(TabbedContentItem<ContentPropertyDisplay, TPersisted> display,
                 IDictionary<string, object> listViewConfig,
                 Tab<ContentPropertyDisplay> listViewTab)
             where TPersisted : IContentBase
         {
             // Find position of tab from config
-            var tabIndexForChildItems = 0;
-            if (listViewConfig["displayAtTabNumber"] != null && int.TryParse((string)listViewConfig["displayAtTabNumber"], out tabIndexForChildItems))
+            var tabIndexForChildItems = GetTabNumberFromConfig(listViewConfig);
+            if (tabIndexForChildItems != -1)
             {
                 // Tab position is recorded 1-based but we insert into collection 0-based
                 tabIndexForChildItems--;
@@ -129,8 +143,9 @@ namespace Umbraco.Web.Models.Mapping
                     tabIndexForChildItems = display.Tabs.Count();
                 }
             }
-
-            // Recreate tab list with child items tab at configured position
+            else tabIndexForChildItems = 0;
+
+            // Recreate tab list with child items tab at configured position
             var tabs = new List<Tab<ContentPropertyDisplay>>();
             tabs.AddRange(display.Tabs);
             tabs.Insert(tabIndexForChildItems, listViewTab);
diff --git a/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
index 17d0cfb383..ddc4b50858 100644
--- a/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Web.PropertyEditors
             return jobject.Property("color").Value.Value<string>();
         }
 
-        public override ColorPickerConfiguration FromConfigurationEditor(Dictionary<string, object> editorValues, ColorPickerConfiguration configuration)
+        public override ColorPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, ColorPickerConfiguration configuration)
         {
             var output = new ColorPickerConfiguration();
 
diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs
index 9cb5a3fe6b..5be97e5f76 100644
--- a/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.PropertyEditors
                 .Config = new Dictionary<string, object> { { "idType", "udi" } };
         }
 
-        public override Dictionary<string, object> ToValueEditor(object configuration)
+        public override IDictionary<string, object> ToValueEditor(object configuration)
         {
             // these are not configuration fields, but constants required by the value editor
             var d = base.ToValueEditor(configuration);
@@ -22,4 +22,4 @@ namespace Umbraco.Web.PropertyEditors
             return d;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/PropertyEditors/DateConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/DateConfigurationEditor.cs
index caca3e7e2f..b0839c5157 100644
--- a/src/Umbraco.Web/PropertyEditors/DateConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/DateConfigurationEditor.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class DateConfigurationEditor : ConfigurationEditor<DateConfiguration>
     {
-        public override Dictionary<string, object> ToValueEditor(object configuration)
+        public override IDictionary<string, object> ToValueEditor(object configuration)
         {
             var d = base.ToValueEditor(configuration);
             d["pickTime"] = false;
diff --git a/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs
index 68d9252064..494d8814f4 100644
--- a/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class DateTimeConfigurationEditor : ConfigurationEditor<DateTimeConfiguration>
     {
-        public override Dictionary<string, object> ToValueEditor(object configuration)
+        public override IDictionary<string, object> ToValueEditor(object configuration)
         {
             var d = base.ToValueEditor(configuration);
             d["pickTime"] = true;
diff --git a/src/Umbraco.Web/PropertyEditors/DropDownFlexibleConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/DropDownFlexibleConfigurationEditor.cs
index 530ca283ff..5821823576 100644
--- a/src/Umbraco.Web/PropertyEditors/DropDownFlexibleConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/DropDownFlexibleConfigurationEditor.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Web.PropertyEditors
             items.Validators.Add(new ValueListUniqueValueValidator());
         }
 
-        public override DropDownFlexibleConfiguration FromConfigurationEditor(Dictionary<string, object> editorValues, DropDownFlexibleConfiguration configuration)
+        public override DropDownFlexibleConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DropDownFlexibleConfiguration configuration)
         {
             var output = new DropDownFlexibleConfiguration();
 
diff --git a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
index bc4d21c4c4..e969d2e45b 100644
--- a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
@@ -36,30 +36,12 @@ namespace Umbraco.Web.PropertyEditors
         /// Gets a value indicating whether a property is an upload field.
         /// </summary>
         /// <param name="property">The property.</param>
-        /// <param name="ensureValue">A value indicating whether to check that the property has a non-empty value.</param>
         /// <returns>A value indicating whether a property is an upload field, and (optionaly) has a non-empty value.</returns>
-        private static bool IsUploadField(Property property, bool ensureValue)
+        private static bool IsUploadField(Property property)
         {
-            if (property.PropertyType.PropertyEditorAlias != Constants.PropertyEditors.Aliases.UploadField)
-                return false;
-            if (ensureValue == false)
-                return true;
-            var stringValue = property.GetValue() as string;
-            return string.IsNullOrWhiteSpace(stringValue) == false;
+            return property.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.UploadField;
         }
-
-        /// <summary>
-        /// Ensures any files associated are removed
-        /// </summary>
-        /// <param name="allPropertyData"></param>
-        internal IEnumerable<string> ServiceEmptiedRecycleBin(Dictionary<int, IEnumerable<Property>> allPropertyData)
-        {
-            return allPropertyData.SelectMany(x => x.Value)
-                .Where (x => IsUploadField(x, true))
-                .Select(x => _mediaFileSystem.GetRelativePath((string)x.GetValue()))
-                .ToList();
-        }
-
+        
         /// <summary>
         /// Ensures any files associated are removed
         /// </summary>
@@ -67,10 +49,32 @@ namespace Umbraco.Web.PropertyEditors
         internal IEnumerable<string> ServiceDeleted(IEnumerable<ContentBase> deletedEntities)
         {
             return deletedEntities.SelectMany(x => x.Properties)
-                .Where(x => IsUploadField(x, true))
-                .Select(x => _mediaFileSystem.GetRelativePath((string) x.GetValue()))
-                .ToList();
+                .Where(IsUploadField)
+                .SelectMany(GetFilePathsFromPropertyValues)
+                .Distinct();
         }
+
+        /// <summary>
+        /// Look through all propery values stored against the property and resolve any file paths stored
+        /// </summary>
+        /// <param name="prop"></param>
+        /// <returns></returns>
+        private IEnumerable<string> GetFilePathsFromPropertyValues(Property prop)
+        {
+            var propVals = prop.Values;
+            foreach (var propertyValue in propVals)
+            {
+                //check if the published value contains data and return it
+                var propVal = propertyValue.PublishedValue;
+                if (propVal != null && propVal is string str1 && !str1.IsNullOrWhiteSpace())
+                    yield return _mediaFileSystem.GetRelativePath(str1);
+
+                //check if the edited value contains data and return it
+                propVal = propertyValue.EditedValue;
+                if (propVal != null && propVal is string str2 && !str2.IsNullOrWhiteSpace())
+                    yield return _mediaFileSystem.GetRelativePath(str2);
+            }
+        }
 
         /// <summary>
         /// After a content has been copied, also copy uploaded files.
@@ -80,16 +84,22 @@ namespace Umbraco.Web.PropertyEditors
         internal void ContentServiceCopied(IContentService sender, Core.Events.CopyEventArgs<IContent> args)
         {
             // get the upload field properties with a value
-            var properties = args.Original.Properties.Where(x => IsUploadField(x, true));
+            var properties = args.Original.Properties.Where(IsUploadField);
 
             // copy files
             var isUpdated = false;
             foreach (var property in properties)
             {
-                var sourcePath = _mediaFileSystem.GetRelativePath((string) property.GetValue());
-                var copyPath = _mediaFileSystem.CopyFile(args.Copy, property.PropertyType, sourcePath);
-                args.Copy.SetValue(property.Alias, _mediaFileSystem.GetUrl(copyPath));
-                isUpdated = true;
+                //copy each of the property values (variants, segments) to the destination
+                foreach (var propertyValue in property.Values)
+                {
+                    var propVal = property.GetValue(propertyValue.LanguageId, propertyValue.Segment);
+                    if (propVal == null || !(propVal is string str) || str.IsNullOrWhiteSpace()) continue;
+                    var sourcePath = _mediaFileSystem.GetRelativePath(str);
+                    var copyPath = _mediaFileSystem.CopyFile(args.Copy, property.PropertyType, sourcePath);
+                    args.Copy.SetValue(property.Alias, _mediaFileSystem.GetUrl(copyPath), propertyValue.LanguageId, propertyValue.Segment);
+                    isUpdated = true;
+                }
             }
 
             // if updated, re-save the copy with the updated value
@@ -134,7 +144,7 @@ namespace Umbraco.Web.PropertyEditors
         /// </summary>
         private void AutoFillProperties(IContentBase model)
         {
-            var properties = model.Properties.Where(x => IsUploadField(x, false));
+            var properties = model.Properties.Where(IsUploadField);
 
             foreach (var property in properties)
             {
diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperConfigurationEditor.cs
index f2bb4d6a53..2751b3bdc1 100644
--- a/src/Umbraco.Web/PropertyEditors/ImageCropperConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ImageCropperConfigurationEditor.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Web.PropertyEditors
     internal class ImageCropperConfigurationEditor : ConfigurationEditor<ImageCropperConfiguration>
     {
         /// <inheritdoc />
-        public override Dictionary<string, object> ToValueEditor(object configuration)
+        public override IDictionary<string, object> ToValueEditor(object configuration)
         {
             var d = base.ToValueEditor(configuration);
             if (!d.ContainsKey("focalPoint")) d["focalPoint"] = new { left = 0.5, top = 0.5 };
diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
index 9a903b932d..6d3c5b4f61 100644
--- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
@@ -50,17 +50,11 @@ namespace Umbraco.Web.PropertyEditors
         /// <summary>
         /// Gets a value indicating whether a property is an image cropper field.
         /// </summary>
-        /// <param name="property">The property.</param>
-        /// <param name="ensureValue">A value indicating whether to check that the property has a non-empty value.</param>
+        /// <param name="property">The property.</param>        
         /// <returns>A value indicating whether a property is an image cropper field, and (optionaly) has a non-empty value.</returns>
-        private static bool IsCropperField(Property property, bool ensureValue)
+        private static bool IsCropperField(Property property)
         {
-            if (property.PropertyType.PropertyEditorAlias != Constants.PropertyEditors.Aliases.ImageCropper)
-                return false;
-            if (ensureValue == false)
-                return true;
-            var val = property.GetValue();
-            return val is string s && string.IsNullOrWhiteSpace(s) == false;
+            return property.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.ImageCropper;
         }
 
         /// <summary>
@@ -87,22 +81,6 @@ namespace Umbraco.Web.PropertyEditors
             }
         }
 
-        /// <summary>
-        /// Ensures any files associated are removed
-        /// </summary>
-        /// <param name="allPropertyData"></param>
-        internal IEnumerable<string> ServiceEmptiedRecycleBin(Dictionary<int, IEnumerable<Property>> allPropertyData)
-        {
-            return allPropertyData.SelectMany(x => x.Value)
-                .Where(x => IsCropperField(x, true)).Select(x =>
-                {
-                    var jo = GetJObject((string) x.GetValue(), true);
-                    if (jo?["src"] == null) return null;
-                    var src = jo["src"].Value<string>();
-                    return string.IsNullOrWhiteSpace(src) ? null : _mediaFileSystem.GetRelativePath(src);
-                }).WhereNotNull();
-        }
-
         /// <summary>
         /// Ensures any files associated are removed
         /// </summary>
@@ -110,13 +88,47 @@ namespace Umbraco.Web.PropertyEditors
         internal IEnumerable<string> ServiceDeleted(IEnumerable<ContentBase> deletedEntities)
         {
             return deletedEntities.SelectMany(x => x.Properties)
-                .Where(x => IsCropperField(x, true)).Select(x =>
-                {
-                    var jo = GetJObject((string) x.GetValue(), true);
-                    if (jo?["src"] == null) return null;
-                    var src = jo["src"].Value<string>();
-                    return string.IsNullOrWhiteSpace(src) ? null : _mediaFileSystem.GetRelativePath(src);
-                }).WhereNotNull();
+                .Where(IsCropperField)
+                .SelectMany(GetFilePathsFromPropertyValues)
+                .Distinct();
+        }
+
+        /// <summary>
+        /// Look through all propery values stored against the property and resolve any file paths stored
+        /// </summary>
+        /// <param name="prop"></param>
+        /// <returns></returns>
+        private IEnumerable<string> GetFilePathsFromPropertyValues(Property prop)
+        {
+            //parses out the src from a json string
+
+            foreach (var propertyValue in prop.Values)
+            {
+                //check if the published value contains data and return it
+                var src = GetFileSrcFromPropertyValue(propertyValue.PublishedValue, out var _);
+                if (src != null) yield return _mediaFileSystem.GetRelativePath(src);
+
+                //check if the edited value contains data and return it
+                src = GetFileSrcFromPropertyValue(propertyValue.EditedValue, out var _);
+                if (src != null) yield return _mediaFileSystem.GetRelativePath(src);
+            }
+        }
+
+        /// <summary>
+        /// Returns the "src" property from the json structure if the value is formatted correctly
+        /// </summary>
+        /// <param name="propVal"></param>
+        /// <param name="deserializedValue">The deserialized <see cref="JObject"/> value</param>
+        /// <returns></returns>
+        private string GetFileSrcFromPropertyValue(object propVal, out JObject deserializedValue)
+        {
+            deserializedValue = null;
+            if (propVal == null || !(propVal is string str)) return null;
+            if (!str.DetectIsJson()) return null;
+            deserializedValue = GetJObject(str, true);
+            if (deserializedValue?["src"] == null) return null;
+            var src = deserializedValue["src"].Value<string>();
+            return _mediaFileSystem.GetRelativePath(src);
         }
 
         /// <summary>
@@ -126,23 +138,25 @@ namespace Umbraco.Web.PropertyEditors
         /// <param name="args">The event arguments.</param>
         public void ContentServiceCopied(IContentService sender, Core.Events.CopyEventArgs<IContent> args)
         {
-            // get the image cropper field properties with a value
-            var properties = args.Original.Properties.Where(x => IsCropperField(x, true));
+            // get the image cropper field properties
+            var properties = args.Original.Properties.Where(IsCropperField);
 
             // copy files
             var isUpdated = false;
             foreach (var property in properties)
             {
-                var jo = GetJObject((string) property.GetValue(), true);
-
-                var src = jo?["src"]?.Value<string>();
-                if (string.IsNullOrWhiteSpace(src)) continue;
-
-                var sourcePath = _mediaFileSystem.GetRelativePath(src);
-                var copyPath = _mediaFileSystem.CopyFile(args.Copy, property.PropertyType, sourcePath);
-                jo["src"] = _mediaFileSystem.GetUrl(copyPath);
-                args.Copy.SetValue(property.Alias, jo.ToString());
-                isUpdated = true;
+                //copy each of the property values (variants, segments) to the destination by using the edited value
+                foreach (var propertyValue in property.Values)
+                {
+                    var propVal = property.GetValue(propertyValue.LanguageId, propertyValue.Segment);
+                    var src = GetFileSrcFromPropertyValue(propVal, out var jo);
+                    if (src == null) continue;
+                    var sourcePath = _mediaFileSystem.GetRelativePath(src);
+                    var copyPath = _mediaFileSystem.CopyFile(args.Copy, property.PropertyType, sourcePath);
+                    jo["src"] = _mediaFileSystem.GetUrl(copyPath);
+                    args.Copy.SetValue(property.Alias, jo.ToString(), propertyValue.LanguageId, propertyValue.Segment);
+                    isUpdated = true;
+                }
             }
             // if updated, re-save the copy with the updated value
             if (isUpdated)
@@ -186,7 +200,7 @@ namespace Umbraco.Web.PropertyEditors
         /// </summary>
         private void AutoFillProperties(IContentBase model)
         {
-            var properties = model.Properties.Where(x => IsCropperField(x, false));
+            var properties = model.Properties.Where(IsCropperField);
 
             foreach (var property in properties)
             {
diff --git a/src/Umbraco.Web/PropertyEditors/LabelConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/LabelConfigurationEditor.cs
index 7b6063c538..c248eb1f71 100644
--- a/src/Umbraco.Web/PropertyEditors/LabelConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/LabelConfigurationEditor.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.PropertyEditors
     public class LabelConfigurationEditor : ConfigurationEditor<LabelConfiguration>
     {
         /// <inheritdoc />
-        public override LabelConfiguration FromConfigurationEditor(Dictionary<string, object> editorValues, LabelConfiguration configuration)
+        public override LabelConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, LabelConfiguration configuration)
         {
             var newConfiguration = new LabelConfiguration();
 
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs
index 53ae28c4a9..e810a65fb6 100644
--- a/src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Web.PropertyEditors
                 };
         }
 
-        public override Dictionary<string, object> ToValueEditor(object configuration)
+        public override IDictionary<string, object> ToValueEditor(object configuration)
         {
             var d = base.ToValueEditor(configuration);
             d["idType"] = "udi";
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
index eb0849c3c6..48b0d7327a 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Web.PropertyEditors
         }
 
         /// <inheritdoc />
-        public override Dictionary<string, object> ToValueEditor(object configuration)
+        public override IDictionary<string, object> ToValueEditor(object configuration)
         {
             var d = base.ToValueEditor(configuration);
             d["multiPicker"] = true;
diff --git a/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs
index a993b1c814..6a10a103ba 100644
--- a/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Web.PropertyEditors
         }
 
         /// <inheritdoc />
-        public override MultipleTestStringConfiguration FromConfigurationEditor(Dictionary<string, object> editorValues, MultipleTestStringConfiguration configuration)
+        public override MultipleTestStringConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, MultipleTestStringConfiguration configuration)
         {
             // fixme this isn't pretty
             //the values from the editor will be min/max fieds and we need to format to json in one field
diff --git a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs
index 6c0233a7e3..c4f9f6be15 100644
--- a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs
+++ b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs
@@ -33,12 +33,8 @@ namespace Umbraco.Web.PropertyEditors
 
             MediaService.Deleted += (sender, args)
                 => args.MediaFilesToDelete.AddRange(fileUpload.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
-            MediaService.EmptiedRecycleBin += (sender, args)
-                => args.Files.AddRange(fileUpload.ServiceEmptiedRecycleBin(args.AllPropertyData));
             ContentService.Deleted += (sender, args)
                 => args.MediaFilesToDelete.AddRange(fileUpload.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
-            ContentService.EmptiedRecycleBin += (sender, args)
-                => args.Files.AddRange(fileUpload.ServiceEmptiedRecycleBin(args.AllPropertyData));
             MemberService.Deleted += (sender, args)
                 => args.MediaFilesToDelete.AddRange(fileUpload.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
         }
@@ -51,12 +47,8 @@ namespace Umbraco.Web.PropertyEditors
 
             MediaService.Deleted += (sender, args)
                 => args.MediaFilesToDelete.AddRange(imageCropper.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
-            MediaService.EmptiedRecycleBin += (sender, args)
-                => args.Files.AddRange(imageCropper.ServiceEmptiedRecycleBin(args.AllPropertyData));
             ContentService.Deleted += (sender, args)
                 => args.MediaFilesToDelete.AddRange(imageCropper.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
-            ContentService.EmptiedRecycleBin += (sender, args)
-                => args.Files.AddRange(imageCropper.ServiceEmptiedRecycleBin(args.AllPropertyData));
             MemberService.Deleted += (sender, args)
                 => args.MediaFilesToDelete.AddRange(imageCropper.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
         }
diff --git a/src/Umbraco.Web/PropertyEditors/RelatedLinksConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/RelatedLinksConfigurationEditor.cs
index 64d16f8f2a..07ff359a82 100644
--- a/src/Umbraco.Web/PropertyEditors/RelatedLinksConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RelatedLinksConfigurationEditor.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class RelatedLinksConfigurationEditor : ConfigurationEditor
     {
-        public override Dictionary<string, object> ToValueEditor(object configuration)
+        public override IDictionary<string, object> ToValueEditor(object configuration)
         {
             var d = base.ToValueEditor(configuration);
             d["idType"] = "udi";
diff --git a/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs
index 3a68c878b6..00ff2cf136 100644
--- a/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Web.PropertyEditors
             return dictionary;
         }
 
-        public override TagConfiguration FromConfigurationEditor(Dictionary<string, object> editorValues, TagConfiguration configuration)
+        public override TagConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, TagConfiguration configuration)
         {
             // the front-end editor retuns the string value of the storage type
             // pure Json could do with
diff --git a/src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs
index a91103207c..d130fb5952 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs
@@ -64,7 +64,7 @@ namespace Umbraco.Web.PropertyEditors
         }
 
         /// <inheritdoc />
-        public override ValueListConfiguration FromConfigurationEditor(Dictionary<string, object> editorValues, ValueListConfiguration configuration)
+        public override ValueListConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, ValueListConfiguration configuration)
         {
             var output = new ValueListConfiguration();