diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 7c89e7f746..a3136328a1 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -168,6 +168,7 @@
   <area alias="media">
     <key alias="clickToUpload">Click to upload</key>
     <key alias="dropFilesHere">Drop your files here...</key>
+	<key alias="urls">Link to media</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Create a new member</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 2a86fa458b..4d5c853cdb 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -168,6 +168,7 @@
   <area alias="media">
     <key alias="clickToUpload">Click to upload</key>
     <key alias="dropFilesHere">Drop your files here...</key>
+	<key alias="urls">Link to media</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Create a new member</key>
diff --git a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
index 9a71686c28..94961d9793 100644
--- a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
@@ -9,6 +9,7 @@ using System.Web.Routing;
 using AutoMapper;
 using umbraco;
 using Umbraco.Core;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Mapping;
 using Umbraco.Core.PropertyEditors;
@@ -136,6 +137,37 @@ namespace Umbraco.Web.Models.Mapping
                 }
             };
 
+            var helper = new UmbracoHelper(UmbracoContext.Current);
+            var mediaItem = helper.TypedMedia(media.Id);
+            if (mediaItem != null)
+            {
+                var crops = new List<string>();
+                var autoFillProperties = UmbracoConfig.For.UmbracoSettings().Content.ImageAutoFillProperties.ToArray();
+                if (autoFillProperties.Any())
+                {
+                    foreach (var field in autoFillProperties)
+                    {
+                        var crop = mediaItem.GetCropUrl(field.Alias, string.Empty);
+                        if (string.IsNullOrWhiteSpace(crop) == false)
+                            crops.Add(crop.Split('?')[0]);
+                    }
+
+                    if (crops.Any())
+                    {
+                        var link = new ContentPropertyDisplay
+                        {
+                            Alias = string.Format("{0}urls", Constants.PropertyEditors.InternalGenericPropertiesPrefix),
+                            Label = localizedText.Localize("media/urls"),
+                            // don't add the querystring, split on the "?" will also work if there is no "?"
+                            Value = string.Join(",", crops),
+                            View = "urllist"
+                        };
+
+                        genericProperties.Add(link);
+                    }
+                }
+            }
+
             TabsAndPropertiesResolver.MapGenericProperties(media, display, localizedText, genericProperties);
         }