diff --git a/photobooth/gui/Qt5Gui/Frames.py b/photobooth/gui/Qt5Gui/Frames.py
index 8efd287..2f2b48a 100644
--- a/photobooth/gui/Qt5Gui/Frames.py
+++ b/photobooth/gui/Qt5Gui/Frames.py
@@ -457,7 +457,7 @@ class Settings(QtWidgets.QFrame):
 
         layout = QtWidgets.QVBoxLayout()
         layout.addWidget(self.createTabs())
-        layout.addStretch(1)
+        # layout.addStretch(1)
         layout.addWidget(self.createButtons())
         self.setLayout(layout)
 
diff --git a/photobooth/gui/Qt5Gui/images/checkmark.png b/photobooth/gui/Qt5Gui/images/checkmark.png
index 44868ff..d04adb5 100644
Binary files a/photobooth/gui/Qt5Gui/images/checkmark.png and b/photobooth/gui/Qt5Gui/images/checkmark.png differ
diff --git a/photobooth/gui/Qt5Gui/images/down.png b/photobooth/gui/Qt5Gui/images/down.png
deleted file mode 100644
index a5012aa..0000000
Binary files a/photobooth/gui/Qt5Gui/images/down.png and /dev/null differ
diff --git a/photobooth/gui/Qt5Gui/images/up-down.svg b/photobooth/gui/Qt5Gui/images/up-down.svg
deleted file mode 100644
index 318c4d5..0000000
--- a/photobooth/gui/Qt5Gui/images/up-down.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="2.5244994mm"
-   height="3.3670478mm"
-   viewBox="0 0 2.5244994 3.3670478"
-   version="1.1"
-   id="svg1335"
-   inkscape:version="0.92.3 (unknown)"
-   sodipodi:docname="up-down.svg">
-  <defs
-     id="defs1329">
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lend"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path1903"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-25.987692"
-     inkscape:cy="101.94875"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1855"
-     inkscape:window-height="1056"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata1332">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-87.944799,-119.45095)">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 89.202381,120.33484 V 122.375"
-       id="path1337"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-  </g>
-</svg>
diff --git a/photobooth/gui/Qt5Gui/images/up.png b/photobooth/gui/Qt5Gui/images/up.png
deleted file mode 100644
index 640acf6..0000000
Binary files a/photobooth/gui/Qt5Gui/images/up.png and /dev/null differ
diff --git a/photobooth/gui/Qt5Gui/stylesheets/dark.qss b/photobooth/gui/Qt5Gui/stylesheets/dark.qss
index d837ffa..80201e7 100644
--- a/photobooth/gui/Qt5Gui/stylesheets/dark.qss
+++ b/photobooth/gui/Qt5Gui/stylesheets/dark.qss
@@ -55,18 +55,20 @@ QFrame#IdleMessage QPushButton:pressed {
 /* Greeter Screen */
 
 QFrame#GreeterMessage {
-    padding: 50px;
+    padding: 30px;
 }
 
 QFrame#GreeterMessage QLabel#title {
     font-size: 180px;
+    margin: 0;
+    padding: 0;
     qproperty-alignment: AlignCenter;
 }
 
 QFrame#GreeterMessage QPushButton#button {
     border: none;
     font-size: 120px;
-    margin: 60px 0 20px 0;
+    margin: 0;
     min-height: 160px;
     padding: 0;
     text-align: center;
@@ -74,6 +76,8 @@ QFrame#GreeterMessage QPushButton#button {
 
 QFrame#GreeterMessage QLabel#message {
     font-size: 120px;
+    margin: 0;
+    padding: 0;
     qproperty-alignment: AlignCenter;
 }
 
diff --git a/photobooth/gui/Qt5Gui/stylesheets/pastel.qss b/photobooth/gui/Qt5Gui/stylesheets/pastel.qss
index 8c47e02..35d5810 100644
--- a/photobooth/gui/Qt5Gui/stylesheets/pastel.qss
+++ b/photobooth/gui/Qt5Gui/stylesheets/pastel.qss
@@ -55,18 +55,20 @@ QFrame#IdleMessage QPushButton:pressed {
 /* Greeter Screen */
 
 QFrame#GreeterMessage {
-    padding: 50px;
+    padding: 30px;
 }
 
 QFrame#GreeterMessage QLabel#title {
     font-size: 180px;
+    margin: 0;
+    padding: 0;
     qproperty-alignment: AlignCenter;
 }
 
 QFrame#GreeterMessage QPushButton#button {
     border: none;
     font-size: 120px;
-    margin: 60px 0 20px 0;
+    margin: 0;
     min-height: 160px;
     padding: 0;
     text-align: center;
@@ -74,6 +76,8 @@ QFrame#GreeterMessage QPushButton#button {
 
 QFrame#GreeterMessage QLabel#message {
     font-size: 120px;
+    margin: 0;
+    padding: 0;
     qproperty-alignment: AlignCenter;
 }
 
@@ -187,11 +191,12 @@ QTabBar::tab:selected {
 
 QTabWidget QWidget {
     color: #333333;
+    font-size: 30px;
 }
 
 QCheckBox::indicator {
-    width: 45px;
-    height: 45px;
+    width: 30px;
+    height: 30px;
     background-color: transparent;
     border-style: outset;
     border-width: 2px;
@@ -207,6 +212,7 @@ QCheckBox::indicator::checked {
 QComboBox, QDateEdit, QLineEdit, QSpinBox, QTimeEdit {
     background-color: #eeeeee;
     color: #333333;
+    font-size: 30px;
 }
 
 QComboBox QAbstractItemView {