diff --git a/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift b/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift
index f2cbe56f0f..f2d6144816 100644
--- a/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift
+++ b/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift
@@ -236,7 +236,6 @@ public class ItemListSwitchItemNode: ListViewItemNode, ItemListItemNode {
             if !item.enabled {
                 if currentDisabledOverlayNode == nil {
                     currentDisabledOverlayNode = ASDisplayNode()
-                    currentDisabledOverlayNode?.backgroundColor = itemBackgroundColor.withAlphaComponent(0.6)
                 }
             } else {
                 currentDisabledOverlayNode = nil
@@ -278,6 +277,7 @@ public class ItemListSwitchItemNode: ListViewItemNode, ItemListItemNode {
                         } else {
                             transition.updateFrame(node: currentDisabledOverlayNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: layout.contentSize.width, height: layout.contentSize.height - separatorHeight)))
                         }
+                        currentDisabledOverlayNode.backgroundColor = itemBackgroundColor.withAlphaComponent(0.6)
                     } else if let disabledOverlayNode = strongSelf.disabledOverlayNode {
                         transition.updateAlpha(node: disabledOverlayNode, alpha: 0.0, completion: { [weak disabledOverlayNode] _ in
                             disabledOverlayNode?.removeFromSupernode()
diff --git a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionItem.swift b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionItem.swift
index e11d1b0a1e..a279d1cb8c 100644
--- a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionItem.swift	
+++ b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionItem.swift	
@@ -133,6 +133,7 @@ class BubbleSettingsRadiusItemNode: ListViewItemNode, ItemListItemNode {
         sliderView.maximumValue = 4.0
         sliderView.startValue = 0.0
         sliderView.positionsCount = 5
+        sliderView.useLinesForPositions = true
         sliderView.disablesInteractiveTransitionGestureRecognizer = true
         if let item = self.item, let params = self.layoutParams {
             sliderView.isUserInteractionEnabled = item.enabled
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift
index 17e2b12ea4..03682cadfc 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift
@@ -131,6 +131,7 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode {
         sliderView.maximumValue = 6.0
         sliderView.startValue = 0.0
         sliderView.positionsCount = 7
+        sliderView.useLinesForPositions = true
         sliderView.disablesInteractiveTransitionGestureRecognizer = true
         if let item = self.item, let params = self.layoutParams {
             sliderView.isUserInteractionEnabled = item.enabled
diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift
index 1a3c444876..cbd2869fa1 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift
@@ -2089,7 +2089,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
                 }
             }
             if self.isSettings {
-                titleString = NSAttributedString(string: title, font: Font.semibold(26.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
+                titleString = NSAttributedString(string: title, font: Font.medium(29.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
                 smallTitleString = NSAttributedString(string: title, font: Font.semibold(28.0), textColor: .white)
             } else {
                 titleString = NSAttributedString(string: title, font: Font.semibold(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
@@ -2200,7 +2200,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
             let minTitleSize = CGSize(width: titleSize.width * 0.7, height: titleSize.height * 0.7)
             let minTitleFrame: CGRect
             if self.isSettings {
-                minTitleFrame = CGRect(origin: CGPoint(x: 16.0, y: expandedAvatarHeight - 58.0 + (subtitleSize.height.isZero ? 10.0 : 0.0)), size: minTitleSize)
+                minTitleFrame = CGRect(origin: CGPoint(x: 16.0, y: expandedAvatarHeight - 58.0 - UIScreenPixel + (subtitleSize.height.isZero ? 10.0 : 0.0)), size: minTitleSize)
             } else {
                 minTitleFrame = CGRect(origin: CGPoint(x: 16.0, y: expandedAvatarHeight - expandedAvatarControlsHeight + 9.0 + (subtitleSize.height.isZero ? 10.0 : 0.0)), size: minTitleSize)
             }
@@ -2214,7 +2214,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         } else {
             titleFrame = CGRect(origin: CGPoint(x: floor((width - titleSize.width) / 2.0), y: avatarFrame.maxY + 7.0 + (subtitleSize.height.isZero ? 11.0 : 0.0)), size: titleSize)
             if self.isSettings {
-                titleFrame = titleFrame.offsetBy(dx: 0.0, dy: 13.0)
+                titleFrame = titleFrame.offsetBy(dx: 0.0, dy: 11.0)
             }
             let totalSubtitleWidth = subtitleSize.width + usernameSpacing + usernameSize.width
             twoLineInfo = false
@@ -2236,7 +2236,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         let titleOffset = -min(titleCollapseOffset, contentOffset)
         let titleCollapseFraction = max(0.0, min(1.0, contentOffset / titleCollapseOffset))
         
-        let titleMinScale: CGFloat = 0.7
+        let titleMinScale: CGFloat = self.isSettings ? 0.6 : 0.7
         let subtitleMinScale: CGFloat = 0.8
         let avatarMinScale: CGFloat = 0.7