diff --git a/source/Components/AvalonDock.Themes.Aero/Theme.xaml b/source/Components/AvalonDock.Themes.Aero/Theme.xaml
index 1af8f08f..7e8d7d93 100644
--- a/source/Components/AvalonDock.Themes.Aero/Theme.xaml
+++ b/source/Components/AvalonDock.Themes.Aero/Theme.xaml
@@ -31,6 +31,7 @@
   <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter" />
   <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter" />
   <avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
+  <avalonDockConverters:OverlayWindowToVisibilityConverter x:Key="OverlayWindowToVisibilityConverter" />
 
   <!--DocumentPaneControlStyle-->
   <Style x:Key="AvalonDock_ThemeAero_DocumentPaneControlStyle"
@@ -829,9 +830,14 @@
                 </Grid.RowDefinitions>
                 <Image Grid.ColumnSpan="5"
                        Grid.RowSpan="5"
+                       Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource OverlayWindowToVisibilityConverter}, ConverterParameter=True}"
                        Source="Images/DockPaneLargeEmpty.PNG"
-                       Stretch="None" >
-                </Image>
+                       Stretch="None" />
+                <Image Grid.ColumnSpan="5"
+                       Grid.RowSpan="5"
+                       Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource OverlayWindowToVisibilityConverter}, ConverterParameter=False}"
+                       Source="Images/DockPaneEmpty.PNG"
+                       Stretch="None" />
                 <Border Name="PART_DocumentPaneFullDropTargetTop"
                         Grid.Column="2"
                         Grid.Row="1">
diff --git a/source/Components/AvalonDock.Themes.Metro/Theme.xaml b/source/Components/AvalonDock.Themes.Metro/Theme.xaml
index ff4b5734..cc03ec7d 100644
--- a/source/Components/AvalonDock.Themes.Metro/Theme.xaml
+++ b/source/Components/AvalonDock.Themes.Metro/Theme.xaml
@@ -29,6 +29,7 @@
   <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter" />
   <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter" />
   <avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
+  <avalonDockConverters:OverlayWindowToVisibilityConverter x:Key="OverlayWindowToVisibilityConverter" />
 
   <Style x:Key="AvalonDock_ThemeMetro_ToolButtonStyle"
          TargetType="ToggleButton">
@@ -851,9 +852,14 @@
                 </Grid.RowDefinitions>
                 <Image Grid.ColumnSpan="5"
                        Grid.RowSpan="5"
+                       Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource OverlayWindowToVisibilityConverter}, ConverterParameter=True}"
                        Source="Images/DockPaneLargeEmpty.PNG"
-                       Stretch="None" >
-                </Image>
+                       Stretch="None" />
+                <Image Grid.ColumnSpan="5"
+                       Grid.RowSpan="5"
+                       Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource OverlayWindowToVisibilityConverter}, ConverterParameter=False}"
+                       Source="Images/DockPaneEmpty.PNG"
+                       Stretch="None" />
                 <Border Name="PART_DocumentPaneFullDropTargetTop"
                         Grid.Column="2"
                         Grid.Row="1">
diff --git a/source/Components/AvalonDock.Themes.VS2010/Theme.xaml b/source/Components/AvalonDock.Themes.VS2010/Theme.xaml
index 5a7a2ae8..259d45a0 100644
--- a/source/Components/AvalonDock.Themes.VS2010/Theme.xaml
+++ b/source/Components/AvalonDock.Themes.VS2010/Theme.xaml
@@ -29,6 +29,7 @@
   <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter" />
   <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter" />
   <avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
+  <avalonDockConverters:OverlayWindowToVisibilityConverter x:Key="OverlayWindowToVisibilityConverter" />
 
 
   <Style x:Key="AvalonDock_ThemeVS2010_ToolButtonStyle"
@@ -947,9 +948,14 @@
                 </Grid.RowDefinitions>
                 <Image Grid.ColumnSpan="5"
                        Grid.RowSpan="5"
+                       Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource OverlayWindowToVisibilityConverter}, ConverterParameter=True}"
                        Source="Images/DockPaneLargeEmpty.PNG"
-                       Stretch="None" >
-                </Image>
+                       Stretch="None" />
+                <Image Grid.ColumnSpan="5"
+                       Grid.RowSpan="5"
+                       Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource OverlayWindowToVisibilityConverter}, ConverterParameter=False}"
+                       Source="Images/DockPaneEmpty.PNG"
+                       Stretch="None" />
                 <Border Name="PART_DocumentPaneFullDropTargetTop"
                         Grid.Column="2"
                         Grid.Row="1">
diff --git a/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
index 745b4025..f91cd372 100644
--- a/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
+++ b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
@@ -1095,16 +1095,16 @@
                                       >
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition />
-                                        <ColumnDefinition />
-                                        <ColumnDefinition />
-                                        <ColumnDefinition />
+                                        <ColumnDefinition MinWidth="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonWidthKey}}" />
+                                        <ColumnDefinition MinWidth="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonWidthKey}}" />
+                                        <ColumnDefinition MinWidth="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonWidthKey}}" />
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <Grid.RowDefinitions>
                                         <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
+                                        <RowDefinition MinHeight="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonHeightKey}}" />
+                                        <RowDefinition MinHeight="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonHeightKey}}" />
+                                        <RowDefinition MinHeight="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonHeightKey}}" />
                                         <RowDefinition />
                                     </Grid.RowDefinitions>
 
diff --git a/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs b/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs
index 3f85ddf5..a978843a 100644
--- a/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs
+++ b/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs
@@ -269,7 +269,10 @@ protected override void Drop(LayoutDocumentFloatingWindow floatingWindow)
 				#endregion DropTargetType.DocumentPaneDockInside
 			}
 
-			documentActive.IsActive = true;
+			if (documentActive != null)
+			{
+				documentActive.IsActive = true;
+			}
 
 			base.Drop(floatingWindow);
 		}
diff --git a/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
index f587facb..bca07d07 100644
--- a/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
@@ -109,7 +109,12 @@ protected override IntPtr FilterMessage(IntPtr hwnd, int msg, IntPtr wParam, Int
 				case Win32Helper.WM_NCLBUTTONDOWN: //Left button down on title -> start dragging over docking manager
 					if (wParam.ToInt32() == Win32Helper.HT_CAPTION)
 					{
-						_model.Descendents().OfType<LayoutDocumentPane>().First(p => p.ChildrenCount > 0 && p.SelectedContent != null).SelectedContent.IsActive = true;
+						LayoutDocumentPane layoutDocumentPane = _model.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault(p => p.ChildrenCount > 0 && p.SelectedContent != null);
+						if (layoutDocumentPane != null)
+						{
+							layoutDocumentPane.SelectedContent.IsActive = true;
+						}
+
 						handled = true;
 					}
 					break;
diff --git a/source/Components/AvalonDock/Controls/OverlayWindow.cs b/source/Components/AvalonDock/Controls/OverlayWindow.cs
index d082c297..9904d2d8 100644
--- a/source/Components/AvalonDock/Controls/OverlayWindow.cs
+++ b/source/Components/AvalonDock/Controls/OverlayWindow.cs
@@ -94,6 +94,15 @@ internal OverlayWindow(IOverlayWindowHost host)
 
 		#endregion
 
+		#region Properties.
+
+		/// <summary>
+		/// Gets whether the window is hosted in a floating window.
+		/// </summary>
+		public bool IsHostedInFloatingWindow => _host is LayoutDocumentFloatingWindowControl || _host is LayoutAnchorableFloatingWindowControl;
+
+		#endregion
+
 		#region Overrides
 
 		public override void OnApplyTemplate()
@@ -601,7 +610,17 @@ void IOverlayWindow.DragEnter(IDropArea area)
 								_documentPaneFullDropTargetBottom.Visibility = Visibility.Visible;
 							}
 
-							if (parentDocumentPaneGroup != null &&
+							if (layoutDocumentPane.IsHostedInFloatingWindow)
+							{
+								// Hide outer buttons if drop area is a document floating window host
+								// since these 4 drop area buttons are available over the DockingManager ONLY.
+								_documentPaneDropTargetBottomAsAnchorablePane.Visibility = System.Windows.Visibility.Collapsed;
+								_documentPaneDropTargetLeftAsAnchorablePane.Visibility = System.Windows.Visibility.Collapsed;
+								_documentPaneDropTargetRightAsAnchorablePane.Visibility = System.Windows.Visibility.Collapsed;
+								_documentPaneDropTargetTopAsAnchorablePane.Visibility = System.Windows.Visibility.Collapsed;
+							}
+
+							else if (parentDocumentPaneGroup != null &&
 								parentDocumentPaneGroup.Children.Where(c => c.IsVisible).Count() > 1)
 							{
 								int indexOfDocumentPane = parentDocumentPaneGroup.Children.Where(ch => ch.IsVisible).ToList().IndexOf(layoutDocumentPane);
@@ -649,6 +668,7 @@ void IOverlayWindow.DragEnter(IDropArea area)
 						}
 						else
 						{
+							// Showing a drop target structure with 5 centered star like buttons.
 							areaElement = _gridDocumentPaneDropTargets;
 							var dropAreaDocumentPaneGroup = area as DropArea<LayoutDocumentPaneControl>;
 							var layoutDocumentPane = dropAreaDocumentPaneGroup.AreaElement.Model as LayoutDocumentPane;
diff --git a/source/Components/AvalonDock/Converters/OverlayWindowToVisibilityConverter.cs b/source/Components/AvalonDock/Converters/OverlayWindowToVisibilityConverter.cs
new file mode 100644
index 00000000..2804c1a0
--- /dev/null
+++ b/source/Components/AvalonDock/Converters/OverlayWindowToVisibilityConverter.cs
@@ -0,0 +1,55 @@
+/************************************************************************
+   AvalonDock
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
+ ************************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+using AvalonDock.Controls;
+using AvalonDock.Layout;
+
+namespace AvalonDock.Converters
+{
+	/// <summary>
+	/// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutItem"/>
+	/// and ensures that other essential properties (Root, Root.Manager) are available.
+	///
+	/// Returns null or Binding.DoNothing otherwise.
+	/// </summary>
+	public class OverlayWindowToVisibilityConverter : IValueConverter
+	{
+		/// <summary>
+		/// Converts a <see cref="OverlayWindow"/> into a <see cref="Visibility"/>.
+		/// </summary>
+		/// <param name="value">The value produced by the binding source.</param>
+		/// <param name="targetType">The type of the binding target property.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>A converted value.</returns>
+		public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			bool isHostedInFloatingWindow = value is OverlayWindow overlayWindow && overlayWindow.IsHostedInFloatingWindow;
+			if (parameter == null || !bool.TryParse(parameter.ToString(), out bool isLarge))
+			{
+				isLarge = false;
+			}
+
+			return isHostedInFloatingWindow && isLarge ? Visibility.Hidden : Visibility.Visible;
+		}
+
+		/// <summary>
+		/// Method is not implemented and will raise <see cref="System.NotSupportedException"/> when called.
+		/// </summary>
+		/// <param name="value">The value that is produced by the binding target.</param>
+		/// <param name="targetType">The type to convert to.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns><see cref="System.NotSupportedException"/></returns>
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) => throw new NotSupportedException();
+	}
+}