diff --git a/components/PrivacyLevel.qml b/components/PrivacyLevel.qml
index 332c1e8a..3528db92 100644
--- a/components/PrivacyLevel.qml
+++ b/components/PrivacyLevel.qml
@@ -116,7 +116,7 @@ Item {
 
         Row {
             id: row2
-            spacing: ((bar.width - 8) / 2) / 4
+            spacing: bar.width / 14
 
             Repeater {
                 model: 4
@@ -125,7 +125,7 @@ Item {
                     id: delegateItem2
                     currentX: x + row2.x
                     currentIndex: index
-                    mainTick: currentIndex === 0 || currentIndex === 3 || currentIndex === 13
+                    mainTick: currentIndex === 0
                     Component.onCompleted: {
                         row.positions[currentIndex] = delegateItem2
                     }
@@ -135,7 +135,7 @@ Item {
 
         Row {
             id: row1
-            spacing: ((bar.width - 8) / 2) / 10
+            spacing: bar.width / 14
 
             Repeater {
                 model: 10
@@ -144,7 +144,7 @@ Item {
                     id: delegateItem1
                     currentX: x + row1.x
                     currentIndex: index + 4
-                    mainTick: currentIndex === 0 || currentIndex === 3 || currentIndex === 13
+                    mainTick: currentIndex === 13
                     Component.onCompleted: {
                         row.positions[currentIndex] = delegateItem1
                     }
diff --git a/components/TickDelegate.qml b/components/TickDelegate.qml
index 2dfbddd9..3b256a2d 100644
--- a/components/TickDelegate.qml
+++ b/components/TickDelegate.qml
@@ -53,7 +53,6 @@ Item {
             color: "#4A4949"
             text: {
                 if(currentIndex === 0) return qsTr("Normal") + translationManager.emptyString
-                if(currentIndex === 3) return qsTr("Medium") + translationManager.emptyString
                 if(currentIndex === 13) return qsTr("High") + translationManager.emptyString
                 return ""
             }
@@ -65,7 +64,7 @@ Item {
         anchors.topMargin: 14
         width: 1
         color: "#DBDBDB"
-        height: currentIndex === 8 ? 16 : 8
+        height:  8
         visible: !parent.mainTick
     }
 }
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 7ca97750..13f20bce 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -45,7 +45,7 @@ Rectangle {
     property bool showAdvanced: false
 
     function scaleValueToMixinCount(scaleValue) {
-        var scaleToMixinCount = [4,5,6,7,8,9,10,11,12,13,14,15,20,25];
+        var scaleToMixinCount = [4,5,6,7,8,9,10,11,12,14,16,18,21,25];
         if (scaleValue < scaleToMixinCount.length) {
             return scaleToMixinCount[scaleValue];
         } else {