Merge branch 'main' into qt-scaling

Modules/Settings/Tabs/DockTab.qml

@@ -93,6 +93,20 @@ ColumnLayout {
     Layout.bottomMargin: Style.marginXL
   }
 
+  NToggle {
+    Layout.fillWidth: true
+    label: I18n.tr("settings.dock.appearance.colorize-icons.label")
+    description: I18n.tr("settings.dock.appearance.colorize-icons.description")
+    checked: Settings.data.dock.colorizeIcons
+    onToggled: checked => Settings.data.dock.colorizeIcons = checked
+  }
+
+  NDivider {
+    Layout.fillWidth: true
+    Layout.topMargin: Style.marginXL
+    Layout.bottomMargin: Style.marginXL
+  }
+
   // Monitor Configuration
   ColumnLayout {
     spacing: Style.marginM

Modules/Settings/Tabs/GeneralTab.qml

@@ -21,9 +21,9 @@ ColumnLayout {
 
     // Avatar preview
     NImageCircled {
-      width: 108
-      height: 108
-      imagePath: Settings.data.general.avatarImage
+      width: 108 * Style.uiScaleRatio
+      height: 108 * Style.uiScaleRatio
+      imagePath: Settings.preprocessPath(Settings.data.general.avatarImage)
       fallbackIcon: "person"
       borderColor: Color.mPrimary
       borderWidth: Math.max(1, Style.borderM)
@@ -50,7 +50,7 @@ ColumnLayout {
     id: avatarPicker
     title: I18n.tr("settings.general.profile.select-avatar")
     selectionMode: "files"
-    initialPath: Settings.data.general.avatarImage.substr(0, Settings.data.general.avatarImage.lastIndexOf("/")) || Quickshell.env("HOME")
+    initialPath: Settings.preprocessPath(Settings.data.general.avatarImage).substr(0, Settings.preprocessPath(Settings.data.general.avatarImage).lastIndexOf("/")) || Quickshell.env("HOME")
     nameFilters: ["*.jpg", "*.jpeg", "*.png", "*.gif", "*.pnm", "*.bmp"]
     onAccepted: paths => {
                   if (paths.length > 0) {