diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
index ced63f04bb..87fe63002b 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
@@ -280,6 +280,11 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             }
         }
 
+        IImagingCrops IContentSection.ImageCrops
+        {
+            get { return Imaging.Crops; }
+        }
+
         string IContentSection.NotificationEmailAddress
         {
             get { return Notifications.NotificationEmailAddress; }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropCollection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropCollection.cs
new file mode 100644
index 0000000000..ed2da19b34
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropCollection.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ContentImagingCropCollection : ConfigurationElementCollection, IEnumerable<IImagingCrop>
+    {
+        internal void Add(ContentImagingCropElement c)
+        {
+            BaseAdd(c);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new ContentImagingCropElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((ContentImagingCropElement)element).MediaTypeAlias;
+        }
+
+        IEnumerator<IImagingCrop> IEnumerable<IImagingCrop>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IImagingCrop;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropElement.cs
new file mode 100644
index 0000000000..7a8f2a3ad4
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropElement.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ContentImagingCropElement : ConfigurationElement, IImagingCrop
+    {
+        [ConfigurationProperty("mediaTypeAlias", IsRequired = true)]
+        public string MediaTypeAlias
+        {
+            get { return (string)base["mediaTypeAlias"]; }
+        }
+
+        [ConfigurationProperty("focalPointProperty", IsRequired = true)]
+        public string FocalPointProperty
+        {
+            get { return (string)base["focalPointProperty"]; }
+        }
+
+        [ConfigurationProperty("fileProperty", IsRequired = true)]
+        public string FileProperty
+        {
+            get { return (string)base["fileProperty"]; }
+        }
+
+        [ConfigurationCollection(typeof(ContentImagingCropSizeCollection))]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public ContentImagingCropSizeCollection CropSizeCollection
+        {
+            get { return (ContentImagingCropSizeCollection)base[""]; }
+            //set { base[""] = value; }
+        }
+
+        IEnumerable<IImagingCropSize> IImagingCrop.CropSizes
+        {
+            get { return CropSizeCollection; }            
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropSizeCollection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropSizeCollection.cs
new file mode 100644
index 0000000000..427674720a
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropSizeCollection.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ContentImagingCropSizeCollection : ConfigurationElementCollection, IEnumerable<IImagingCropSize>
+    {
+        internal void Add(ContentImagingCropSizeElement c)
+        {
+            BaseAdd(c);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new ContentImagingCropSizeElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((ContentImagingCropSizeElement)element).Alias;
+        }
+
+        IEnumerator<IImagingCropSize> IEnumerable<IImagingCropSize>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IImagingCropSize;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropSizeElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropSizeElement.cs
new file mode 100644
index 0000000000..6691a8ea06
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropSizeElement.cs
@@ -0,0 +1,25 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ContentImagingCropSizeElement : ConfigurationElement, IImagingCropSize
+    {
+        [ConfigurationProperty("alias", IsRequired = true)]
+        public string Alias
+        {
+            get { return (string)base["alias"]; }
+        }
+
+        [ConfigurationProperty("width", IsRequired = true)]
+        public int Width
+        {
+            get { return (int)base["width"]; }
+        }
+
+        [ConfigurationProperty("height", IsRequired = true)]
+        public int Height
+        {
+            get { return (int)base["height"]; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropsElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropsElement.cs
new file mode 100644
index 0000000000..9555fe1422
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingCropsElement.cs
@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ContentImagingCropsElement : ConfigurationElement, IImagingCrops
+    {
+        [ConfigurationProperty("saveFiles", DefaultValue = false)]
+        public bool SaveFiles
+        {
+            get { return (bool)base["saveFiles"]; }
+        }
+
+        [ConfigurationCollection(typeof(ContentImagingCropCollection), AddItemName = "crop")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public ContentImagingCropCollection CropCollection
+        {
+            get { return (ContentImagingCropCollection)base[""]; }
+            //set { base[""] = value; }
+        }
+        
+        IEnumerable<IImagingCrop> IImagingCrops.Crops
+        {
+            get { return CropCollection; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs
index d07bfb3eda..07af1335b3 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs
@@ -1,10 +1,15 @@
-using System.Collections.Generic;
-using System.Configuration;
+using System.Configuration;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
     internal class ContentImagingElement : ConfigurationElement
     {
+        [ConfigurationProperty("crops")]
+        internal ContentImagingCropsElement Crops
+        {
+            get { return (ContentImagingCropsElement)base["crops"]; }
+        }
+
         [ConfigurationProperty("imageFileTypes")]
         internal CommaDelimitedConfigurationElement ImageFileTypes
         {
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
index 93e3260b44..c3a86c1710 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
@@ -4,6 +4,8 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 {
     public interface IContentSection : IUmbracoConfigurationSection
     {
+        IImagingCrops ImageCrops { get; }
+
         string NotificationEmailAddress { get; }
 
         bool DisableHtmlEmail { get; }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IImagingCrop.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IImagingCrop.cs
new file mode 100644
index 0000000000..e6e8a243f4
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IImagingCrop.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IImagingCrop
+    {
+        string MediaTypeAlias { get; }
+
+        string FocalPointProperty { get; }
+
+        string FileProperty { get; }
+
+        IEnumerable<IImagingCropSize> CropSizes { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IImagingCropSize.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IImagingCropSize.cs
new file mode 100644
index 0000000000..0dac07b9b2
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IImagingCropSize.cs
@@ -0,0 +1,11 @@
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IImagingCropSize
+    {
+        string Alias { get; }
+
+        int Width { get; }
+
+        int Height { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IImagingCrops.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IImagingCrops.cs
new file mode 100644
index 0000000000..02b602c6b9
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IImagingCrops.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IImagingCrops
+    {
+        bool SaveFiles { get; }
+
+        IEnumerable<IImagingCrop> Crops { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index f29a9f5b29..22e43c4e02 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -198,6 +198,14 @@
     <Compile Include="Configuration\UmbracoSettings\ContentError404Collection.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentErrorPageElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentErrorsElement.cs" />
+    <Compile Include="Configuration\UmbracoSettings\ContentImagingCropCollection.cs" />
+    <Compile Include="Configuration\UmbracoSettings\ContentImagingCropElement.cs" />
+    <Compile Include="Configuration\UmbracoSettings\ContentImagingCropsElement.cs" />
+    <Compile Include="Configuration\UmbracoSettings\ContentImagingCropSizeCollection.cs" />
+    <Compile Include="Configuration\UmbracoSettings\ContentImagingCropSizeElement.cs" />
+    <Compile Include="Configuration\UmbracoSettings\IImagingCrop.cs" />
+    <Compile Include="Configuration\UmbracoSettings\IImagingCrops.cs" />
+    <Compile Include="Configuration\UmbracoSettings\IImagingCropSize.cs" />
     <Compile Include="Configuration\UmbracoSettings\ImagingAutoFillPropertiesCollection.cs" />
     <Compile Include="Configuration\UmbracoSettings\ImagingAutoFillUploadFieldElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentImagingElement.cs" />
@@ -1121,9 +1129,7 @@
   <ItemGroup>
     <Content Include="Strings\Notes.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Imaging\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementDefaultTests.cs
index f03d3f7796..ca9d5484ea 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementDefaultTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementDefaultTests.cs
@@ -11,6 +11,25 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
             get { return true; }
         }
 
+        [Test]
+        public override void ImageCrops()
+        {
+            Assert.IsFalse(SettingsSection.Content.ImageCrops.SaveFiles);
+        }
+
+        [Test]
+        public override void ImageCropItem()
+        {
+            Assert.AreEqual(0, SettingsSection.Content.ImageCrops.Crops.Count());
+        }
+
+        [Test]
+        public override void ImageCropSizes()
+        {
+            Assert.AreEqual(0, SettingsSection.Content.ImageCrops.Crops.Count());
+        }
+
+        [Test]
         public override void DisableHtmlEmail()
         {
             Assert.IsTrue(SettingsSection.Content.DisableHtmlEmail == false);
@@ -35,11 +54,13 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
             Assert.IsTrue(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).ExtensionFieldAlias == "umbracoExtension");
         }
 
+        [Test]
         public override void TidyCharEncoding()
         {
             Assert.IsTrue(SettingsSection.Content.TidyCharEncoding == "UTF8");
         }
 
+        [Test]
         public override void XmlContentCheckForDiskChanges()
         {
             Assert.IsTrue(SettingsSection.Content.XmlContentCheckForDiskChanges == false);
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index 3928a8d857..9c3e599431 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -1,4 +1,6 @@
-using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
@@ -9,6 +11,61 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
     [TestFixture]
     public class ContentElementTests : UmbracoSettingsTests
     {
+        [Test]
+        public virtual void ImageCrops()
+        {
+            Assert.AreEqual(true, SettingsSection.Content.ImageCrops.SaveFiles);
+            Assert.AreEqual(2, SettingsSection.Content.ImageCrops.Crops.Count());
+        }
+
+        [Test]
+        public virtual void ImageCropItem()
+        {
+            Assert.AreEqual("image", SettingsSection.Content.ImageCrops.Crops.First().MediaTypeAlias);
+            Assert.AreEqual("umbracoFocalPoint", SettingsSection.Content.ImageCrops.Crops.First().FocalPointProperty);
+            Assert.AreEqual("umbracoFile", SettingsSection.Content.ImageCrops.Crops.First().FileProperty);
+            Assert.AreEqual(3, SettingsSection.Content.ImageCrops.Crops.First().CropSizes.Count());
+
+            Assert.AreEqual("custom", SettingsSection.Content.ImageCrops.Crops.Last().MediaTypeAlias);
+            Assert.AreEqual("customPoint", SettingsSection.Content.ImageCrops.Crops.Last().FocalPointProperty);
+            Assert.AreEqual("customFile", SettingsSection.Content.ImageCrops.Crops.Last().FileProperty);
+            Assert.AreEqual(2, SettingsSection.Content.ImageCrops.Crops.Last().CropSizes.Count());
+        }
+
+        [Test]
+        public virtual void ImageCropSizes()
+        {
+            var toVerify1 = new List<Tuple<string, int, int>>
+            {
+                new Tuple<string, int, int>("thumb", 100, 100),
+                new Tuple<string, int, int>("portrait", 320, 400),
+                new Tuple<string, int, int>("banner", 620, 140),
+            };
+            var toVerify2 = new List<Tuple<string, int, int>>
+            {
+                new Tuple<string, int, int>("thumb", 100, 100),
+                new Tuple<string, int, int>("banner", 600, 100),
+            };
+
+            for (var i = 0; i < SettingsSection.Content.ImageCrops.Crops.First().CropSizes.Count(); i++)
+            {
+                var size = SettingsSection.Content.ImageCrops.Crops.First().CropSizes.ElementAt(i);
+                var verify = toVerify1[i];
+                Assert.AreEqual(verify.Item1, size.Alias);
+                Assert.AreEqual(verify.Item2, size.Width);
+                Assert.AreEqual(verify.Item3, size.Height);
+            }
+            for (var i = 0; i < SettingsSection.Content.ImageCrops.Crops.Last().CropSizes.Count(); i++)
+            {
+                var size = SettingsSection.Content.ImageCrops.Crops.Last().CropSizes.ElementAt(i);
+                var verify = toVerify2[i];
+                Assert.AreEqual(verify.Item1, size.Alias);
+                Assert.AreEqual(verify.Item2, size.Width);
+                Assert.AreEqual(verify.Item3, size.Height);
+            }
+            
+        }
+
         [Test]
         public void EmailAddress()
         {
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index 363d0dd50a..a8b8b73a8f 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -21,6 +21,17 @@
           <extensionFieldAlias>umbracoExtension2</extensionFieldAlias>
         </uploadField>
       </autoFillImageProperties>
+      <crops saveFiles="true">
+        <crop mediaTypeAlias="image" focalPointProperty="umbracoFocalPoint" fileProperty="umbracoFile">
+          <add alias="thumb" width="100" height="100" />
+          <add alias="portrait" width="320" height="400" />
+          <add alias="banner" width="620" height="140" />
+        </crop>
+        <crop mediaTypeAlias="custom" focalPointProperty="customPoint" fileProperty="customFile">
+          <add alias="thumb" width="100" height="100" />
+          <add alias="banner" width="600" height="100" />
+        </crop>
+      </crops>
     </imaging>
     <scripteditor>
       <!-- Path to script folder - no ending "/" -->