diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MediaItemElementDriver.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MediaItemElementDriver.cs
index 6261d4814..f1f71e0bd 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MediaItemElementDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MediaItemElementDriver.cs
@@ -41,7 +41,7 @@ namespace Orchard.Layouts.Drivers {
 
         protected override void OnDisplaying(MediaItem element, ElementDisplayContext context) {
             var contentItemIds = RemoveCurrentContentItemId(element.MediaItemIds, context.Content.Id);
-            var displayType = context.DisplayType != "Design" ? element.DisplayType : "Design";
+            var displayType = context.DisplayType != "Design" ? element.DisplayType : "Thumbnail";
             var contentItems = GetContentItems(contentItemIds).ToArray();
             var contentItemShapes = contentItems.Select(x => _contentManager.BuildDisplay(x, displayType)).ToArray();
 
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
index ace8f4b77..8f354889d 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
@@ -279,7 +279,6 @@
     <Content Include="Views\BlueprintAdmin\Create.cshtml" />
     <Content Include="Views\ElementBlueprintEditor.cshtml" />
     <Content Include="Views\BlueprintAdmin\Properties.cshtml" />
-    <Content Include="Views\Media.Design.cshtml" />
     <Content Include="Views\EditorTemplates\Elements.Paragraph.cshtml" />
     <Content Include="Views\Elements\Paragraph.cshtml" />
     <Content Include="Views\EditorTemplates\Elements.Image.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Media.Design.cshtml b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Media.Design.cshtml
deleted file mode 100644
index 3338a0783..000000000
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Media.Design.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="media-element">
-    @Display(Model.Content)
-</div>
\ No newline at end of file