diff --git a/bin/app/data/color_schemes/dark.xml b/bin/app/data/color_schemes/dark.xml
index cd3cfdf7..34f99f73 100644
--- a/bin/app/data/color_schemes/dark.xml
+++ b/bin/app/data/color_schemes/dark.xml
@@ -10,8 +10,8 @@
 		</scrollbar>
 		<dock>
 			<text>#F7F7F7</text>
-			<background>#777777</background>
-			<line>#A0A0A0</line>
+			<background>#555555</background>
+			<line>#808080</line>
 			<icon_type>white</icon_type> <!-- white, grey, black -->
 		</dock>
 	</window>
@@ -460,7 +460,7 @@
 	</table>
 
 	<screen_search>
-		<background>#777777</background>
+		<background>#555555</background>
 		<box>
 			<background>#272728</background>
 			<text>#F7F7F7</text>
diff --git a/bin/app/data/gui/main/main.css b/bin/app/data/gui/main/main.css
index 18525e99..118f1958 100644
--- a/bin/app/data/gui/main/main.css
+++ b/bin/app/data/gui/main/main.css
@@ -25,7 +25,15 @@ QDockWidget::title {
 
 QDockWidget::close-button, QDockWidget::float-button {
 	background: transparent;
-	border: none;
+	border: <platform_wml:0|0|1>px solid transparent;
 	icon-size: 12px;
-	margin-top: 2px;
+	margin-top: <platform_wml:0|2|2>px;
+}
+
+QDockWidget::close-button {
+	margin-left: <platform_wml:0|2|0>px;
+}
+
+QDockWidget::float-button {
+	margin-right: <platform_wml:0|2|0>px;
 }
diff --git a/bin/app/data/gui/tabbed_view/tabbed_view.css b/bin/app/data/gui/tabbed_view/tabbed_view.css
index dc206af3..b73eadcc 100644
--- a/bin/app/data/gui/tabbed_view/tabbed_view.css
+++ b/bin/app/data/gui/tabbed_view/tabbed_view.css
@@ -86,6 +86,10 @@ QTableView QTableCornerButton::section {
 	border-top-left-radius: 10px;
 }
 
+QCheckBox {
+	color: <color:table/text/normal>;
+}
+
 #help_button {
 	background: transparent;
 	border: none;
diff --git a/src/lib_gui/qt/utility/utilityQt.cpp b/src/lib_gui/qt/utility/utilityQt.cpp
index a8cdd0f9..4024ddd0 100644
--- a/src/lib_gui/qt/utility/utilityQt.cpp
+++ b/src/lib_gui/qt/utility/utilityQt.cpp
@@ -14,6 +14,7 @@
 #include "utility/logging/logging.h"
 #include "utility/ResourcePaths.h"
 #include "utility/text/TextAccess.h"
+#include "utility/utilityApp.h"
 #include "utility/utilityString.h"
 
 #include "settings/ApplicationSettings.h"
@@ -168,6 +169,23 @@ namespace utility
 			{
 				val = ColorScheme::getInstance()->getColor(val);
 			}
+			else if (key == "platform_wml")
+			{
+				std::vector<std::string> values = utility::splitToVector(val, '|');
+				if (values.size() != 3)
+				{
+					LOG_ERROR("Syntax error in file: " + path.str());
+					return "";
+				}
+
+				switch (utility::getOsType())
+				{
+					case OS_WINDOWS: val = values[0]; break;
+					case OS_MAC: val = values[1]; break;
+					case OS_LINUX: val = values[2]; break;
+					default: break;
+				}
+			}
 			else
 			{
 				LOG_ERROR("Syntax error in file: " + path.str());
diff --git a/src/lib_gui/qt/utility/utilityQt.h b/src/lib_gui/qt/utility/utilityQt.h
index e821f99a..84f46317 100644
--- a/src/lib_gui/qt/utility/utilityQt.h
+++ b/src/lib_gui/qt/utility/utilityQt.h
@@ -3,12 +3,12 @@
 
 #include <string>
 
+class FilePath;
 class QColor;
 class QIcon;
 class QPixmap;
 class QString;
 class QWidget;
-class FilePath;
 
 namespace utility
 {
@@ -25,4 +25,4 @@ namespace utility
 	void copyNewFilesFromDirectory(QString src, QString dst);
 }
 
-# endif // UTILITY_QT_H
+#endif // UTILITY_QT_H