diff --git a/qml/components/ConnectionDelegate.qml b/qml/components/ConnectionDelegate.qml
index cefa04b..b6edc0c 100644
--- a/qml/components/ConnectionDelegate.qml
+++ b/qml/components/ConnectionDelegate.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import QtQuick.Controls 2.2
 
-ItemDelegate {
+SmoothItemDelegate {
     id: control
     property var status
     property var connect
@@ -38,9 +38,10 @@ ItemDelegate {
         id: statusItem
         anchors {
             right: parent.right
+            rightMargin: ( height / control.height / 2 ) * height
             verticalCenter: parent.verticalCenter
         }
-        height: parent.font.pixelSize
+        height: parent.font.pixelSize * 0.8
         width: height
 
         Rectangle {
diff --git a/qml/components/NextPageDelegate.qml b/qml/components/NextPageDelegate.qml
index 914b9dc..e294c34 100644
--- a/qml/components/NextPageDelegate.qml
+++ b/qml/components/NextPageDelegate.qml
@@ -1,19 +1,9 @@
 import QtQuick 2.0
 import QtQuick.Controls 2.2
 
-ItemDelegate {
+SmoothItemDelegate {
     id: control
     text: ""
-    font.pixelSize: options_stack.text_pixelSize
-    property color textColor: appTheme.style.textColor
-
-    contentItem: Text {
-        text: parent.text
-        color: control.textColor
-        font.pixelSize: parent.font.pixelSize
-    }
-
-    width: parent.width
 
     Image {
         id: forwardImage