diff --git a/demo/MainWindow.cpp b/demo/MainWindow.cpp
index dd0506c..1d432a2 100644
--- a/demo/MainWindow.cpp
+++ b/demo/MainWindow.cpp
@@ -564,6 +564,7 @@ CMainWindow::CMainWindow(QWidget *parent) :
 	// CDockManager::setConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar, true);
 
 	// Now create the dock manager and its content
+	CDockManager::setConfigFlag(CDockManager::FloatingContainerHasWidgetIcon, true);
 	d->DockManager = new CDockManager(this);
 
 	connect(d->PerspectiveComboBox, SIGNAL(activated(const QString&)),
diff --git a/doc/ads_qt_marketplace_description.md b/doc/ads_qt_marketplace_description.md
index 7212afb..17aac83 100644
--- a/doc/ads_qt_marketplace_description.md
+++ b/doc/ads_qt_marketplace_description.md
@@ -14,18 +14,17 @@ styles as much as possible.
 
 ### Overview
 
-- [Advanced Docking System for Qt](#advanced-docking-system-for-qt)
-  - [Features](#features)
-    - [Overview](#overview)
-    - [Docking everywhere - no central widget](#docking-everywhere---no-central-widget)
-    - [Docking inside floating windows](#docking-inside-floating-windows)
-    - [Grouped dragging](#grouped-dragging)
-    - [Perspectives for fast switching of the complete main window layout](#perspectives-for-fast-switching-of-the-complete-main-window-layout)
-    - [Opaque and non-opaque splitter resizing](#opaque-and-non-opaque-splitter-resizing)
-    - [Opaque and non-opaque undocking](#opaque-and-non-opaque-undocking)
-    - [Tab-menu for easy handling of many tabbed dock widgets](#tab-menu-for-easy-handling-of-many-tabbed-dock-widgets)
-    - [Many different ways to detach dock widgets](#many-different-ways-to-detach-dock-widgets)
-    - [Supports deletion of dynamically created dock widgets](#supports-deletion-of-dynamically-created-dock-widgets)
+- [Features](#features)
+  - [Overview](#overview)
+  - [Docking everywhere - no central widget](#docking-everywhere---no-central-widget)
+  - [Docking inside floating windows](#docking-inside-floating-windows)
+  - [Grouped dragging](#grouped-dragging)
+  - [Perspectives for fast switching of the complete main window layout](#perspectives-for-fast-switching-of-the-complete-main-window-layout)
+  - [Opaque and non-opaque splitter resizing](#opaque-and-non-opaque-splitter-resizing)
+  - [Opaque and non-opaque undocking](#opaque-and-non-opaque-undocking)
+  - [Tab-menu for easy handling of many tabbed dock widgets](#tab-menu-for-easy-handling-of-many-tabbed-dock-widgets)
+  - [Many different ways to detach dock widgets](#many-different-ways-to-detach-dock-widgets)
+  - [Supports deletion of dynamically created dock widgets](#supports-deletion-of-dynamically-created-dock-widgets)
 
 ### Docking everywhere - no central widget
 
@@ -33,8 +32,8 @@ There is no central widget like in the Qt docking system. You can dock on every
 border of the main window or you can dock into each dock area - so you are
 free to dock almost everywhere.
 
-![Dropping widgets](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/preview-dragndrop.png)\
-\
+![Dropping widgets](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/preview-dragndrop.png)
+
 ![Dropping widgets](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/preview-dragndrop_dark.png)
 
 ### Docking inside floating windows
@@ -42,8 +41,8 @@ free to dock almost everywhere.
 There is no difference between the main window and a floating window. Docking
 into floating windows is supported.
 
-![Docking inside floating windows](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/floating-widget-dragndrop.png)\
-\
+![Docking inside floating windows](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/floating-widget-dragndrop.png)
+
 ![Docking inside floating windows](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/floating-widget-dragndrop_dark.png)
 
 ### Grouped dragging
@@ -52,8 +51,8 @@ When dragging the titlebar of a dock, all the tabs that are tabbed with it are
 going to be dragged. So you can move complete groups of tabbed widgets into
 a floating widget or from one dock area to another one.
 
-![Grouped dragging](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/grouped-dragging.gif)\
-\
+![Grouped dragging](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/grouped-dragging.gif)
+
 ![Grouped dragging](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/grouped-dragging_dark.png)
 
 ### Perspectives for fast switching of the complete main window layout
@@ -64,8 +63,8 @@ perspective to make your own custom perspective. Later you can simply
 select a perspective from the perspective list to quickly switch the complete 
 main window layout.
 
-![Perspective](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/perspectives.gif)\
-\
+![Perspective](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/perspectives.gif)
+
 ![Perspective](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/perspectives_dark.png)
 
 ### Opaque and non-opaque splitter resizing
diff --git a/doc/cfg_flag_FloatingContainerHasWidgetIcon_false.png b/doc/cfg_flag_FloatingContainerHasWidgetIcon_false.png
new file mode 100644
index 0000000..31b7d33
Binary files /dev/null and b/doc/cfg_flag_FloatingContainerHasWidgetIcon_false.png differ
diff --git a/doc/cfg_flag_FloatingContainerHasWidgetIcon_true.png b/doc/cfg_flag_FloatingContainerHasWidgetIcon_true.png
new file mode 100644
index 0000000..3723dda
Binary files /dev/null and b/doc/cfg_flag_FloatingContainerHasWidgetIcon_true.png differ
diff --git a/doc/user-guide.md b/doc/user-guide.md
index 7ef4ae9..855914c 100644
--- a/doc/user-guide.md
+++ b/doc/user-guide.md
@@ -21,6 +21,7 @@
   - [`DockAreaHideDisabledButtons`](#dockareahidedisabledbuttons)
   - [`DockAreaDynamicTabsMenuButtonVisibility`](#dockareadynamictabsmenubuttonvisibility)
   - [`FloatingContainerHasWidgetTitle`](#floatingcontainerhaswidgettitle)
+  - [`FloatingContainerHasWidgetIcon`](#floatingcontainerhaswidgeticon)
 
 ## Configuration Flags
 
@@ -259,9 +260,21 @@ If the tabs are not elided, the tabs menu button is hidden.
 
 ### `FloatingContainerHasWidgetTitle`
 
-If set (default), the Floating Widget window title reflects the title of the
+If set (default), the floating widget window title reflects the title of the
 current dock widget.
 
-![FloatingContainerHasWidgetTitle true](cfg_flag_FloatingContainerHasWidgetTitle_true.png) 
+![FloatingContainerHasWidgetTitle true](cfg_flag_FloatingContainerHasWidgetTitle_true.png)
 
-otherwise it displays application name as window title.
\ No newline at end of file
+otherwise it displays application name as window title.
+
+![FloatingContainerHasWidgetTitle false](cfg_flag_FloatingContainerHasWidgetTitle_false.png)
+
+### `FloatingContainerHasWidgetIcon`
+
+If set, the floating widget icon reflects the icon of the current dock widget
+
+![FloatingContainerHasWidgetIcon true](cfg_flag_FloatingContainerHasWidgetIcon_true.png)
+
+otherwise (default setting) it displays application icon.
+
+![FloatingContainerHasWidgetIcon false](cfg_flag_FloatingContainerHasWidgetIcon_false.png)