diff --git a/res.qrc b/res.qrc
index f816bcfac..e2e92fec4 100644
--- a/res.qrc
+++ b/res.qrc
@@ -102,6 +102,7 @@
         <file>themes/default/fileTransferInstance/filetransferWidget.css</file>
         <file>themes/default/acceptCall/acceptCall.svg</file>
         <file>themes/default/rejectCall/rejectCall.svg</file>
+        <file>themes/default/global.css</file>
         <file>img/login_logo.svg</file>
         <file>themes/default/notificationEdge/notificationEdge.css</file>
         <file>themes/default/loginScreen/loginScreen.css</file>
diff --git a/src/main.cpp b/src/main.cpp
index 69e592a6b..770a93abb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,6 +26,7 @@
 #include "src/persistence/toxsave.h"
 #include "src/video/camerasource.h"
 #include "src/widget/loginscreen.h"
+#include "src/widget/style.h"
 #include "src/widget/translator.h"
 #include "widget/widget.h"
 #include <QApplication>
@@ -371,6 +372,8 @@ int main(int argc, char* argv[])
 
     QObject::connect(a.get(), &QApplication::aboutToQuit, cleanup);
 
+    a->setStyleSheet(Style::getStylesheet(QStringLiteral("global.css")));
+
     // Run
     int errorcode = a->exec();
 
diff --git a/themes/default/friendList/friendList.css b/themes/default/friendList/friendList.css
index 3e18a085e..d786f1d5f 100644
--- a/themes/default/friendList/friendList.css
+++ b/themes/default/friendList/friendList.css
@@ -78,3 +78,7 @@ QWidget#circleWidgetContainer > QLabel#name
     font: @big;
     color: @white;
 }
+
+QLabel {
+    color: white
+}
diff --git a/themes/default/global.css b/themes/default/global.css
new file mode 100644
index 000000000..5d87223b7
--- /dev/null
+++ b/themes/default/global.css
@@ -0,0 +1,24 @@
+QLabel
+{
+    color: black
+}
+
+QLineEdit
+{
+    color: black
+}
+
+QTextEdit
+{
+    color: black
+}
+
+QSpinBox
+{
+    color: black
+} 
+
+QListView
+{
+    color: black
+}
diff --git a/themes/default/loginScreen/loginScreen.css b/themes/default/loginScreen/loginScreen.css
index 074070f05..994cef04e 100644
--- a/themes/default/loginScreen/loginScreen.css
+++ b/themes/default/loginScreen/loginScreen.css
@@ -62,6 +62,16 @@ QLabel, QCheckBox, QProgressBar
     color: black;
 }
 
+QLineEdit
+{
+    color: #f1f1f1
+}
+
+QListView
+{
+    color: #f1f1f1
+}
+
 QCheckBox:disabled
 {
     color: gray;
diff --git a/themes/default/settings/mainContent.css b/themes/default/settings/mainContent.css
index 3adf2d24f..7d015bc6a 100644
--- a/themes/default/settings/mainContent.css
+++ b/themes/default/settings/mainContent.css
@@ -69,6 +69,11 @@ QTabWidget
     background-color: white;
 }
 
+QTabBar::tab:!selected 
+{
+    color: #5e5e5e;
+}
+
 QScrollArea
 {
     background-color: white;