diff --git a/ApplicationExeCode/Resources/ResInsight.qrc b/ApplicationExeCode/Resources/ResInsight.qrc
index b260b936c8..43b65ba1ff 100644
--- a/ApplicationExeCode/Resources/ResInsight.qrc
+++ b/ApplicationExeCode/Resources/ResInsight.qrc
@@ -270,6 +270,7 @@
         <file>AppendPrevCurve.png</file>
         <file>CheckOverlay16x16.png</file>
 	    <file>Link3DandPlots.png</file>
+		<file>info.png</file>
     </qresource>
     <qresource prefix="/Shader">
         <file>fs_CellFace.glsl</file>
diff --git a/ApplicationExeCode/Resources/info.png b/ApplicationExeCode/Resources/info.png
new file mode 100644
index 0000000000..f3b590d116
Binary files /dev/null and b/ApplicationExeCode/Resources/info.png differ
diff --git a/ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp b/ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp
index a06689172c..cc9ba6fc80 100644
--- a/ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp
+++ b/ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp
@@ -33,79 +33,100 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RiuDockWidgetTools::projectTreeName()
+ads::CDockWidget* RiuDockWidgetTools::createDockWidget( QString title, QString dockName, QWidget* parent )
 {
-    return "dockProjectTree";
+    ads::CDockWidget* dockWidget = new ads::CDockWidget( title, parent );
+    dockWidget->setObjectName( dockName );
+    dockWidget->setToggleViewActionMode( ads::CDockWidget::ActionModeShow );
+    dockWidget->setIcon( RiuDockWidgetTools::dockIcon( dockName ) );
+
+    return dockWidget;
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RiuDockWidgetTools::propertyEditorName()
+QString RiuDockWidgetTools::mainPlotWindowName()
 {
-    return "dockpropertyEditor";
+    return "dockPlotWindow_mainPlotWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RiuDockWidgetTools::resultInfoName()
+QString RiuDockWidgetTools::main3DWindowName()
 {
-    return "dockResultInfo";
+    return "dock3DWindow_mainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RiuDockWidgetTools::processMonitorName()
+QString RiuDockWidgetTools::mainWindowPropertyEditorName()
 {
-    return "dockProcessMonitor";
+    return "dockPropertyEditor_mainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RiuDockWidgetTools::resultPlotName()
+QString RiuDockWidgetTools::mainWindowResultInfoName()
 {
-    return "dockResultPlot";
+    return "dockResultInfo_mainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RiuDockWidgetTools::relPermPlotName()
+QString RiuDockWidgetTools::mainWindowProcessMonitorName()
 {
-    return "dockRelPermPlot";
+    return "dockProcessMonitor_mainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RiuDockWidgetTools::pvtPlotName()
+QString RiuDockWidgetTools::mainWindowResultPlotName()
 {
-    return "dockPvtPlot";
+    return "dockResultPlot_mainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RiuDockWidgetTools::mohrsCirclePlotName()
+QString RiuDockWidgetTools::mainWindowRelPermPlotName()
 {
-    return "dockMohrsCirclePlot";
+    return "dockRelPermPlot_mainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RiuDockWidgetTools::undoStackName()
+QString RiuDockWidgetTools::mainWindowPvtPlotName()
 {
-    return "dockUndoStack";
+    return "dockPvtPlot_mainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RiuDockWidgetTools::summaryPlotManagerName()
+QString RiuDockWidgetTools::mainWindowMohrsCirclePlotName()
+{
+    return "dockMohrsCirclePlot_mainWindow";
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiuDockWidgetTools::mainWindowUndoStackName()
+{
+    return "dockUndoStack_mainWindow";
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiuDockWidgetTools::plotMainWindowPlotManagerName()
 {
     return "dockSummaryPlotManager";
 }
@@ -115,7 +136,7 @@ QString RiuDockWidgetTools::summaryPlotManagerName()
 //--------------------------------------------------------------------------------------------------
 QString RiuDockWidgetTools::mainWindowProjectTreeName()
 {
-    return "mainWindow_dockProjectTree";
+    return "dockProjectTree_mainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -123,7 +144,7 @@ QString RiuDockWidgetTools::mainWindowProjectTreeName()
 //--------------------------------------------------------------------------------------------------
 QString RiuDockWidgetTools::mainWindowDataSourceTreeName()
 {
-    return "mainWindow_dockDataSourceTree";
+    return "dockDataSourceTree_mainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -131,7 +152,7 @@ QString RiuDockWidgetTools::mainWindowDataSourceTreeName()
 //--------------------------------------------------------------------------------------------------
 QString RiuDockWidgetTools::mainWindowScriptsTreeName()
 {
-    return "mainWindow_dockScriptsTree";
+    return "dockScriptsTree_mainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -139,7 +160,7 @@ QString RiuDockWidgetTools::mainWindowScriptsTreeName()
 //--------------------------------------------------------------------------------------------------
 QString RiuDockWidgetTools::plotMainWindowDataSourceTreeName()
 {
-    return "plotMainWindow_dockDataSourceTree";
+    return "dockDataSourceTree_plotMainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -147,7 +168,7 @@ QString RiuDockWidgetTools::plotMainWindowDataSourceTreeName()
 //--------------------------------------------------------------------------------------------------
 QString RiuDockWidgetTools::plotMainWindowPlotsTreeName()
 {
-    return "plotMainWindow_dockPlotsTree";
+    return "dockPlotsTree_plotMainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -155,7 +176,7 @@ QString RiuDockWidgetTools::plotMainWindowPlotsTreeName()
 //--------------------------------------------------------------------------------------------------
 QString RiuDockWidgetTools::plotMainWindowTemplateTreeName()
 {
-    return "plotMainWindow_dockTemplatesTree";
+    return "dockTemplatesTree_plotMainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -163,7 +184,7 @@ QString RiuDockWidgetTools::plotMainWindowTemplateTreeName()
 //--------------------------------------------------------------------------------------------------
 QString RiuDockWidgetTools::plotMainWindowScriptsTreeName()
 {
-    return "plotMainWindow_dockScriptsTree";
+    return "dockScriptsTree_plotMainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -171,7 +192,7 @@ QString RiuDockWidgetTools::plotMainWindowScriptsTreeName()
 //--------------------------------------------------------------------------------------------------
 QString RiuDockWidgetTools::plotMainWindowPropertyEditorName()
 {
-    return "plotMainWindow_dockPropertyEditor";
+    return "dockPropertyEditor_plotMainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -179,7 +200,7 @@ QString RiuDockWidgetTools::plotMainWindowPropertyEditorName()
 //--------------------------------------------------------------------------------------------------
 QString RiuDockWidgetTools::plotMainWindowMessagesName()
 {
-    return "plotMainWindow_dockMessages";
+    return "dockMessages_plotMainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -187,15 +208,15 @@ QString RiuDockWidgetTools::plotMainWindowMessagesName()
 //--------------------------------------------------------------------------------------------------
 QString RiuDockWidgetTools::plotMainWindowUndoStackName()
 {
-    return "plotMainWindow_dockUndoStack";
+    return "dockUndoStack_plotMainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RiuDockWidgetTools::messagesName()
+QString RiuDockWidgetTools::mainWindowMessagesName()
 {
-    return "dockMessages";
+    return "dockMessages_mainWindow";
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -273,6 +294,59 @@ void RiuDockWidgetTools::showDockWidget( const ads::CDockManager* dockManager, c
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QIcon RiuDockWidgetTools::dockIcon( const QString dockWidgetName )
+{
+    if ( dockWidgetName == plotMainWindowPlotsTreeName() )
+        return QIcon( ":/plots.svg" );
+    else if ( dockWidgetName == plotMainWindowDataSourceTreeName() )
+        return QIcon( ":/data-sources.svg" );
+    else if ( dockWidgetName == plotMainWindowTemplateTreeName() )
+        return QIcon( ":/SummaryTemplate16x16.png" );
+    else if ( dockWidgetName == plotMainWindowScriptsTreeName() )
+        return QIcon( ":/scripts.svg" );
+    else if ( dockWidgetName == plotMainWindowPropertyEditorName() )
+        return QIcon( ":/property-editor.svg" );
+    else if ( dockWidgetName == plotMainWindowMessagesName() )
+        return QIcon( ":/messages.svg" );
+    else if ( dockWidgetName == plotMainWindowUndoStackName() )
+        return QIcon( ":/undo-stack.svg" );
+    else if ( dockWidgetName == plotMainWindowPlotManagerName() )
+        return QIcon( ":/plot-manager.svg" );
+    else if ( dockWidgetName == mainWindowPropertyEditorName() )
+        return QIcon( ":/property-editor.svg" );
+    else if ( dockWidgetName == mainWindowResultInfoName() )
+        return QIcon( ":/info.png" );
+    else if ( dockWidgetName == mainWindowProcessMonitorName() )
+        return QIcon( ":/view.svg" );
+    else if ( dockWidgetName == mainWindowResultPlotName() )
+        return QIcon( ":/graph.svg" );
+    else if ( dockWidgetName == mainWindowRelPermPlotName() )
+        return QIcon( ":/graph.svg" );
+    else if ( dockWidgetName == mainWindowPvtPlotName() )
+        return QIcon( ":/graph.svg" );
+    else if ( dockWidgetName == mainWindowMessagesName() )
+        return QIcon( ":/messages.svg" );
+    else if ( dockWidgetName == mainWindowMohrsCirclePlotName() )
+        return QIcon( ":/graph.svg" );
+    else if ( dockWidgetName == mainWindowUndoStackName() )
+        return QIcon( ":/undo-stack.svg" );
+    else if ( dockWidgetName == mainWindowProjectTreeName() )
+        return QIcon( ":/standard.svg" );
+    else if ( dockWidgetName == mainWindowDataSourceTreeName() )
+        return QIcon( ":/data-sources.svg" );
+    else if ( dockWidgetName == mainWindowScriptsTreeName() )
+        return QIcon( ":/scripts.svg" );
+    else if ( dockWidgetName == mainPlotWindowName() )
+        return QIcon( ":/window-management.svg" );
+    else if ( dockWidgetName == main3DWindowName() )
+        return QIcon( ":/window-management.svg" );
+
+    return QIcon( ":/view.svg" );
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -304,39 +378,40 @@ QByteArray RiuDockWidgetTools::defaultEclipseDockState()
     // Clipboard" from the Windows menu and paste the exported text into this file to update the default states.
 
     static const char stateData[] =
-        { '\x00', '\x00', '\x05', '\x2e', '\x78', '\xda', '\x95', '\x54', '\x4d', '\x4f', '\x02', '\x31', '\x10',
-          '\xbd', '\xfb', '\x2b', '\x9a', '\xbd', '\x23', '\xfb', '\x85', '\x42', '\xb2', '\x40', '\x08', '\x48',
-          '\xe2', '\x01', '\x45', '\x96', '\x8f', '\xa3', '\xa9', '\xbb', '\x23', '\x56', '\xbb', '\x2d', '\x99',
-          '\x16', '\x50', '\xe3', '\x8f', '\xb7', '\x0b', '\x66', '\x05', '\x2c', '\x8b', '\x9c', '\x76', '\x3b',
-          '\xef', '\xbd', '\x99', '\x79', '\xd3', '\x49', '\xa3', '\xf6', '\x7b', '\xc6', '\xc9', '\x0a', '\x50',
-          '\x31', '\x29', '\x9a', '\x8e', '\x77', '\xe9', '\x3a', '\x04', '\x44', '\x22', '\x53', '\x26', '\xe6',
-          '\x4d', '\x67', '\x32', '\xee', '\x57', '\xea', '\x4e', '\xbb', '\x15', '\x3d', '\xe8', '\x4e', '\xba',
-          '\xa2', '\x22', '\x81', '\xb4', '\x27', '\x93', '\x37', '\x83', '\xc5', '\x1f', '\x4a', '\x43', '\x46',
-          '\xa6', '\x85', '\xd0', '\x21', '\x13', '\x05', '\xb8', '\x7b', '\xee', '\x4a', '\xa1', '\x29', '\x13',
-          '\x26', '\xb2', '\x3d', '\x82', '\xd0', '\x48', '\xf9', '\x8c', '\xa5', '\x73', '\xd0', '\x4d', '\x27',
-          '\xe8', '\x91', '\x29', '\x83', '\xb5', '\x72', '\x5a', '\x51', '\x41', '\x24', '\x7d', '\x2e', '\xa9',
-          '\xde', '\x54', '\x76', '\x4d', '\x3c', '\x5e', '\x70', '\xa6', '\xb5', '\x09', '\xdf', '\x23', '\x33',
-          '\x62', '\x83', '\xe4', '\x99', '\xbf', '\xf2', '\xcc', '\x4b', '\x61', '\x52', '\xf8', '\x47', '\x39',
-          '\x95', '\x3d', '\x4e', '\x07', '\x81', '\x92', '\x31', '\x7d', '\x32', '\x7d', '\x04', '\x06', '\x58',
-          '\x22', '\x42', '\x0e', '\x65', '\xa6', '\xe6', '\x8c', '\x89', '\x54', '\xae', '\x1f', '\x53', '\x63',
-          '\x6a', '\x88', '\xf2', '\x15', '\x12', '\x3d', '\x46', '\x00', '\xa3', '\xd9', '\xb6', '\x49', '\xee',
-          '\x68', '\x06', '\xa5', '\x4c', '\xd2', '\xe5', '\x52', '\x41', '\x9a', '\x37', '\x5c', '\x2d', '\x57',
-          '\xf5', '\xa8', '\xa6', '\xb1', '\x5c', '\x62', '\x02', '\x67', '\x0a', '\xe3', '\x04', '\xd9', '\x42',
-          '\x2b', '\x8b', '\xaa', '\x9a', '\x3b', '\xdb', '\xf3', '\xe7', '\xed', '\xf8', '\xcb', '\xb5', '\x0b',
-          '\x94', '\x0b', '\x40', '\xfd', '\x71', '\x93', '\x32', '\x2d', '\xf1', '\xd0', '\x97', '\x85', '\x61',
-          '\x2d', '\x10', '\xb3', '\x4f', '\x50', '\xad', '\xeb', '\x46', '\x8d', '\x84', '\xb5', '\x1a', '\x89',
-          '\xaa', '\xdb', '\xb3', '\xf9', '\xfe', '\x0c', '\xff', '\xec', '\x6b', '\xd8', '\x6d', '\xb3', '\x58',
-          '\x04', '\x73', '\xfb', '\x74', '\xbe', '\x01', '\x0f', '\xda', '\xfc', '\x65', '\x58', '\x9b', '\x3b',
-          '\xb1', '\x25', '\x81', '\x53', '\x3a', '\xa1', '\x11', '\xa8', '\x25', '\xd7', '\xb7', '\xe2', '\x59',
-          '\xda', '\xa6', '\xb3', '\x83', '\x9e', '\x1a', '\x7d', '\x68', '\x4d', '\x3c', '\xe4', '\x52', '\x1f',
-          '\x4f', '\xbc', '\x41', '\x4b', '\x36', '\x21', '\x67', '\x0e', '\xe4', '\x0b', '\xaa', '\x2e', '\xc3',
-          '\x84', '\xc3', '\x3e', '\xdd', '\xb3', '\xd2', '\x47', '\xc0', '\x87', '\x80', '\xd9', '\x7f', '\x32',
-          '\x0f', '\x57', '\xb6', '\x06', '\xfe', '\x3a', '\xf3', '\x0f', '\x9c', '\x0d', '\x40', '\x29', '\x3a',
-          '\x07', '\x65', '\xf3', '\x55', '\x60', '\xa7', '\x6a', '\xa3', '\x4c', '\x0c', '\x75', '\x20', '\xc5',
-          '\xa9', '\xb5', '\x0b', '\x6a', '\x1e', '\xf1', '\x42', '\xd7', '\x27', '\x61', '\xe8', '\xda', '\x77',
-          '\x6f', '\x13', '\x69', '\xd4', '\x7d', '\xe2', '\x5f', '\xd5', '\x4b', '\x18', '\x41', '\xd8', '\x20',
-          '\xbe', '\xef', '\xda', '\x17', '\xb8', '\x5a', '\x3c', '\x42', '\xe6', '\xff', '\xc8', '\x6b', '\xd7',
-          '\xba', '\xf8', '\x06', '\x84', '\x98', '\xbb', '\x1d' };
+        { '\x00', '\x00', '\x06', '\x13', '\x78', '\xda', '\x95', '\x54', '\xdf', '\x4f', '\xc2', '\x30', '\x10',
+          '\x7e', '\xf7', '\xaf', '\x68', '\xf6', '\xae', '\x30', '\xc6', '\x94', '\x25', '\x80', '\x31', '\xa0',
+          '\x89', '\x0f', '\x28', '\x3a', '\xd0', '\x47', '\x53', '\xbb', '\x13', '\xab', '\x5d', '\x4b', '\xae',
+          '\x07', '\xfe', '\x88', '\x7f', '\xbc', '\x1d', '\x18', '\x12', '\xa0', '\xdb', '\xe4', '\x69', '\xdd',
+          '\xdd', '\xf7', '\xf5', '\xfb', '\xae', '\xbd', '\x6b', '\xf7', '\xfc', '\x33', '\x57', '\x6c', '\x09',
+          '\x68', '\xa5', '\xd1', '\xbd', '\x20', '\x3c', '\x69', '\x06', '\x0c', '\xb4', '\x30', '\x99', '\xd4',
+          '\xb3', '\x5e', '\x30', '\x9d', '\x5c', '\x1d', '\x77', '\x82', '\xf3', '\x7e', '\xf7', '\x8e', '\x2e',
+          '\xb2', '\x25', '\xd7', '\x02', '\xb2', '\xa1', '\x11', '\xef', '\x2e', '\x97', '\x7e', '\x59', '\x82',
+          '\x9c', '\x3d', '\x6c', '\x88', '\x01', '\x9b', '\x5a', '\xc0', '\xcd', '\x7f', '\x2b', '\x60', '\x03',
+          '\xa3', '\x89', '\x4b', '\xed', '\x22', '\xab', '\xf4', '\x00', '\x34', '\x21', '\x57', '\x8f', '\x32',
+          '\x9b', '\x01', '\xf5', '\x82', '\xcc', '\xed', '\x13', '\x0d', '\x1f', '\xa5', '\xce', '\xcc', '\xc7',
+          '\x53', '\xee', '\x70', '\xeb', '\x65', '\xd0', '\xef', '\x6e', '\x78', '\xec', '\x4a', '\x19', '\x4e',
+          '\x2b', '\x23', '\x4d', '\x17', '\x4f', '\xe7', '\x4a', '\x12', '\xb9', '\xf0', '\x2d', '\x4a', '\xb7',
+          '\x97', '\xcb', '\x14', '\x42', '\x3f', '\x85', '\xd0', '\x42', '\x53', '\x21', '\x59', '\x86', '\x39',
+          '\xde', '\xc2', '\x5c', '\x20', '\x70', '\x36', '\xe1', '\xcf', '\xce', '\x56', '\xe4', '\x12', '\x0b',
+          '\x44', '\xd0', '\x7f', '\x86', '\xc6', '\x68', '\xde', '\x40', '\xd0', '\x04', '\x01', '\xb6', '\x3d',
+          '\xad', '\x5d', '\xb3', '\x1b', '\x9e', '\x43', '\x25', '\x92', '\x0d', '\x94', '\xb1', '\x90', '\x15',
+          '\x86', '\x1b', '\x1e', '\xd6', '\x90', '\x13', '\x4f', '\xcd', '\x02', '\x05', '\x1c', '\x48', '\x4c',
+          '\x05', '\xca', '\x39', '\xd9', '\x6a', '\x56', '\xa3', '\xa8', '\x6c', '\xab', '\xbe', '\x70', '\xbf',
+          '\xbe', '\x39', '\x20', '\x7d', '\x5d', '\x66', '\x92', '\x0c', '\xd6', '\x97', '\x58', '\x02', '\xf6',
+          '\xca', '\xa6', '\xf2', '\x1b', '\x6c', '\xff', '\xac', '\xd3', '\x62', '\xed', '\xd3', '\x0e', '\xeb',
+          '\x36', '\xd6', '\xff', '\xee', '\xfb', '\x77', '\x25', '\x07', '\x5f', '\xce', '\xae', '\x79', '\x5f',
+          '\xb7', '\xb8', '\x16', '\xe1', '\xb3', '\x15', '\xd6', '\x53', '\x80', '\x97', '\xe0', '\xb5', '\x5e',
+          '\xd3', '\x59', '\x51', '\xb5', '\xb1', '\x7b', '\xb0', '\x0b', '\x45', '\xd7', '\xfa', '\xc5', '\xd4',
+          '\x9c', '\xa8', '\x1f', '\x58', '\x77', '\x89', '\x6d', '\xaf', '\xdc', '\x58', '\x19', '\xfa', '\x97',
+          '\xdc', '\x2e', '\xb0', '\xa6', '\xd3', '\x46', '\xe6', '\x15', '\xed', '\x40', '\xa2', '\x50', '\x50',
+          '\xca', '\x0c', '\xbd', '\xcc', '\x7b', '\x50', '\x63', '\xc0', '\xfc', '\x40', '\xbd', '\xf1', '\xb2',
+          '\xc6', '\xe1', '\xfe', '\x81', '\xec', '\x4e', '\xed', '\x08', '\xac', '\xe5', '\x33', '\xb0', '\x35',
+          '\xc7', '\xe1', '\x83', '\xd5', '\x99', '\x43', '\x23', '\x1c', '\x6b', '\x64', '\x74', '\xf5', '\x08',
+          '\xec', '\x11', '\xa7', '\x0e', '\x94', '\x12', '\x17', '\xef', '\xff', '\x1c', '\x9b', '\x28', '\x89',
+          '\x59', '\xd8', '\x4a', '\x9a', '\xac', '\x1d', '\x97', '\xcc', '\xce', '\x2a', '\xd2', '\x49', '\x4e',
+          '\x59', '\x14', '\xb7', '\x2b', '\x10', '\x51', '\x92', '\xb0', '\x56', '\x18', '\xc7', '\x5e', '\x48',
+          '\x63', '\xf3', '\xb4', '\xba', '\x75', '\xc9', '\x93', '\xde', '\x3f', '\xfa', '\x05', '\x48', '\x0b',
+          '\x16', '\x15' };
 
     QByteArray retVal( stateData, sizeof( stateData ) );
 
@@ -349,39 +424,40 @@ QByteArray RiuDockWidgetTools::defaultEclipseDockState()
 QByteArray RiuDockWidgetTools::defaultGeoMechDockState()
 {
     static const char stateData[] =
-        { '\x00', '\x00', '\x05', '\x2e', '\x78', '\xda', '\x95', '\x54', '\x4d', '\x53', '\xc2', '\x30', '\x10',
-          '\xbd', '\xfb', '\x2b', '\x32', '\xbd', '\x2b', '\xfd', '\x42', '\x61', '\x06', '\x70', '\x1c', '\x90',
-          '\x19', '\x0f', '\x28', '\x5a', '\x84', '\xa3', '\x13', '\xdb', '\x15', '\xa3', '\x69', '\xc2', '\x6c',
-          '\x02', '\xa8', '\xe3', '\x8f', '\x77', '\x0b', '\x4e', '\x05', '\x0c', '\x45', '\x4f', '\x4d', '\xf6',
-          '\xbd', '\xb7', '\xd9', '\xb7', '\xd9', '\xa6', '\x75', '\xfe', '\x96', '\x4b', '\xb6', '\x00', '\x34',
-          '\x42', '\xab', '\xb6', '\x17', '\x9c', '\xf8', '\x1e', '\x03', '\x95', '\xea', '\x4c', '\xa8', '\x69',
-          '\xdb', '\xbb', '\x1f', '\xf5', '\x8f', '\x1b', '\xde', '\x79', '\xa7', '\x75', '\x6b', '\x2f', '\xb2',
-          '\x05', '\x57', '\x29', '\x64', '\x3d', '\x9d', '\xbe', '\x12', '\x96', '\xbc', '\x1b', '\x0b', '\x39',
-          '\x1b', '\x97', '\x42', '\x8f', '\xdd', '\x1b', '\xc0', '\xcd', '\x7d', '\x57', '\x2b', '\xcb', '\x85',
-          '\xa2', '\xc8', '\x7a', '\x0b', '\xca', '\x22', '\x97', '\x13', '\x91', '\x4d', '\xc1', '\xb6', '\xbd',
-          '\xa8', '\xc7', '\xc6', '\x02', '\x96', '\xc6', '\xeb', '\xb4', '\x4a', '\x22', '\xeb', '\x4b', '\xcd',
-          '\xed', '\xea', '\x64', '\x9f', '\xe2', '\xc9', '\x4c', '\x0a', '\x6b', '\x29', '\x7c', '\x83', '\x82',
-          '\xc4', '\x84', '\x14', '\x99', '\x3f', '\x8b', '\xcc', '\x73', '\x45', '\x29', '\xc2', '\xbd', '\x9c',
-          '\xe3', '\x2d', '\xce', '\x05', '\x02', '\x67', '\x23', '\xfe', '\x48', '\x75', '\x44', '\x04', '\xcc',
-          '\x11', '\xa1', '\x80', '\x72', '\x3a', '\x73', '\x22', '\x54', '\xa6', '\x97', '\x0f', '\x19', '\x99',
-          '\x1a', '\xa2', '\x7e', '\x81', '\xd4', '\x8e', '\x10', '\x80', '\x34', '\xeb', '\x32', '\xd9', '\x35',
-          '\xcf', '\xa1', '\x92', '\xc9', '\xba', '\x52', '\x1b', '\xc8', '\x8a', '\x82', '\x6b', '\xd5', '\xaa',
-          '\x1e', '\xb7', '\x3c', '\xd1', '\x73', '\x4c', '\xe1', '\x9f', '\xc2', '\x24', '\x45', '\x31', '\xb3',
-          '\xc6', '\xa1', '\xaa', '\x15', '\xce', '\xb6', '\xfc', '\x05', '\x1b', '\xfe', '\x0a', '\xed', '\x0c',
-          '\xf5', '\x0c', '\xd0', '\xbe', '\x5f', '\x66', '\xc2', '\x6a', '\xdc', '\xf5', '\xe5', '\x60', '\x38',
-          '\x0f', '\x48', '\xc4', '\x07', '\x98', '\xce', '\x59', '\xb3', '\xce', '\xe2', '\x7a', '\x9d', '\xb5',
-          '\x6a', '\xeb', '\x3d', '\x7d', '\xbf', '\x9b', '\xff', '\xef', '\x6b', '\xd8', '\x2c', '\xb3', '\x1c',
-          '\x04', '\xba', '\x7d', '\x3e', '\x5d', '\x81', '\x3b', '\x65', '\xfe', '\x30', '\x9c', '\xc5', '\x1d',
-          '\x98', '\x92', '\xc8', '\xab', '\xec', '\xd0', '\x1d', '\x98', '\xb9', '\xb4', '\x57', '\xea', '\x49',
-          '\xbb', '\xba', '\xb3', '\x81', '\x1e', '\x6a', '\x7d', '\xec', '\x4c', '\x3c', '\x94', '\xda', '\xee',
-          '\x4f', '\xbc', '\x42', '\x2b', '\x26', '\xa1', '\x60', '\x0e', '\xf4', '\x33', '\x9a', '\xae', '\xc0',
-          '\x54', '\xc2', '\x5f', '\xe8', '\x77', '\x20', '\x87', '\x80', '\xf9', '\x36', '\x35', '\x70', '\x52',
-          '\x87', '\x0b', '\xeb', '\xa0', '\xfd', '\x76', '\x16', '\xee', '\x38', '\x1b', '\x80', '\x31', '\x7c',
-          '\x0a', '\xc6', '\xe5', '\xab', '\xc4', '\x0e', '\x94', '\x49', '\xff', '\x50', '\x4a', '\xd4', '\x81',
-          '\x56', '\x87', '\xc6', '\x2e', '\xaa', '\x07', '\x2c', '\x88', '\xfd', '\x90', '\xc5', '\xb1', '\xef',
-          '\x9e', '\xbd', '\x55', '\xa4', '\xd9', '\x08', '\x59', '\x78', '\xda', '\xa8', '\x60', '\x44', '\x71',
-          '\x93', '\x85', '\xa1', '\xef', '\x1e', '\xe0', '\x5a', '\xf9', '\x08', '\xd1', '\x7a', '\xcf', '\x6b',
-          '\xd7', '\x39', '\xfa', '\x02', '\x85', '\x8e', '\xbb', '\x1e' };
+        { '\x00', '\x00', '\x06', '\x13', '\x78', '\xda', '\x95', '\x54', '\xdf', '\x4f', '\xc2', '\x30', '\x10',
+          '\x7e', '\xf7', '\xaf', '\x68', '\xf6', '\x8e', '\xb0', '\x8d', '\x29', '\x4b', '\xf8', '\x11', '\x03',
+          '\x9a', '\xf8', '\x80', '\xa2', '\x03', '\x79', '\x34', '\xb5', '\x3b', '\xb1', '\xda', '\xb5', '\xa4',
+          '\x3d', '\xf0', '\x47', '\xfc', '\xe3', '\xed', '\x86', '\x21', '\x01', '\xba', '\x0d', '\x9e', '\xda',
+          '\xde', '\x7d', '\x5f', '\xef', '\xbb', '\xeb', '\x5d', '\xbb', '\x83', '\xaf', '\x4c', '\x90', '\x35',
+          '\x68', '\xc3', '\x95', '\xec', '\x79', '\xfe', '\x79', '\xcb', '\x23', '\x20', '\x99', '\x4a', '\xb9',
+          '\x5c', '\xf4', '\xbc', '\xd9', '\xf4', '\xa6', '\xd1', '\xf1', '\x06', '\xfd', '\xee', '\x03', '\x5e',
+          '\xa5', '\x6b', '\x2a', '\x19', '\xa4', '\x23', '\xc5', '\x3e', '\xac', '\x2f', '\xf9', '\x36', '\x08',
+          '\x19', '\x79', '\xda', '\x12', '\x3d', '\x32', '\x33', '\xa0', '\xb7', '\xe7', '\xc0', '\x23', '\x43',
+          '\x25', '\x91', '\x72', '\x69', '\x2d', '\x85', '\x7b', '\x08', '\x12', '\x35', '\x15', '\x73', '\x9e',
+          '\x2e', '\x00', '\x7b', '\x5e', '\x6a', '\xef', '\x09', '\x47', '\x73', '\x2e', '\x53', '\xf5', '\xf9',
+          '\x9c', '\x59', '\xdc', '\x66', '\xeb', '\xf5', '\xbb', '\x5b', '\x1e', '\xb9', '\x11', '\x8a', '\x62',
+          '\x21', '\xa4', '\x65', '\xed', '\xc9', '\x52', '\x70', '\x44', '\x6b', '\xbe', '\xd7', '\xdc', '\xde',
+          '\x65', '\x3d', '\x79', '\xa0', '\xdf', '\x3c', '\xd0', '\x4a', '\x62', '\x1e', '\xb2', '\x0c', '\xd3',
+          '\xd8', '\xc1', '\x5c', '\x69', '\xa0', '\x64', '\x4a', '\x5f', '\xac', '\xac', '\xd0', '\x3a', '\x56',
+          '\x5a', '\x83', '\xfc', '\x17', '\x34', '\xd1', '\xea', '\x1d', '\x18', '\x4e', '\x35', '\xc0', '\xae',
+          '\xa6', '\x8d', '\x6a', '\x72', '\x47', '\x33', '\xa8', '\x44', '\x92', '\xa1', '\x50', '\x06', '\xd2',
+          '\x5c', '\x70', '\xd3', '\xc1', '\x1a', '\x51', '\xa4', '\x89', '\x5a', '\x69', '\x06', '\x27', '\x12',
+          '\x13', '\xa6', '\xf9', '\x12', '\x4d', '\x35', '\xab', '\x99', '\x67', '\xb6', '\x93', '\x9f', '\x7f',
+          '\x98', '\xdf', '\x12', '\x34', '\x7e', '\x5f', '\xa7', '\x1c', '\x95', '\xae', '\x4f', '\xb1', '\x04',
+          '\xec', '\x0c', '\x9b', '\xf0', '\x1f', '\x30', '\xfd', '\xcb', '\x4e', '\x40', '\xda', '\x17', '\x1d',
+          '\xd2', '\x6d', '\x6e', '\xce', '\x76', '\xfd', '\x7f', '\x92', '\x93', '\x1f', '\x67', '\x5f', '\xbc',
+          '\xab', '\x5b', '\x6c', '\x8b', '\xd0', '\x45', '\x81', '\x75', '\x24', '\xe0', '\x24', '\x38', '\xa5',
+          '\xd7', '\x74', '\x56', '\x58', '\x2d', '\xec', '\x11', '\xcc', '\x4a', '\xe0', '\xad', '\x7c', '\x55',
+          '\x35', '\x15', '\x75', '\x03', '\xeb', '\x1e', '\xb1', '\xed', '\x0c', '\x37', '\x11', '\x0a', '\x8f',
+          '\x0a', '\xb7', '\x0f', '\xac', '\xe9', '\xb4', '\xb1', '\x7a', '\xd3', '\x66', '\xc8', '\x35', '\x13',
+          '\x70', '\x22', '\xf3', '\x11', '\xc4', '\x04', '\x74', '\x56', '\xca', '\xf2', '\x9d', '\xac', '\xc9',
+          '\x1a', '\xab', '\x19', '\x87', '\x05', '\xd9', '\x9f', '\xda', '\x31', '\x18', '\x43', '\x17', '\x60',
+          '\x6a', '\xca', '\xe1', '\x82', '\xd5', '\xa4', '\x64', '\x47', '\x80', '\x59', '\xd6', '\x58', '\xc9',
+          '\xea', '\x11', '\x38', '\x20', '\xce', '\x2c', '\x28', '\x41', '\xca', '\x3e', '\x8e', '\x1c', '\x9b',
+          '\x30', '\x8e', '\x88', '\x1f', '\xc4', '\x2d', '\xd2', '\x8e', '\x4a', '\x66', '\xa7', '\xb0', '\x74',
+          '\xe2', '\x0b', '\x12', '\x46', '\xed', '\x0a', '\x44', '\x18', '\xc7', '\x24', '\xf0', '\xa3', '\xc8',
+          '\x09', '\x69', '\x6e', '\xbf', '\x56', '\xbb', '\x2f', '\xf9', '\xd2', '\xfb', '\x67', '\x7f', '\x49',
+          '\x4b', '\x16', '\x16' };
 
     QByteArray retVal( stateData, sizeof( stateData ) );
 
@@ -394,35 +470,36 @@ QByteArray RiuDockWidgetTools::defaultGeoMechDockState()
 QByteArray RiuDockWidgetTools::defaultPlotDockState()
 {
     static const char stateData[] =
-        { '\x00', '\x00', '\x04', '\x87', '\x78', '\xda', '\xa5', '\x54', '\x4d', '\x6f', '\xc2', '\x30', '\x0c',
-          '\xbd', '\xef', '\x57', '\x44', '\xbd', '\xb3', '\x7e', '\x20', '\xb1', '\x22', '\x95', '\x22', '\x04',
-          '\xe3', '\xc6', '\xc6', '\xd4', '\x02', '\xc7', '\x29', '\x6b', '\xac', '\x2a', '\x5a', '\x9b', '\x54',
-          '\x49', '\xca', '\xc6', '\xb4', '\x1f', '\x3f', '\xb7', '\x9d', '\x2a', '\x40', '\xe5', '\x63', '\xec',
-          '\xd4', '\xd8', '\x7e', '\xcf', '\x7e', '\x8e', '\xdd', '\x04', '\xe3', '\xcf', '\x3c', '\x23', '\x5b',
-          '\x50', '\x9a', '\x4b', '\x31', '\xb2', '\xdc', '\x7b', '\xc7', '\x22', '\x20', '\x12', '\xc9', '\xb8',
-          '\x48', '\x47', '\xd6', '\x2a', '\x9e', '\xf7', '\x7c', '\x6b', '\x1c', '\x06', '\x2f', '\x66', '\xc2',
-          '\xb6', '\x54', '\x24', '\xc0', '\x66', '\x32', '\x79', '\xc7', '\x58', '\xb4', '\xd3', '\x06', '\x72',
-          '\xb2', '\x6e', '\x89', '\x16', '\x59', '\x69', '\x50', '\xfb', '\xf6', '\x54', '\x0a', '\x43', '\xb9',
-          '\x40', '\x4f', '\x63', '\x82', '\x30', '\x8a', '\x66', '\x1b', '\xce', '\x52', '\x30', '\x23', '\x6b',
-          '\x99', '\x49', '\x43', '\x36', '\x5c', '\x30', '\xf9', '\x61', '\x85', '\x41', '\x8b', '\x25', '\xf3',
-          '\x4c', '\x52', '\x53', '\x17', '\x77', '\xd0', '\x1f', '\x15', '\x19', '\x37', '\x06', '\xdd', '\xcf',
-          '\x8a', '\x23', '\x1f', '\x23', '\x55', '\xf2', '\xef', '\x2a', '\x79', '\x29', '\x30', '\x4b', '\xff',
-          '\x24', '\xa6', '\xd7', '\x62', '\x3c', '\xc4', '\x4c', '\x14', '\x50', '\x12', '\xd3', '\x37', '\x5d',
-          '\x51', '\xc8', '\xb4', '\x54', '\x0a', '\xaa', '\x50', '\x81', '\x22', '\x16', '\x58', '\xb7', '\xd1',
-          '\xf1', '\xca', '\xb0', '\xb7', '\x4a', '\x97', '\x8e', '\x15', '\x00', '\xb2', '\x1a', '\xad', '\xe4',
-          '\x89', '\xe6', '\x70', '\x01', '\x4b', '\xa6', '\x99', '\xd4', '\xc0', '\x2a', '\xd1', '\xf6', '\x65',
-          '\x5e', '\x0c', '\x79', '\x91', '\x51', '\x03', '\xb7', '\x70', '\xa3', '\x44', '\xf1', '\xa2', '\xb3',
-          '\xaa', '\x5d', '\x35', '\x79', '\xd0', '\xaa', '\x7b', '\xa1', '\x55', '\x25', '\x0b', '\x50', '\x66',
-          '\xf7', '\xc8', '\xb8', '\x91', '\xea', '\x9a', '\x7e', '\x0f', '\x09', '\x9d', '\xe5', '\x23', '\xfe',
-          '\x05', '\x3a', '\xf4', '\x87', '\x0e', '\xe9', '\xfb', '\x0f', '\x24', '\xb0', '\x1b', '\x1b', '\xbf',
-          '\xbf', '\x53', '\x3a', '\x29', '\x70', '\x7f', '\x21', '\x70', '\x0b', '\x68', '\x5a', '\xc7', '\x8f',
-          '\x44', '\x1d', '\x80', '\x3a', '\xcb', '\xff', '\x6d', '\x19', '\xbc', '\xf3', '\x37', '\x34', '\xa3',
-          '\x86', '\x46', '\xb2', '\x54', '\x09', '\x5c', '\xb9', '\x11', '\x47', '\x84', '\x33', '\xa3', '\xad',
-          '\x67', '\x59', '\xe6', '\x39', '\x55', '\xbb', '\x65', '\x9d', '\x47', '\xd0', '\x14', '\xd4', '\x7f',
-          '\x47', '\xba', '\x00', '\xad', '\x31', '\x8f', '\xbe', '\x42', '\x6a', '\x0b', '\xbd', '\x71', '\x8c',
-          '\x8d', '\xc7', '\x1b', '\xb8', '\xc4', '\x73', '\xdc', '\x21', '\xf1', '\x06', '\x7e', '\x27', '\xcc',
-          '\x6e', '\x7f', '\x6d', '\x3c', '\x9f', '\x78', '\x46', '\xc2', '\xbb', '\x1f', '\x8d', '\x36', '\x8d',
-          '\x30' };
+        { '\x00', '\x00', '\x04', '\xf5', '\x78', '\xda', '\x9d', '\x54', '\x51', '\x6f', '\x82', '\x30', '\x10',
+          '\x7e', '\xdf', '\xaf', '\x68', '\xfa', '\xee', '\x04', '\x99', '\x13', '\x13', '\xd4', '\x18', '\x9c',
+          '\x6f', '\x6e', '\x2e', '\xe8', '\x7c', '\x34', '\x1d', '\x5c', '\x48', '\x23', '\xb4', '\xa4', '\x2d',
+          '\x6e', '\x2e', '\xfb', '\xf1', '\x3b', '\x70', '\x61', '\x9b', '\x01', '\xc5', '\x3d', '\xb5', '\xbd',
+          '\xfb', '\xbe', '\xbb', '\xef', '\x72', '\x5f', '\xea', '\x4d', '\xde', '\xd3', '\x84', '\xec', '\x41',
+          '\x69', '\x2e', '\xc5', '\x88', '\xda', '\xb7', '\x16', '\x25', '\x20', '\x42', '\x19', '\x71', '\x11',
+          '\x8f', '\xe8', '\x7a', '\x35', '\xef', '\xb8', '\x74', '\x32', '\xf6', '\x9e', '\xcd', '\x34', '\xda',
+          '\x33', '\x11', '\x42', '\x34', '\x93', '\xe1', '\x0e', '\x73', '\xc1', '\x41', '\x1b', '\x48', '\xc9',
+          '\x4b', '\x45', '\xa4', '\x64', '\xad', '\x41', '\x55', '\xef', '\x1e', '\x25', '\xbe', '\x14', '\x86',
+          '\x71', '\x81', '\x91', '\x32', '\xed', '\x83', '\x30', '\x8a', '\x25', '\x1b', '\x1e', '\xc5', '\x60',
+          '\x46', '\x34', '\xc2', '\x3a', '\xcb', '\x44', '\x9a', '\x0d', '\x17', '\x91', '\x7c', '\xdb', '\xa6',
+          '\x88', '\xfc', '\x79', '\xd2', '\xb1', '\x57', '\xb1', '\xc9', '\x3c', '\x91', '\xcc', '\x94', '\x72',
+          '\x2c', '\x8c', '\x07', '\x59', '\xc2', '\x8d', '\xc1', '\xf0', '\x93', '\xe2', '\x58', '\x11', '\x33',
+          '\x45', '\xbb', '\xcf', '\xa2', '\x5d', '\x2e', '\xb0', '\xae', '\xd3', '\x88', '\xe9', '\x54', '\x98',
+          '\x1e', '\x62', '\xa6', '\x0a', '\x18', '\x59', '\xb1', '\x57', '\x5d', '\x50', '\x88', '\x9f', '\x2b',
+          '\x05', '\xe2', '\x97', '\x2c', '\xbd', '\x52', '\x00', '\xdb', '\x0c', '\x6f', '\x0b', '\x54', '\x51',
+          '\xa9', '\x3a', '\xaa', '\x27', '\x8f', '\x2c', '\x85', '\x0b', '\x58', '\xe2', '\x27', '\x52', '\x43',
+          '\x54', '\x88', '\xee', '\xd6', '\xf0', '\x56', '\x90', '\x66', '\x09', '\x33', '\xf0', '\x1f', '\x6e',
+          '\x10', '\x2a', '\x9e', '\xb5', '\xe9', '\xda', '\x2d', '\x86', '\xfc', '\x33', '\xaa', '\x7d', '\x3a',
+          '\xaa', '\x92', '\x19', '\x28', '\x73', '\x78', '\x88', '\xb8', '\x91', '\xaa', '\xcd', '\xbc', '\x67',
+          '\x09', '\xb5', '\xed', '\x03', '\xfe', '\x01', '\x7a', '\xec', '\xda', '\x43', '\x72', '\xd7', '\x77',
+          '\x89', '\xd7', '\x3d', '\xbe', '\xf1', '\xfc', '\xde', '\xd2', '\x79', '\x81', '\x8d', '\x16', '\x41',
+          '\x5f', '\xb0', '\xb8', '\x64', '\x34', '\xac', '\xa5', '\x81', '\x56', '\x2b', '\xf1', '\x3a', '\xc3',
+          '\xf4', '\x4e', '\x44', '\xce', '\x98', '\x61', '\x81', '\xcc', '\x55', '\x08', '\x2d', '\x5d', '\x73',
+          '\x9e', '\x70', '\x69', '\xfd', '\x79', '\x9a', '\x32', '\x75', '\x58', '\x96', '\x24', '\xc1', '\x62',
+          '\x50', '\x17', '\xd7', '\x7e', '\x2a', '\x78', '\x01', '\x5a', '\x23', '\x51', '\xb7', '\x90', '\xda',
+          '\x04', '\xbd', '\x20', '\x72', '\x8d', '\xa0', '\xc0', '\xb0', '\x70', '\x77', '\x8d', '\x45', '\x86',
+          '\x16', '\x71', '\xdc', '\x41', '\xad', '\x45', '\x8e', '\x11', '\xc7', '\xe9', '\x13', '\x7b', '\x70',
+          '\x6f', '\xa1', '\x93', '\x9c', '\x5a', '\x58', '\xb7', '\xfa', '\x36', '\xf0', '\xde', '\xf0', '\x69',
+          '\x8d', '\x6f', '\xbe', '\x00', '\x0a', '\x89', '\xb7', '\xa8' };
 
     QByteArray retVal( stateData, sizeof( stateData ) );
 
@@ -435,38 +512,39 @@ QByteArray RiuDockWidgetTools::defaultPlotDockState()
 QByteArray RiuDockWidgetTools::hideAllDocking3DState()
 {
     static const char stateData[] =
-        { '\x00', '\x00', '\x05', '\x29', '\x78', '\xda', '\x95', '\x54', '\x4d', '\x53', '\xc2', '\x30', '\x10',
-          '\xbd', '\xfb', '\x2b', '\x32', '\xbd', '\x23', '\x05', '\xd4', '\xf1', '\xc0', '\xc7', '\x30', '\x20',
-          '\x33', '\x1e', '\x50', '\xa4', '\x7c', '\x1c', '\x9d', '\xd8', '\xae', '\x18', '\x4d', '\x13', '\x66',
-          '\x13', '\x40', '\x1c', '\x7f', '\xbc', '\xdb', '\x22', '\xb5', '\xad', '\xd0', '\xc2', '\xa9', '\xcd',
-          '\xbe', '\xb7', '\x9b', '\xf7', '\x92', '\x37', '\x69', '\x76', '\x3e', '\x43', '\xc9', '\xd6', '\x80',
-          '\x46', '\x68', '\xd5', '\x72', '\x6a', '\x97', '\xae', '\xc3', '\x40', '\xf9', '\x3a', '\x10', '\x6a',
-          '\xd1', '\x72', '\xa6', '\x93', '\x41', '\xe5', '\xd6', '\xe9', '\xb4', '\x9b', '\x4f', '\xb6', '\x1b',
-          '\xac', '\xb9', '\xf2', '\x21', '\xe8', '\x6b', '\xff', '\x83', '\x30', '\x6f', '\x6b', '\x2c', '\x84',
-          '\x6c', '\x96', '\x34', '\x3a', '\x6c', '\x6a', '\x00', '\xd3', '\xeb', '\x9e', '\x56', '\x96', '\x0b',
-          '\x45', '\x95', '\xdd', '\x12', '\x94', '\x45', '\x2e', '\xe7', '\x22', '\x58', '\x80', '\x6d', '\x39',
-          '\x8d', '\x3e', '\x9b', '\x09', '\xd8', '\x18', '\xa7', '\xdd', '\x4c', '\x88', '\x6c', '\x20', '\x35',
-          '\xb7', '\xf1', '\xce', '\x2e', '\xd5', '\xbd', '\xa5', '\x14', '\xd6', '\x52', '\xf9', '\x11', '\x05',
-          '\x35', '\x13', '\x12', '\x4d', '\xfe', '\x8e', '\x26', '\xaf', '\x14', '\x8d', '\xa8', '\x1f', '\xe5',
-          '\x54', '\x32', '\x9c', '\x2e', '\x02', '\x67', '\x13', '\xfe', '\x42', '\x3a', '\x1a', '\x04', '\xac',
-          '\x10', '\x21', '\x82', '\x42', '\xda', '\x73', '\x2e', '\x54', '\xa0', '\x37', '\xcf', '\x01', '\x99',
-          '\xf2', '\x7c', '\x14', '\x4b', '\x6b', '\x26', '\x08', '\x40', '\x3d', '\x3b', '\x99', '\xec', '\x81',
-          '\x87', '\xf0', '\x8f', '\x39', '\x42', '\xfd', '\x0e', '\xbe', '\x8d', '\x99', '\xac', '\x27', '\xb5',
-          '\x81', '\x20', '\x72', '\x58', '\x2d', '\xee', '\xea', '\x73', '\xcb', '\x3d', '\xbd', '\x42', '\x1f',
-          '\xce', '\x6c', '\x4c', '\x0b', '\xcb', '\x76', '\x55', '\x23', '\x67', '\x19', '\x7f', '\xb5', '\x94',
-          '\xbf', '\xa8', '\x77', '\x89', '\x7a', '\x09', '\x68', '\xb7', '\x77', '\x81', '\xb0', '\x1a', '\xf3',
-          '\xbe', '\x0e', '\x30', '\x0e', '\x6e', '\xe0', '\x89', '\x2f', '\x30', '\x6d', '\x97', '\xd5', '\xea',
-          '\xd7', '\x37', '\xac', '\x59', '\xdd', '\x2d', '\xe9', '\xfb', '\x7b', '\xf6', '\x67', '\xdf', '\x42',
-          '\x5a', '\x65', '\x92', '\x03', '\xba', '\x7c', '\xbe', '\x88', '\xc1', '\x9c', '\xca', '\x3f', '\xc6',
-          '\x5e', '\x9b', '\x9b', '\xd6', '\x56', '\x12', '\x92', '\x86', '\x53', '\x78', '\x40', '\x63', '\x30',
-          '\x2b', '\x69', '\xef', '\xd5', '\xab', '\x3e', '\x74', '\x38', '\x29', '\xb4', '\xec', '\xe4', '\xaf',
-          '\x72', '\x83', '\x47', '\x6b', '\x3b', '\x92', '\xda', '\x1e', '\x9f', '\x1a', '\xa3', '\x05', '\x29',
-          '\x88', '\x98', '\x43', '\xfd', '\x86', '\xa6', '\x27', '\xd0', '\x97', '\x70', '\x0a', '\x7d', '\x0c',
-          '\x72', '\x04', '\x18', '\x9e', '\x42', '\xdd', '\xcb', '\x2b', '\xb3', '\x55', '\xcf', '\xdb', '\x42',
-          '\xed', '\x83', '\x31', '\x43', '\xad', '\x8e', '\x05', '\x6a', '\x48', '\x30', '\x5f', '\x80', '\x29',
-          '\x55', '\x90', '\x9d', '\x54', '\x18', '\x3c', '\x97', '\x51', '\xf2', '\xdc', '\xc3', '\xd1', '\x8b',
-          '\x2b', '\x71', '\x32', '\x8b', '\x08', '\x05', '\x13', '\xaa', '\xc9', '\xfb', '\x43', '\xff', '\x47',
-          '\x1e', '\xba', '\xf6', '\xc5', '\x0f', '\xd0', '\x5d', '\xba', '\xc1' };
+        { '\x00', '\x00', '\x06', '\x11', '\x78', '\xda', '\x95', '\x54', '\x4d', '\x53', '\xc2', '\x30', '\x10',
+          '\xbd', '\xfb', '\x2b', '\x32', '\xbd', '\x2b', '\x05', '\xd4', '\xf1', '\xc0', '\xc7', '\x30', '\xa0',
+          '\x33', '\x1e', '\x50', '\xb4', '\x20', '\x47', '\x27', '\xa6', '\x2b', '\x46', '\xd3', '\x84', '\xd9',
+          '\x2c', '\xf8', '\x31', '\xfe', '\x78', '\xb7', '\x05', '\x19', '\x29', '\xa5', '\x95', '\x53', '\xd3',
+          '\xdd', '\xf7', '\xf2', '\xde', '\x26', '\xbb', '\x69', '\x75', '\x3f', '\x12', '\x23', '\x96', '\x80',
+          '\x5e', '\x3b', '\xdb', '\x0e', '\xea', '\x27', '\x61', '\x20', '\xc0', '\x2a', '\x17', '\x6b', '\x3b',
+          '\x6b', '\x07', '\x93', '\xf1', '\xd5', '\xf1', '\x45', '\xd0', '\xed', '\xb4', '\xee', '\xa8', '\x17',
+          '\x2f', '\xa5', '\x55', '\x10', '\x0f', '\x9c', '\x7a', '\xe3', '\x5c', '\xf4', '\xe9', '\x09', '\x12',
+          '\xf1', '\xb0', '\x21', '\x06', '\x62', '\xe2', '\x01', '\x37', '\xff', '\x8d', '\x40', '\xf4', '\x9d',
+          '\x25', '\xa9', '\x2d', '\x47', '\xb2', '\x74', '\x1f', '\x2c', '\xa1', '\x34', '\x53', '\x1d', '\xcf',
+          '\x80', '\xda', '\x41', '\xcc', '\xfb', '\x34', '\x07', '\x53', '\x6d', '\x63', '\xf7', '\xfe', '\x98',
+          '\x30', '\x6e', '\xb5', '\x0c', '\x3a', '\xad', '\x0d', '\x4f', '\x5c', '\x19', '\x27', '\x29', '\x33',
+          '\x12', '\x72', '\x3c', '\x9a', '\x1b', '\x4d', '\xc4', '\xe1', '\x5b', '\xd4', '\xbc', '\x17', '\x67',
+          '\x52', '\xa1', '\xef', '\x54', '\x68', '\x61', '\x29', '\x95', '\xdc', '\x87', '\x39', '\xde', '\xc2',
+          '\xf4', '\x10', '\xa4', '\x18', '\xcb', '\x27', '\xb6', '\xd5', '\xe4', '\xc4', '\x02', '\x11', '\xec',
+          '\xda', '\x50', '\xa4', '\x50', '\xcf', '\xc9', '\x8f', '\x11', '\x60', '\xdb', '\xd3', '\xca', '\xb5',
+          '\xb8', '\x91', '\x09', '\xac', '\x90', '\x23', '\x74', '\xaf', '\xa0', '\x28', '\x8f', '\x14', '\x7d',
+          '\xe3', '\x3c', '\xc4', '\x69', '\xc1', '\xb5', '\x02', '\xd6', '\x40', '\x92', '\x8c', '\xdc', '\x02',
+          '\x15', '\x1c', '\x48', '\xdc', '\x63', '\x6c', '\x9b', '\x55', '\x4b', '\x2b', '\xdb', '\xaa', '\xaf',
+          '\x9e', '\xab', '\x8f', '\x5d', '\xcf', '\x01', '\xe9', '\xf3', '\x32', '\xd6', '\xe4', '\xb0', '\xba',
+          '\xc4', '\x3d', '\xe0', '\x42', '\xd9', '\x48', '\x7f', '\x81', '\xef', '\x84', '\xa2', '\xde', '\x38',
+          '\x3b', '\x17', '\xad', '\xda', '\xea', '\x97', '\xbf', '\xeb', '\x1b', '\x39', '\xf8', '\x6e', '\xf2',
+          '\xde', '\x8b', '\x9a', '\x85', '\x3b', '\x44', '\xce', '\x32', '\x6c', '\x81', '\xff', '\x42', '\xc2',
+          '\xaf', '\xf3', '\xf0', '\xaf', '\xf3', '\x8a', '\xc6', '\x6a', '\x96', '\x1b', '\xbb', '\x07', '\xbf',
+          '\x30', '\x74', '\x6d', '\x9f', '\x5d', '\xc5', '\x81', '\x16', '\x03', '\xab', '\xee', '\xf0', '\x34',
+          '\x27', '\x37', '\x74', '\x2f', '\xe8', '\xfb', '\x1a', '\x95', '\x81', '\x91', '\x71', '\xf4', '\x2f',
+          '\xcd', '\x3c', '\xb0', '\xa2', '\xdb', '\x4a', '\x24', '\x2a', '\x98', '\xf7', '\x60', '\x46', '\x80',
+          '\xc9', '\x81', '\xac', '\xd1', '\xb2', '\xc2', '\xe1', '\xee', '\xa9', '\xe4', '\x27', '\x77', '\xc2',
+          '\xac', '\x88', '\xa4', '\x7a', '\xab', '\x38', '\x8f', '\x21', '\x78', '\x2f', '\x67', '\xe0', '\x0f',
+          '\x71', '\x87', '\x4e', '\x31', '\x6b', '\xe8', '\x6c', '\xf9', '\x1c', '\xec', '\x10', '\x0b', '\x3d',
+          '\x95', '\xce', '\x4e', '\x28', '\x78', '\x78', '\xc2', '\xe2', '\xe9', '\xc9', '\x22', '\xd9', '\x70',
+          '\x95', '\x01', '\x4a', '\x76', '\xa8', '\x6d', '\x1e', '\x56', '\x5e', '\xef', '\x79', '\xd0', '\x3b',
+          '\x47', '\x3f', '\x6f', '\xaf', '\x16', '\x81' };
 
     QByteArray retVal( stateData, sizeof( stateData ) );
 
@@ -479,35 +557,36 @@ QByteArray RiuDockWidgetTools::hideAllDocking3DState()
 QByteArray RiuDockWidgetTools::hideAllDockingPlotState()
 {
     static const char stateData[] =
-        { '\x00', '\x00', '\x04', '\x78', '\x78', '\xda', '\xa5', '\x54', '\xc1', '\x4e', '\x83', '\x40', '\x10',
-          '\xbd', '\xfb', '\x15', '\x1b', '\xee', '\x15', '\x4a', '\xa3', '\xe9', '\x81', '\xd2', '\x34', '\xad',
-          '\xbd', '\x55', '\x6b', '\xa0', '\xf6', '\x68', '\x56', '\x76', '\x42', '\x36', '\x2e', '\xbb', '\x64',
-          '\x77', '\xa9', '\xd6', '\xf8', '\xf1', '\x0e', '\x60', '\x09', '\x98', '\x62', '\x6b', '\x3d', '\xc1',
-          '\xcc', '\xbc', '\x37', '\xf3', '\xde', '\xce', '\x42', '\x30', '\x7d', '\xcf', '\x04', '\xd9', '\x81',
-          '\x36', '\x5c', '\xc9', '\x89', '\x33', '\xbc', '\xf6', '\x1c', '\x02', '\x32', '\x51', '\x8c', '\xcb',
-          '\x74', '\xe2', '\x6c', '\xe2', '\xe5', '\x60', '\xec', '\x4c', '\xc3', '\xe0', '\xd1', '\xce', '\xd8',
-          '\x8e', '\xca', '\x04', '\xd8', '\x42', '\x25', '\xaf', '\x58', '\x8b', '\xf6', '\xc6', '\x42', '\x46',
-          '\x9e', '\x1a', '\xa2', '\x43', '\x36', '\x06', '\x74', '\x3b', '\x9e', '\x2b', '\x69', '\x29', '\x97',
-          '\x98', '\xa9', '\x43', '\x90', '\x56', '\x53', '\xb1', '\xe5', '\x2c', '\x05', '\x3b', '\x71', '\xd6',
-          '\x42', '\x59', '\xb2', '\xe5', '\x92', '\xa9', '\x37', '\x27', '\x0c', '\x1a', '\x2c', '\x59', '\x0a',
-          '\x45', '\x6d', '\x35', '\xdc', '\xc3', '\x7c', '\x94', '\x0b', '\x6e', '\x2d', '\xa6', '\x1f', '\x34',
-          '\x47', '\x3e', '\x56', '\xca', '\xe6', '\x9f', '\x65', '\xf3', '\x42', '\x62', '\x97', '\x51', '\x2f',
-          '\x66', '\xd0', '\x60', '\x7c', '\xc4', '\xcc', '\x34', '\x50', '\x12', '\xd3', '\x17', '\x53', '\x52',
-          '\xc8', '\xbc', '\xd0', '\x1a', '\xca', '\x52', '\x8e', '\x22', '\x56', '\x38', '\xb7', '\xd6', '\xf1',
-          '\xcc', '\xd0', '\x5b', '\x94', '\x68', '\x9e', '\x5b', '\x13', '\x6b', '\x00', '\xe4', '\xd5', '\x6a',
-          '\xc9', '\x3d', '\xcd', '\xe0', '\x28', '\xba', '\x74', '\x51', '\x63', '\xc9', '\x5c', '\x28', '\x03',
-          '\xac', '\xb4', '\xea', '\x9e', '\xe6', '\xc5', '\x90', '\xe5', '\x82', '\x5a', '\xb8', '\x84', '\xdb',
-          '\x56', '\xd8', '\x65', '\xba', '\xa5', '\xcd', '\x8e', '\xd9', '\xe1', '\xef', '\x66', '\xd7', '\x5a',
-          '\xe5', '\xa0', '\xed', '\xfe', '\x8e', '\x71', '\xab', '\xf4', '\x39', '\x7e', '\xbb', '\x84', '\xa3',
-          '\xe3', '\x23', '\xfe', '\x01', '\x26', '\xf4', '\xc8', '\xd0', '\x1f', '\x8f', '\x48', '\xe0', '\xd6',
-          '\x21', '\x3e', '\xbf', '\xd7', '\xd4', '\xab', '\xaf', '\x7d', '\x23', '\xf0', '\x1a', '\xd0', '\xb4',
-          '\xaa', '\xff', '\xd0', '\xd4', '\x01', '\x1d', '\xa6', '\x7b', '\xed', '\xe9', '\x7f', '\xbb', '\x0d',
-          '\x7e', '\x4b', '\x40', '\x75', '\xb8', '\x45', '\x96', '\x51', '\xbd', '\x5f', '\x57', '\xd6', '\x25',
-          '\x4d', '\xe1', '\x9c', '\x53', '\x59', '\x50', '\x4b', '\x23', '\x55', '\xe8', '\x04', '\x4e', '\xad',
-          '\xb3', '\x67', '\xc4', '\x3f', '\xd7', '\xb8', '\x02', '\x63', '\xb0', '\x8f', '\x39', '\x43', '\x6a',
-          '\x03', '\xbd', '\x6c', '\x75', '\x07', '\x80', '\x7f', '\x73', '\xeb', '\x11', '\xef', '\x28', '\xc4',
-          '\x6d', '\xbe', '\x65', '\x7c', '\xef', '\xf9', '\x6f', '\x84', '\x57', '\x5f', '\x87', '\xd7', '\x88',
-          '\x5d' };
+        { '\x00', '\x00', '\x04', '\xe7', '\x78', '\xda', '\x9d', '\x94', '\x51', '\x6f', '\x82', '\x30', '\x14',
+          '\x85', '\xdf', '\xf7', '\x2b', '\x9a', '\xbe', '\x3b', '\x10', '\xb3', '\xc5', '\x07', '\xc4', '\x18',
+          '\x9c', '\x6f', '\x6e', '\x2e', '\xe0', '\x7c', '\x34', '\x1d', '\xdc', '\x90', '\x46', '\x68', '\x49',
+          '\x5b', '\xdc', '\x5c', '\xf6', '\xe3', '\x77', '\x41', '\xc5', '\xe9', '\xc0', '\xa9', '\x4f', '\xd0',
+          '\xf6', '\x9c', '\x9e', '\xef', '\x72', '\x6f', '\x70', '\x87', '\x9f', '\x59', '\x4a', '\xd6', '\xa0',
+          '\x34', '\x97', '\x62', '\x40', '\xbb', '\xf7', '\x36', '\x25', '\x20', '\x22', '\x19', '\x73', '\x91',
+          '\x0c', '\xe8', '\x3c', '\x9c', '\x74', '\xfa', '\x74', '\xe8', '\xb9', '\xaf', '\x66', '\x14', '\xaf',
+          '\x99', '\x88', '\x20', '\x1e', '\xcb', '\x68', '\x85', '\x67', '\xc1', '\x46', '\x1b', '\xc8', '\xc8',
+          '\x5b', '\x6d', '\xa4', '\x64', '\xae', '\x41', '\xd5', '\x6b', '\x87', '\x12', '\x5f', '\x0a', '\xc3',
+          '\xb8', '\xc0', '\x9d', '\xea', '\xd8', '\x07', '\x61', '\x14', '\x4b', '\x17', '\x3c', '\x4e', '\xc0',
+          '\x0c', '\x68', '\x8c', '\xf7', '\xcc', '\x52', '\x69', '\x16', '\x5c', '\xc4', '\xf2', '\x63', '\x99',
+          '\xa1', '\xf2', '\xb0', '\xa4', '\x9e', '\x5b', '\xbb', '\xc9', '\x24', '\x95', '\xcc', '\x54', '\x38',
+          '\x36', '\xee', '\x07', '\x79', '\xca', '\x8d', '\xc1', '\xed', '\x17', '\xc5', '\xf1', '\x46', '\x3c',
+          '\x29', '\xe3', '\xbe', '\xcb', '\xb8', '\x42', '\xe0', '\xbd', '\xbd', '\x56', '\x4d', '\xa7', '\xd6',
+          '\x38', '\xa8', '\x19', '\x29', '\x60', '\x24', '\x64', '\xef', '\xba', '\xb4', '\x10', '\xbf', '\x50',
+          '\x0a', '\xc4', '\x0e', '\x2b', '\x88', '\x14', '\xcf', '\x8d', '\x0e', '\x15', '\xc0', '\x32', '\x47',
+          '\xa6', '\x29', '\x72', '\xd4', '\x5c', '\x5b', '\x7e', '\xf2', '\xcc', '\x32', '\x38', '\x14', '\xd1',
+          '\xa8', '\x25', '\x7e', '\x2a', '\x35', '\xc4', '\x65', '\xf1', '\x56', '\x83', '\x2f', '\x84', '\x2c',
+          '\x4f', '\x99', '\x81', '\x5b', '\xbc', '\x67', '\x08', '\x8f', '\x9d', '\x56', '\x59', '\xe6', '\x51',
+          '\xb1', '\xdd', '\x93', '\x62', '\x67', '\x4a', '\xe6', '\xa0', '\xcc', '\xe6', '\x29', '\xe6', '\x46',
+          '\xaa', '\x4b', '\xea', '\x3d', '\x6b', '\x68', '\x8c', '\x0f', '\xf8', '\x17', '\x68', '\xcf', '\x26',
+          '\x5d', '\xa7', '\xdf', '\x23', '\xae', '\xb5', '\x5d', '\xe2', '\x73', '\xd7', '\xa6', '\xf3', '\x7c',
+          '\xad', '\x33', '\x82', '\x83', '\xc1', '\x92', '\xca', '\xd1', '\xd2', '\x95', '\x16', '\xdb', '\x9e',
+          '\xd0', '\xfe', '\x4d', '\x78', '\xdd', '\xc4', '\x38', '\xa7', '\x13', '\x53', '\x64', '\x19', '\x53',
+          '\x9b', '\x59', '\xf5', '\x2d', '\x04', '\x4b', '\x40', '\x35', '\x31', '\x8d', '\x99', '\x61', '\x81',
+          '\x2c', '\x54', '\x04', '\xb7', '\xb4', '\xfc', '\x6f', '\xc4', '\x7f', '\xad', '\x3e', '\xa5', '\x9c',
+          '\x63', '\x4e', '\x60', '\x58', '\xb4', '\xba', '\xa0', '\xcb', '\x53', '\xd0', '\x1a', '\x43', '\xf4',
+          '\x95', '\x94', '\xad', '\x11', '\xb7', '\xcd', '\xc5', '\x5e', '\xe0', '\x3c', '\x3c', '\xda', '\xc4',
+          '\x6e', '\x94', '\x58', '\xf5', '\x8f', '\x02', '\xdf', '\x5b', '\x7e', '\x53', '\xde', '\xdd', '\x0f',
+          '\x36', '\x41', '\xb3', '\x2a' };
 
     QByteArray retVal( stateData, sizeof( stateData ) );
 
diff --git a/ApplicationLibCode/UserInterface/RiuDockWidgetTools.h b/ApplicationLibCode/UserInterface/RiuDockWidgetTools.h
index 765d339678..6a4f4cb801 100644
--- a/ApplicationLibCode/UserInterface/RiuDockWidgetTools.h
+++ b/ApplicationLibCode/UserInterface/RiuDockWidgetTools.h
@@ -42,17 +42,20 @@ class CDockManager;
 class RiuDockWidgetTools
 {
 public:
-    static QString projectTreeName();
-    static QString propertyEditorName();
-    static QString resultInfoName();
-    static QString processMonitorName();
-    static QString resultPlotName();
-    static QString relPermPlotName();
-    static QString pvtPlotName();
-    static QString messagesName();
-    static QString mohrsCirclePlotName();
-    static QString undoStackName();
-    static QString summaryPlotManagerName();
+    static ads::CDockWidget* createDockWidget( QString title, QString dockName, QWidget* parent );
+
+    static QString mainPlotWindowName();
+    static QString main3DWindowName();
+
+    static QString mainWindowPropertyEditorName();
+    static QString mainWindowResultInfoName();
+    static QString mainWindowProcessMonitorName();
+    static QString mainWindowResultPlotName();
+    static QString mainWindowRelPermPlotName();
+    static QString mainWindowPvtPlotName();
+    static QString mainWindowMessagesName();
+    static QString mainWindowMohrsCirclePlotName();
+    static QString mainWindowUndoStackName();
 
     static QString mainWindowProjectTreeName();
     static QString mainWindowDataSourceTreeName();
@@ -66,6 +69,7 @@ public:
     static QString plotMainWindowPropertyEditorName();
     static QString plotMainWindowMessagesName();
     static QString plotMainWindowUndoStackName();
+    static QString plotMainWindowPlotManagerName();
 
     static QString dockState3DEclipseName();
     static QString dockState3DGeoMechName();
@@ -83,6 +87,8 @@ public:
     static QByteArray hideAllDocking3DState();
     static QByteArray hideAllDockingPlotState();
 
+    static QIcon dockIcon( const QString dockWidgetName );
+
 private:
     static QByteArray defaultEclipseDockState();
     static QByteArray defaultGeoMechDockState();
diff --git a/ApplicationLibCode/UserInterface/RiuMainWindow.cpp b/ApplicationLibCode/UserInterface/RiuMainWindow.cpp
index 8ba196b417..ef5c2886c0 100644
--- a/ApplicationLibCode/UserInterface/RiuMainWindow.cpp
+++ b/ApplicationLibCode/UserInterface/RiuMainWindow.cpp
@@ -128,9 +128,10 @@ RiuMainWindow::RiuMainWindow()
     m_mdiArea = new RiuMdiArea( this );
     connect( m_mdiArea, SIGNAL( subWindowActivated( QMdiSubWindow* ) ), SLOT( slotSubWindowActivated( QMdiSubWindow* ) ) );
 
-    ads::CDockWidget* widget = new ads::CDockWidget( "3D Views", this );
-    widget->setWidget( m_mdiArea );
-    dockManager()->setCentralWidget( widget );
+    ads::CDockWidget* cWidget =
+        RiuDockWidgetTools::createDockWidget( "3D Views", RiuDockWidgetTools::main3DWindowName(), this );
+    cWidget->setWidget( m_mdiArea );
+    dockManager()->setCentralWidget( cWidget );
 
     createActions();
     createMenus();
@@ -748,8 +749,7 @@ void RiuMainWindow::createDockPanels()
 
     for ( int i = 0; i < nTreeViews; i++ )
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( treeViewTitles[i], dockManager() );
-        dockWidget->setObjectName( treeViewDockNames[i] );
+        auto dockWidget = RiuDockWidgetTools::createDockWidget( treeViewTitles[i], treeViewDockNames[i], dockManager() );
 
         caf::PdmUiTreeView* projectTree = projectTreeView( i );
         projectTree->enableSelectionManagerUpdating( true );
@@ -789,15 +789,18 @@ void RiuMainWindow::createDockPanels()
     // undo/redo view
     if ( m_undoView && RiaPreferences::current()->useUndoRedo() )
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( "Undo Stack", dockManager() );
-        dockWidget->setObjectName( RiuDockWidgetTools::undoStackName() );
+        auto dockWidget = RiuDockWidgetTools::createDockWidget( "Undo Stack",
+                                                                RiuDockWidgetTools::mainWindowUndoStackName(),
+                                                                dockManager() );
         dockWidget->setWidget( m_undoView );
         rightWidgets.push_back( dockWidget );
     }
 
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( "Result Plot", dockManager() );
-        dockWidget->setObjectName( RiuDockWidgetTools::resultPlotName() );
+        auto dockWidget = RiuDockWidgetTools::createDockWidget( "Result Plot",
+                                                                RiuDockWidgetTools::mainWindowResultPlotName(),
+                                                                dockManager() );
+
         m_resultQwtPlot = new RiuResultQwtPlot( dockWidget );
         dockWidget->setWidget( m_resultQwtPlot );
         bottomWidgets.push_back( dockWidget );
@@ -810,8 +813,9 @@ void RiuMainWindow::createDockPanels()
                                                          dockManager()->centralWidget()->dockAreaWidget() );
 
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( "Property Editor", dockManager() );
-        dockWidget->setObjectName( RiuDockWidgetTools::propertyEditorName() );
+        auto dockWidget = RiuDockWidgetTools::createDockWidget( "Property Editor",
+                                                                RiuDockWidgetTools::mainWindowPropertyEditorName(),
+                                                                dockManager() );
 
         m_pdmUiPropertyView = new caf::PdmUiPropertyView( dockWidget );
         dockWidget->setWidget( m_pdmUiPropertyView );
@@ -820,8 +824,10 @@ void RiuMainWindow::createDockPanels()
 
 #ifdef USE_ODB_API
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( "Mohr's Circle Plot", dockManager() );
-        dockWidget->setObjectName( RiuDockWidgetTools::mohrsCirclePlotName() );
+        auto dockWidget = RiuDockWidgetTools::createDockWidget( "Mohr's Circle Plot",
+                                                                RiuDockWidgetTools::mainWindowMohrsCirclePlotName(),
+                                                                dockManager() );
+
         m_mohrsCirclePlot = new RiuMohrsCirclePlot( dockWidget );
         dockWidget->setWidget( m_mohrsCirclePlot );
         dockManager()->addDockWidgetTabToArea( dockWidget, bottomArea );
@@ -829,16 +835,19 @@ void RiuMainWindow::createDockPanels()
 #endif
 
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( "Relative Permeability Plot", dockManager() );
-        dockWidget->setObjectName( RiuDockWidgetTools::relPermPlotName() );
+        auto dockWidget = RiuDockWidgetTools::createDockWidget( "Relative Permeability Plot",
+                                                                RiuDockWidgetTools::mainWindowRelPermPlotName(),
+                                                                dockManager() );
+
         m_relPermPlotPanel = new RiuRelativePermeabilityPlotPanel( dockWidget );
         dockWidget->setWidget( m_relPermPlotPanel );
         dockManager()->addDockWidgetTabToArea( dockWidget, bottomArea );
     }
 
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( "PVT Plot", dockManager() );
-        dockWidget->setObjectName( RiuDockWidgetTools::pvtPlotName() );
+        auto dockWidget =
+            RiuDockWidgetTools::createDockWidget( "PVT Plot", RiuDockWidgetTools::mainWindowPvtPlotName(), dockManager() );
+
         m_pvtPlotPanel = new RiuPvtPlotPanel( dockWidget );
         dockWidget->setWidget( m_pvtPlotPanel );
         dockManager()->addDockWidgetTabToArea( dockWidget, bottomArea );
@@ -846,8 +855,10 @@ void RiuMainWindow::createDockPanels()
 
     // result info
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( "Result Info", dockManager() );
-        dockWidget->setObjectName( RiuDockWidgetTools::resultInfoName() );
+        auto dockWidget = RiuDockWidgetTools::createDockWidget( "Result Info",
+                                                                RiuDockWidgetTools::mainWindowResultInfoName(),
+                                                                dockManager() );
+
         m_resultInfoPanel = new RiuResultInfoPanel( dockWidget );
         dockWidget->setWidget( m_resultInfoPanel );
         dockManager()->addDockWidget( ads::DockWidgetArea::LeftDockWidgetArea, dockWidget, bottomArea );
@@ -856,16 +867,19 @@ void RiuMainWindow::createDockPanels()
     ads::CDockAreaWidget* procAndMsgTabs = nullptr;
     // process monitor
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( "Process Monitor", dockManager() );
-        dockWidget->setObjectName( RiuDockWidgetTools::processMonitorName() );
+        auto dockWidget = RiuDockWidgetTools::createDockWidget( "Process Monitor",
+                                                                RiuDockWidgetTools::mainWindowProcessMonitorName(),
+                                                                dockManager() );
+
         m_processMonitor = new RiuProcessMonitor( dockWidget );
         dockWidget->setWidget( m_processMonitor );
         procAndMsgTabs = dockManager()->addDockWidget( ads::DockWidgetArea::RightDockWidgetArea, dockWidget, bottomArea );
     }
 
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( "Messages", dockManager() );
-        dockWidget->setObjectName( RiuDockWidgetTools::messagesName() );
+        auto dockWidget =
+            RiuDockWidgetTools::createDockWidget( "Messages", RiuDockWidgetTools::mainWindowMessagesName(), dockManager() );
+
         m_messagePanel = new RiuMessagePanel( dockWidget );
         dockWidget->setWidget( m_messagePanel );
         dockManager()->addDockWidgetTabToArea( dockWidget, procAndMsgTabs );
@@ -1752,7 +1766,7 @@ void RiuMainWindow::updateMemoryUsage()
 //--------------------------------------------------------------------------------------------------
 void RiuMainWindow::showProcessMonitorDockPanel()
 {
-    RiuDockWidgetTools::showDockWidget( this->dockManager(), RiuDockWidgetTools::processMonitorName() );
+    RiuDockWidgetTools::showDockWidget( this->dockManager(), RiuDockWidgetTools::mainWindowProcessMonitorName() );
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp b/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp
index 163459718a..1185c1c4f7 100644
--- a/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp
+++ b/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp
@@ -50,7 +50,7 @@
 #include <QUndoStack>
 #include <QUndoView>
 
-#define DOCKSTATE_VERSION 1
+#define DOCKSTATE_VERSION 2
 
 //--------------------------------------------------------------------------------------------------
 ///
@@ -154,9 +154,17 @@ void RiuMainWindowBase::loadWinGeoAndDockToolBarLayout()
             }
         }
     }
+
+    bool dockingOk = false;
+
     if ( dockState.isValid() )
     {
-        m_dockManager->restoreState( dockState.toByteArray(), DOCKSTATE_VERSION );
+        dockingOk = m_dockManager->restoreState( dockState.toByteArray(), DOCKSTATE_VERSION );
+    }
+
+    if ( !dockingOk )
+    {
+        m_dockManager->restoreState( RiuDockWidgetTools::defaultDockState( defaultDockStateNames()[0] ), DOCKSTATE_VERSION );
     }
 
     settings.beginGroup( registryFolderName() );
@@ -692,11 +700,15 @@ void RiuMainWindowBase::saveDockLayout()
 //--------------------------------------------------------------------------------------------------
 void RiuMainWindowBase::addDefaultEntriesToWindowsMenu()
 {
-    QMenu* showHideMenu = m_windowMenu->addMenu( "Show/Hide Windows" );
+    QMenu* dockWindowsMenu = m_windowMenu->addMenu( QIcon( ":/window-management.svg" ), "Windows" );
 
-    for ( auto dock : dockManager()->dockWidgetsMap() )
+    auto dockMap = dockManager()->dockWidgetsMap();
+    auto keys    = dockMap.keys();
+    keys.sort();
+    for ( auto& key : keys )
     {
-        showHideMenu->addAction( dock->toggleViewAction() );
+        auto dock = dockMap[key];
+        dockWindowsMenu->addAction( dock->toggleViewAction() );
     }
     m_windowMenu->addSeparator();
 
diff --git a/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp b/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp
index 5ddaee005c..7813716ebd 100644
--- a/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp
+++ b/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp
@@ -89,9 +89,11 @@ RiuPlotMainWindow::RiuPlotMainWindow()
     m_mdiArea = new RiuMdiArea( this );
     connect( m_mdiArea, SIGNAL( subWindowActivated( QMdiSubWindow* ) ), SLOT( slotSubWindowActivated( QMdiSubWindow* ) ) );
 
-    ads::CDockWidget* widget = new ads::CDockWidget( "Plot Window", this );
-    widget->setWidget( m_mdiArea );
-    auto dockArea = dockManager()->setCentralWidget( widget );
+    ads::CDockWidget* cWidget =
+        RiuDockWidgetTools::createDockWidget( "Plot Window", RiuDockWidgetTools::mainPlotWindowName(), this );
+
+    cWidget->setWidget( m_mdiArea );
+    auto dockArea = dockManager()->setCentralWidget( cWidget );
     dockArea->setVisible( true );
 
     m_toggleSelectionLinkAction = new QAction( QIcon( ":/Link3DandPlots.png" ), tr( "Link With Selection in 3D" ), this );
@@ -524,8 +526,7 @@ void RiuPlotMainWindow::createDockPanels()
     // the project trees
     for ( int i = 0; i < nTreeViews; i++ )
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( treeViewTitles[i], dockManager() );
-        dockWidget->setObjectName( treeViewDockNames[i] );
+        auto dockWidget = RiuDockWidgetTools::createDockWidget( treeViewTitles[i], treeViewDockNames[i], dockManager() );
 
         caf::PdmUiTreeView* projectTree = projectTreeView( i );
         projectTree->enableSelectionManagerUpdating( true );
@@ -564,8 +565,9 @@ void RiuPlotMainWindow::createDockPanels()
 
     // the plot manager
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( "Plot Manager", dockManager() );
-        dockWidget->setObjectName( RiuDockWidgetTools::summaryPlotManagerName() );
+        auto dockWidget = RiuDockWidgetTools::createDockWidget( "Plot Manager",
+                                                                RiuDockWidgetTools::plotMainWindowPlotManagerName(),
+                                                                dockManager() );
 
         m_summaryPlotManagerView = std::make_unique<caf::PdmUiPropertyView>( dockWidget );
 
@@ -582,8 +584,10 @@ void RiuPlotMainWindow::createDockPanels()
     // the undo stack
     if ( m_undoView && RiaPreferences::current()->useUndoRedo() )
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( "Undo Stack", dockManager() );
-        dockWidget->setObjectName( RiuDockWidgetTools::plotMainWindowUndoStackName() );
+        auto dockWidget = RiuDockWidgetTools::createDockWidget( "Undo Stack",
+                                                                RiuDockWidgetTools::plotMainWindowUndoStackName(),
+                                                                dockManager() );
+
         dockWidget->setWidget( m_undoView );
         rightWidgets.push_back( dockWidget );
     }
@@ -596,8 +600,9 @@ void RiuPlotMainWindow::createDockPanels()
 
     // the property editor
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( "Property Editor", dockManager() );
-        dockWidget->setObjectName( RiuDockWidgetTools::plotMainWindowPropertyEditorName() );
+        auto dockWidget = RiuDockWidgetTools::createDockWidget( "Property Editor",
+                                                                RiuDockWidgetTools::plotMainWindowPropertyEditorName(),
+                                                                dockManager() );
 
         m_pdmUiPropertyView = std::make_unique<caf::PdmUiPropertyView>( dockWidget );
         dockWidget->setWidget( m_pdmUiPropertyView.get() );
@@ -606,8 +611,10 @@ void RiuPlotMainWindow::createDockPanels()
 
     // the log message view
     {
-        ads::CDockWidget* dockWidget = new ads::CDockWidget( "Messages", dockManager() );
-        dockWidget->setObjectName( RiuDockWidgetTools::plotMainWindowMessagesName() );
+        auto dockWidget = RiuDockWidgetTools::createDockWidget( "Messages",
+                                                                RiuDockWidgetTools::plotMainWindowMessagesName(),
+                                                                dockManager() );
+
         m_messagePanel = new RiuMessagePanel( dockWidget );
         dockWidget->setWidget( m_messagePanel );
         dockManager()->addDockWidget( ads::DockWidgetArea::BottomDockWidgetArea, dockWidget, rightArea );
@@ -806,7 +813,7 @@ RiuMessagePanel* RiuPlotMainWindow::messagePanel()
 void RiuPlotMainWindow::showAndSetKeyboardFocusToSummaryPlotManager()
 {
     auto dockWidget =
-        RiuDockWidgetTools::findDockWidget( this->dockManager(), RiuDockWidgetTools::summaryPlotManagerName() );
+        RiuDockWidgetTools::findDockWidget( this->dockManager(), RiuDockWidgetTools::plotMainWindowPlotManagerName() );
     if ( dockWidget )
     {
         dockWidget->setVisible( true );