diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardFolderBrowser.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardFolderBrowser.ascx
index b1c7f72b46..f4094b4455 100644
--- a/src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardFolderBrowser.ascx
+++ b/src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardFolderBrowser.ascx
@@ -1,4 +1,4 @@
 <%@ Control Language="C#" AutoEventWireup="true" %>
-<%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols.FolderBrowser" Assembly="controls" %>
+<%@ Register TagPrefix="umb" Namespace="Umbraco.Web.UI.Controls" Assembly="umbraco" %>
 
 <umb:FolderBrowser runat="server" />
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Css/folderbrowser.css b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Css/folderbrowser.css
index 12c9f0bc8a..5114c7c935 100644
--- a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Css/folderbrowser.css
+++ b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Css/folderbrowser.css
@@ -46,7 +46,7 @@
     text-align: center;
     border: solid 1px #ccc;
     width: 120px;
-    height: 160px;
+    height: 150px;
     float: left;
     -moz-box-shadow: 2px 2px 2px #e0e0e0;
     -webkit-box-shadow: 2px 2px 2px #e0e0e0;
diff --git a/src/umbraco.controls/FolderBrowser/FolderBrowser.cs b/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
similarity index 91%
rename from src/umbraco.controls/FolderBrowser/FolderBrowser.cs
rename to src/Umbraco.Web/UI/Controls/FolderBrowser.cs
index 0e0d190f74..d6086e29d0 100644
--- a/src/umbraco.controls/FolderBrowser/FolderBrowser.cs
+++ b/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
@@ -1,22 +1,19 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
 using System.Text;
-using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using ClientDependency.Core;
 using umbraco.BasePages;
 using umbraco.cms.businesslogic.media;
 
-namespace umbraco.uicontrols.FolderBrowser
+namespace Umbraco.Web.UI.Controls
 {
     [ClientDependency(ClientDependencyType.Css, "FolderBrowser/css/folderbrowser.css", "UmbracoClient")]
-    [ClientDependency(ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient")]
-    [ClientDependency(ClientDependencyType.Javascript, "ui/base2.js", "UmbracoClient")]
-    [ClientDependency(ClientDependencyType.Javascript, "ui/knockout.js", "UmbracoClient")]
-    [ClientDependency(ClientDependencyType.Javascript, "FolderBrowser/js/folderbrowser.js", "UmbracoClient")]
+    [ClientDependency(ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient", Priority = 1)]
+    [ClientDependency(ClientDependencyType.Javascript, "ui/base2.js", "UmbracoClient", Priority = 1)]
+    [ClientDependency(ClientDependencyType.Javascript, "ui/knockout.js", "UmbracoClient", Priority = 2)]
+    [ClientDependency(ClientDependencyType.Javascript, "FolderBrowser/js/folderbrowser.js", "UmbracoClient", Priority = 3)]
     [ToolboxData("<{0}:FolderBrowser runat=server></{0}:FolderBrowser>")]
     public class FolderBrowser : WebControl
     {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0ad3996c92..389093e44c 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -233,6 +233,7 @@
     <Compile Include="..\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
+    <Compile Include="UI\Controls\FolderBrowser.cs" />
     <Compile Include="umbraco.presentation\EnsureSystemPathsApplicationStartupHandler.cs" />
     <Compile Include="umbraco.presentation\install\steps\database.ascx.cs">
       <DependentUpon>database.ascx</DependentUpon>
diff --git a/src/umbraco.controls/umbraco.controls.csproj b/src/umbraco.controls/umbraco.controls.csproj
index 5cf9415626..23c677eaf5 100644
--- a/src/umbraco.controls/umbraco.controls.csproj
+++ b/src/umbraco.controls/umbraco.controls.csproj
@@ -86,7 +86,6 @@
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
     <Compile Include="DatePicker\DateTimePicker.cs" />
-    <Compile Include="FolderBrowser\FolderBrowser.cs" />
     <Compile Include="ProgressBar.cs" />
     <Compile Include="TreePicker\BaseTreePicker.cs" />
     <Compile Include="TreePicker\BaseTreePickerScripts.Designer.cs">
diff --git a/src/umbraco.editorControls/umbraco.editorControls.csproj b/src/umbraco.editorControls/umbraco.editorControls.csproj
index 2ba0d8f22e..44579c7d1d 100644
--- a/src/umbraco.editorControls/umbraco.editorControls.csproj
+++ b/src/umbraco.editorControls/umbraco.editorControls.csproj
@@ -164,10 +164,6 @@
     </ProjectReference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="umbraco, Version=1.0.4581.20076, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\umbraco.presentation\Bin\umbraco.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SolutionInfo.cs">