diff --git a/bin/app/data/color_schemes/bad_rainbow.xml b/bin/app/data/color_schemes/bad_rainbow.xml
index 21a28fc9..8d15f855 100644
--- a/bin/app/data/color_schemes/bad_rainbow.xml
+++ b/bin/app/data/color_schemes/bad_rainbow.xml
@@ -8,6 +8,12 @@
 			<handle>#80999999</handle>
 			<line>#80999999</line>
 		</scrollbar>
+		<dock>
+			<text>white</text>
+			<background>#808080</background>
+			<line>#A0A0A0</line>
+			<icon_type>white</icon_type> <!-- white, grey, black -->
+		</dock>
 	</window>
 
 	<search>
@@ -86,7 +92,7 @@
 
 		<navigation>
 			<background>#494949</background>
-			<text>#A0A0A0</text>
+			<text>#CCCCCC</text>
 			<line>#999</line>
 		</navigation>
 
@@ -487,7 +493,7 @@
 		<box>
 			<background>#494949</background>
 			<text>#D4D4D4</text>
-			<match_label>#A0A0A0</match_label>
+			<match_label>#CCCCCC</match_label>
 		</box>
 		<filter>white</filter>
 		<button>
diff --git a/bin/app/data/color_schemes/bright.xml b/bin/app/data/color_schemes/bright.xml
index 2a06b4cb..547f878b 100644
--- a/bin/app/data/color_schemes/bright.xml
+++ b/bin/app/data/color_schemes/bright.xml
@@ -8,6 +8,12 @@
 			<handle>#80999999</handle>
 			<line>#80999999</line>
 		</scrollbar>
+		<dock>
+			<text>black</text>
+			<background>#E0E0E0</background>
+			<line>#BEBEBE</line>
+			<icon_type>grey</icon_type> <!-- white, grey, black -->
+		</dock>
 	</window>
 
 	<search>
@@ -86,7 +92,7 @@
 
 		<navigation>
 			<background>white</background>
-			<text>#A2A2A2</text>
+			<text>#727272</text>
 			<line>#D2D2D2</line>
 		</navigation>
 
@@ -448,7 +454,7 @@
 		<box>
 			<background>white</background>
 			<text>black</text>
-			<match_label>#A0A0A0</match_label>
+			<match_label>#727272</match_label>
 		</box>
 		<filter>black</filter>
 		<button>
diff --git a/bin/app/data/color_schemes/dark.xml b/bin/app/data/color_schemes/dark.xml
index df5f55da..cd3cfdf7 100644
--- a/bin/app/data/color_schemes/dark.xml
+++ b/bin/app/data/color_schemes/dark.xml
@@ -2,12 +2,18 @@
 
 <config>
 	<window>
-		<separator>#AAA</separator>
+		<separator>#CCC</separator>
 		<scrollbar>
 			<background>transparent</background>
 			<handle>#80999999</handle>
 			<line>#80999999</line>
 		</scrollbar>
+		<dock>
+			<text>#F7F7F7</text>
+			<background>#777777</background>
+			<line>#A0A0A0</line>
+			<icon_type>white</icon_type> <!-- white, grey, black -->
+		</dock>
 	</window>
 
 	<search>
@@ -86,7 +92,7 @@
 
 		<navigation>
 			<background>#272728</background>
-			<text>#A0A0A0</text>
+			<text>#C5C5C5</text>
 			<line>#525253</line>
 		</navigation>
 
@@ -458,7 +464,7 @@
 		<box>
 			<background>#272728</background>
 			<text>#F7F7F7</text>
-			<match_label>#A0A0A0</match_label>
+			<match_label>#C5C5C5</match_label>
 		</box>
 		<filter>#F7F7F7</filter>
 		<button>
diff --git a/bin/app/data/gui/main.css b/bin/app/data/gui/main.css
deleted file mode 100644
index 8b136109..00000000
--- a/bin/app/data/gui/main.css
+++ /dev/null
@@ -1,10 +0,0 @@
-QToolTip {
-	background-color: #E0E0E0;
-	color: black;
-	font-size: <setting:font_size>px;
-}
-
-QMainWindow::separator {
-	background: <color:window/separator>;
-	width: 1px;
-}
diff --git a/bin/app/data/gui/main/images/close_black.png b/bin/app/data/gui/main/images/close_black.png
new file mode 100755
index 00000000..fe3aebfa
Binary files /dev/null and b/bin/app/data/gui/main/images/close_black.png differ
diff --git a/bin/app/data/gui/main/images/close_grey.png b/bin/app/data/gui/main/images/close_grey.png
new file mode 100755
index 00000000..fa87dc94
Binary files /dev/null and b/bin/app/data/gui/main/images/close_grey.png differ
diff --git a/bin/app/data/gui/main/images/close_white.png b/bin/app/data/gui/main/images/close_white.png
new file mode 100755
index 00000000..bc32bd7f
Binary files /dev/null and b/bin/app/data/gui/main/images/close_white.png differ
diff --git a/bin/app/data/gui/main/images/float_black.png b/bin/app/data/gui/main/images/float_black.png
new file mode 100644
index 00000000..ec887a20
Binary files /dev/null and b/bin/app/data/gui/main/images/float_black.png differ
diff --git a/bin/app/data/gui/main/images/float_grey.png b/bin/app/data/gui/main/images/float_grey.png
new file mode 100644
index 00000000..eaac7e92
Binary files /dev/null and b/bin/app/data/gui/main/images/float_grey.png differ
diff --git a/bin/app/data/gui/main/images/float_white.png b/bin/app/data/gui/main/images/float_white.png
new file mode 100644
index 00000000..66e43160
Binary files /dev/null and b/bin/app/data/gui/main/images/float_white.png differ
diff --git a/bin/app/data/gui/main/main.css b/bin/app/data/gui/main/main.css
new file mode 100644
index 00000000..18525e99
--- /dev/null
+++ b/bin/app/data/gui/main/main.css
@@ -0,0 +1,31 @@
+QToolTip {
+	background-color: #E0E0E0;
+	color: black;
+	font-size: <setting:font_size>px;
+}
+
+QMainWindow::separator {
+	background: <color:window/separator>;
+	width: 1px;
+}
+
+QDockWidget {
+	color: <color:window/dock/text>;
+	font-size: 10pt;
+	titlebar-close-icon: url(<setting:gui_path>main/images/close_<color:window/dock/icon_type>.png);
+	titlebar-normal-icon: url(<setting:gui_path>main/images/float_<color:window/dock/icon_type>.png);
+}
+
+QDockWidget::title {
+	border-bottom: 1px solid <color:window/dock/line>;
+	background: <color:window/dock/background>;
+	text-align: center;
+	padding-top: 1px;
+}
+
+QDockWidget::close-button, QDockWidget::float-button {
+	background: transparent;
+	border: none;
+	icon-size: 12px;
+	margin-top: 2px;
+}
diff --git a/bin/app/data/gui/scrollbar.css b/bin/app/data/gui/main/scrollbar.css
similarity index 100%
rename from bin/app/data/gui/scrollbar.css
rename to bin/app/data/gui/main/scrollbar.css
diff --git a/src/lib/Application.cpp b/src/lib/Application.cpp
index bb589d8f..7a943c06 100644
--- a/src/lib/Application.cpp
+++ b/src/lib/Application.cpp
@@ -62,6 +62,7 @@ void Application::createInstance(
 		s_instance->m_componentManager->setup(s_instance->m_mainView.get());
 		s_instance->m_mainView->loadLayout();
 
+		s_instance->m_componentManager->refreshViews();
 	}
 
 	if (networkFactory != nullptr)
diff --git a/src/lib_gui/qt/view/QtCodeView.cpp b/src/lib_gui/qt/view/QtCodeView.cpp
index 1894b7f0..eea1248d 100644
--- a/src/lib_gui/qt/view/QtCodeView.cpp
+++ b/src/lib_gui/qt/view/QtCodeView.cpp
@@ -14,7 +14,6 @@ QtCodeView::QtCodeView(ViewLayout* viewLayout)
 	: CodeView(viewLayout)
 {
 	m_widget = new QtCodeNavigator();
-	setStyleSheet();
 }
 
 QtCodeView::~QtCodeView()
diff --git a/src/lib_gui/qt/view/QtErrorView.cpp b/src/lib_gui/qt/view/QtErrorView.cpp
index cc43a392..19e597e8 100644
--- a/src/lib_gui/qt/view/QtErrorView.cpp
+++ b/src/lib_gui/qt/view/QtErrorView.cpp
@@ -180,8 +180,6 @@ void QtErrorView::initView()
 	checkboxes->addSpacing(10);
 
 	layout->addLayout(checkboxes);
-
-	setStyleSheet();
 }
 
 void QtErrorView::refreshView()
diff --git a/src/lib_gui/qt/view/QtGraphView.cpp b/src/lib_gui/qt/view/QtGraphView.cpp
index 18646747..608dad0e 100644
--- a/src/lib_gui/qt/view/QtGraphView.cpp
+++ b/src/lib_gui/qt/view/QtGraphView.cpp
@@ -150,8 +150,6 @@ void QtGraphView::initView()
 		updateTrailButtons();
 		trailDepthChanged(0);
 	}
-
-	refreshView();
 }
 
 void QtGraphView::refreshView()
diff --git a/src/lib_gui/qt/view/QtRefreshView.cpp b/src/lib_gui/qt/view/QtRefreshView.cpp
index 683278cb..62aa4a8c 100644
--- a/src/lib_gui/qt/view/QtRefreshView.cpp
+++ b/src/lib_gui/qt/view/QtRefreshView.cpp
@@ -9,7 +9,6 @@ QtRefreshView::QtRefreshView(ViewLayout* viewLayout)
 	: RefreshView(viewLayout)
 {
 	m_widget = new QtRefreshBar();
-	setStyleSheet();
 }
 
 QtRefreshView::~QtRefreshView()
diff --git a/src/lib_gui/qt/view/QtSearchView.cpp b/src/lib_gui/qt/view/QtSearchView.cpp
index 69bf7fad..98d71dd0 100644
--- a/src/lib_gui/qt/view/QtSearchView.cpp
+++ b/src/lib_gui/qt/view/QtSearchView.cpp
@@ -11,7 +11,6 @@ QtSearchView::QtSearchView(ViewLayout* viewLayout)
 	: SearchView(viewLayout)
 {
 	m_widget = new QtSearchBar();
-	setStyleSheet();
 }
 
 QtSearchView::~QtSearchView()
diff --git a/src/lib_gui/qt/view/QtStatusView.cpp b/src/lib_gui/qt/view/QtStatusView.cpp
index 4e605acd..a7a63292 100644
--- a/src/lib_gui/qt/view/QtStatusView.cpp
+++ b/src/lib_gui/qt/view/QtStatusView.cpp
@@ -74,8 +74,6 @@ void QtStatusView::initView()
 	filters->addSpacing(10);
 
 	layout->addLayout(filters);
-
-	refreshView();
 }
 
 void QtStatusView::refreshView()
diff --git a/src/lib_gui/qt/view/QtUndoRedoView.cpp b/src/lib_gui/qt/view/QtUndoRedoView.cpp
index a7d6b6e8..8b2c8161 100644
--- a/src/lib_gui/qt/view/QtUndoRedoView.cpp
+++ b/src/lib_gui/qt/view/QtUndoRedoView.cpp
@@ -9,7 +9,6 @@ QtUndoRedoView::QtUndoRedoView(ViewLayout* viewLayout)
 	: UndoRedoView(viewLayout)
 {
 	m_widget = new QtUndoRedo();
-	setStyleSheet();
 }
 
 QtUndoRedoView::~QtUndoRedoView()
diff --git a/src/lib_gui/qt/window/QtMainWindow.cpp b/src/lib_gui/qt/window/QtMainWindow.cpp
index 7d98a926..3d8903a2 100644
--- a/src/lib_gui/qt/window/QtMainWindow.cpp
+++ b/src/lib_gui/qt/window/QtMainWindow.cpp
@@ -128,7 +128,7 @@ QtMainWindow::QtMainWindow()
 	{
 		// can only be done once, because resetting the style on the QCoreApplication causes crash
 		app->setStyleSheet(
-			utility::getStyleSheet(ResourcePaths::getGuiPath().concatenate(FilePath("scrollbar.css"))).c_str());
+			utility::getStyleSheet(ResourcePaths::getGuiPath().concatenate(FilePath("main/scrollbar.css"))).c_str());
 	}
 
 	m_recentProjectAction = new QAction*[ApplicationSettings::getInstance()->getMaxRecentProjectsCount()];
@@ -379,7 +379,7 @@ void QtMainWindow::setContentEnabled(bool enabled)
 
 void QtMainWindow::refreshStyle()
 {
-	setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiPath().concatenate(FilePath("main.css"))).c_str());
+	setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiPath().concatenate(FilePath("main/main.css"))).c_str());
 }
 
 void QtMainWindow::keyPressEvent(QKeyEvent* event)
@@ -685,7 +685,7 @@ void QtMainWindow::resetWindowLayout()
 {
 	FileSystem::remove(UserPaths::getWindowSettingsPath());
 	FileSystem::copyFile(
-		ResourcePaths::getFallbackPath().concatenate(FilePath("window_settings.ini")), 
+		ResourcePaths::getFallbackPath().concatenate(FilePath("window_settings.ini")),
 		UserPaths::getWindowSettingsPath()
 	);
 	loadDockWidgetLayout();
@@ -851,15 +851,15 @@ void QtMainWindow::setupViewMenu()
 	m_showTitleBarsAction->setChecked(m_showDockWidgetTitleBars);
 	connect(m_showTitleBarsAction, &QAction::triggered, this, &QtMainWindow::toggleShowDockWidgetTitleBars);
 	menu->addAction(m_showTitleBarsAction);
+	menu->addAction(tr("Reset Window Layout"), this, &QtMainWindow::resetWindowLayout);
 
 	menu->addSeparator();
 
 	m_viewSeparator = menu->addSeparator();
 
-	menu->addAction(tr("Larger font"), this, &QtMainWindow::zoomIn, QKeySequence::ZoomIn);
-	menu->addAction(tr("Smaller font"), this, &QtMainWindow::zoomOut, QKeySequence::ZoomOut);
-	menu->addAction(tr("Reset font size"), this, &QtMainWindow::resetZoom, QKeySequence(Qt::CTRL + Qt::Key_0));
-	menu->addAction(tr("Reset window layout"), this, &QtMainWindow::resetWindowLayout);
+	menu->addAction(tr("Larger Font"), this, &QtMainWindow::zoomIn, QKeySequence::ZoomIn);
+	menu->addAction(tr("Smaller Font"), this, &QtMainWindow::zoomOut, QKeySequence::ZoomOut);
+	menu->addAction(tr("Reset Font Size"), this, &QtMainWindow::resetZoom, QKeySequence(Qt::CTRL + Qt::Key_0));
 
 	m_viewMenu = menu;
 }