diff --git a/app/main.cpp b/app/main.cpp
index b2a74d5..386bded 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -41,11 +41,11 @@ int main(int argc, char *argv[])
 #if defined(Q_OS_MAC)
     // This allows UTF-8 characters usage in OSX.
     setenv("LC_CTYPE", "UTF-8", 1);
-
-    // Force fusion style on macOS
-    QQuickStyle::setStyle("Fusion");
 #endif
 
+    // Force fusion style on every platform
+    QQuickStyle::setStyle("Fusion");
+
     if (argc>1 && (!strcmp(argv[1],"-h") || !strcmp(argv[1],"--help"))) {
         QTextStream cout(stdout, QIODevice::WriteOnly);
         cout << "Usage: " << argv[0] << " [--default-settings] [--workdir <dir>] [--program <prog>] [-p|--profile <prof>] [--fullscreen] [-h|--help]" << endl;
diff --git a/app/qml/SettingsWindow.qml b/app/qml/SettingsWindow.qml
index 0c0a8e1..1009aa2 100644
--- a/app/qml/SettingsWindow.qml
+++ b/app/qml/SettingsWindow.qml
@@ -27,42 +27,49 @@ import QtQuick.Dialogs 1.1
 Window {
     id: settings_window
     title: qsTr("Settings")
-    width: 800
-    height: 600
+    width: 600
+    height: 480
 
     property int tabmargins: 15
 
-    TabBar {
-        id: bar
-        anchors { left: parent.left; right: parent.right; top: parent.top }
-        TabButton {
-            text: qsTr("General")
-        }
-        TabButton {
-            text: qsTr("Terminal")
-        }
-        TabButton {
-            text: qsTr("Effects")
-        }
-        TabButton {
-            text: qsTr("Advanced")
-        }
-    }
+    Item {
+        anchors { fill: parent;  margins: tabmargins }
 
-    StackLayout {
-        anchors {
-            top: bar.bottom
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-            margins: tabmargins
+        TabBar {
+            id: bar
+            anchors { left: parent.left; right: parent.right; top: parent.top; }
+            TabButton {
+                text: qsTr("General")
+            }
+            TabButton {
+                text: qsTr("Terminal")
+            }
+            TabButton {
+                text: qsTr("Effects")
+            }
+            TabButton {
+                text: qsTr("Advanced")
+            }
         }
 
-        currentIndex: bar.currentIndex
+        Frame {
+            anchors {
+                top: bar.bottom
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+            }
 
-        SettingsGeneralTab { }
-        SettingsTerminalTab { }
-        SettingsEffectsTab { }
-        SettingsAdvancedTab { }
+            StackLayout {
+                anchors.fill: parent
+
+                currentIndex: bar.currentIndex
+
+                SettingsGeneralTab { }
+                SettingsTerminalTab { }
+                SettingsEffectsTab { }
+                SettingsAdvancedTab { }
+            }
+        }
     }
 }
diff --git a/qmltermwidget b/qmltermwidget
index 997bdaa..e9ea684 160000
--- a/qmltermwidget
+++ b/qmltermwidget
@@ -1 +1 @@
-Subproject commit 997bdaa832609afc480e1153d458eff9692705e2
+Subproject commit e9ea68473416f7de6ec927ac72d144a0f464c490