diff --git a/Commons/IconsSets/TablerIcons.qml b/Commons/IconsSets/TablerIcons.qml
index d4eab0fd..adb79ce6 100644
--- a/Commons/IconsSets/TablerIcons.qml
+++ b/Commons/IconsSets/TablerIcons.qml
@@ -119,6 +119,28 @@ Singleton {
     "bt-device-watch": "device-watch",
     "bt-device-speaker": "device-speaker",
     "bt-device-tv": "device-tv",
+    "filepicker-folder": "folder",
+    "filepicker-refresh": "refresh",
+    "filepicker-close": "x",
+    "filepicker-arrow-left": "arrow-left",
+    "filepicker-arrow-up": "arrow-up",
+    "filepicker-home": "home",
+    "filepicker-layout-grid": "layout-grid",
+    "filepicker-list": "list",
+    "filepicker-search": "search",
+    "filepicker-x": "x",
+    "filepicker-photo": "photo",
+    "filepicker-check": "check",
+    "filepicker-file-text": "file-text",
+    "filepicker-video": "video",
+    "filepicker-music": "music",
+    "filepicker-archive": "archive",
+    "filepicker-table": "table",
+    "filepicker-presentation": "presentation",
+    "filepicker-code": "code",
+    "filepicker-settings": "settings",
+    "filepicker-file": "file",
+    "filepicker-text": "file-text",
     "noctalia": "noctalia"
   }
 
diff --git a/Modules/SettingsPanel/Tabs/GeneralTab.qml b/Modules/SettingsPanel/Tabs/GeneralTab.qml
index 2eec600f..8032f303 100644
--- a/Modules/SettingsPanel/Tabs/GeneralTab.qml
+++ b/Modules/SettingsPanel/Tabs/GeneralTab.qml
@@ -30,15 +30,30 @@ ColumnLayout {
       Layout.alignment: Qt.AlignTop
     }
 
-    NTextInput {
-      Layout.fillWidth: true
+    NInputButton {
       label: `${Quickshell.env("USER") || "user"}'s profile picture`
       description: "Your profile picture that appears throughout the interface."
       text: Settings.data.general.avatarImage
       placeholderText: "/home/user/.face"
-      onEditingFinished: {
+      buttonIcon: "photo"
+      buttonTooltip: "Browse for avatar image"
+
+      onInputEditingFinished: {
         Settings.data.general.avatarImage = text
       }
+      onButtonClicked: {
+        FilePickerService.open({
+                                 "title": "Select Avatar Image",
+                                 "initialPath": Settings.data.general.avatarImage || Quickshell.env("HOME"),
+                                 "selectFiles": true,
+                                 "scaling": scaling,
+                                 "onSelected": function (path) {
+                                   Settings.data.general.avatarImage = path
+                                   text = path
+                                 },
+                                 "parent": root
+                               })
+      }
     }
   }
 
diff --git a/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml b/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml
index 64408d63..00b87261 100644
--- a/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml
+++ b/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml
@@ -20,16 +20,30 @@ ColumnLayout {
     spacing: Style.marginS * scaling
     Layout.fillWidth: true
 
-    NTextInput {
+    NInputButton {
       label: "Output folder"
       description: "Folder where screen recordings will be saved."
       placeholderText: "/home/xxx/Videos"
       text: Settings.data.screenRecorder.directory
-      onEditingFinished: {
+      buttonIcon: "folder-open"
+      buttonTooltip: "Browse for output folder"
+
+      onInputEditingFinished: {
         Settings.data.screenRecorder.directory = text
       }
-
-      Layout.maximumWidth: 420 * scaling
+      onButtonClicked: {
+        FilePickerService.open({
+                                 "title": "Select Output Folder",
+                                 "initialPath": Settings.data.screenRecorder.directory || Quickshell.env("HOME") + "/Videos",
+                                 "selectFiles": false,
+                                 "scaling": scaling,
+                                 "onSelected": function (path) {
+                                   Settings.data.screenRecorder.directory = path
+                                   text = path
+                                 },
+                                 "parent": root
+                               })
+      }
     }
 
     ColumnLayout {
diff --git a/Modules/SettingsPanel/Tabs/WallpaperTab.qml b/Modules/SettingsPanel/Tabs/WallpaperTab.qml
index fbece072..a8697990 100644
--- a/Modules/SettingsPanel/Tabs/WallpaperTab.qml
+++ b/Modules/SettingsPanel/Tabs/WallpaperTab.qml
@@ -29,14 +29,21 @@ ColumnLayout {
     spacing: Style.marginL * scaling
     Layout.fillWidth: true
 
-    NTextInput {
+    NInputButton {
+      id: wallpaperPathInput
       label: "Wallpaper folder"
       description: "Path to your main wallpaper folder."
       text: Settings.data.wallpaper.directory
-      onEditingFinished: {
+      buttonIcon: "folder-open"
+      buttonTooltip: "Browse for wallpaper folder"
+      Layout.fillWidth: true
+
+      onInputEditingFinished: {
         Settings.data.wallpaper.directory = text
       }
-      Layout.maximumWidth: 420 * scaling
+      onButtonClicked: {
+        openFileManager()
+      }
     }
 
     // Monitor-specific directories
@@ -65,18 +72,29 @@ ColumnLayout {
         spacing: Style.marginM * scaling
         Repeater {
           model: Quickshell.screens || []
-          delegate: RowLayout {
+          delegate: ColumnLayout {
+            Layout.fillWidth: true
+            spacing: Style.marginS * scaling
+
             NText {
               text: (modelData.name || "Unknown")
               color: Color.mPrimary
               font.weight: Style.fontWeightBold
-              Layout.preferredWidth: 90 * scaling
+              font.pointSize: Style.fontSizeM * scaling
             }
-            NTextInput {
-              Layout.fillWidth: true
+
+            NInputButton {
               text: WallpaperService.getMonitorDirectory(modelData.name)
-              onEditingFinished: WallpaperService.setMonitorDirectory(modelData.name, text)
-              Layout.maximumWidth: 420 * scaling
+              buttonIcon: "folder-open"
+              buttonTooltip: "Browse for wallpaper folder"
+              Layout.fillWidth: true
+
+              onInputEditingFinished: {
+                WallpaperService.setMonitorDirectory(modelData.name, text)
+              }
+              onButtonClicked: {
+                openMonitorFileManager(modelData.name)
+              }
             }
           }
         }
@@ -324,4 +342,32 @@ ColumnLayout {
     Layout.topMargin: Style.marginXL * scaling
     Layout.bottomMargin: Style.marginXL * scaling
   }
+
+  // File manager functions
+  function openFileManager() {
+    FilePickerService.open({
+                             "title": "Select Wallpaper Folder",
+                             "initialPath": Settings.data.wallpaper.directory || Quickshell.env("HOME"),
+                             "selectFiles": false,
+                             "scaling": scaling,
+                             "onSelected": function (path) {
+                               Settings.data.wallpaper.directory = path
+                               wallpaperPathInput.text = path
+                             },
+                             "parent": root
+                           })
+  }
+
+  function openMonitorFileManager(monitorName) {
+    FilePickerService.open({
+                             "title": "Select Monitor Wallpaper Folder",
+                             "initialPath": WallpaperService.getMonitorDirectory(monitorName),
+                             "selectFiles": false,
+                             "scaling": scaling,
+                             "onSelected": function (path) {
+                               WallpaperService.setMonitorDirectory(monitorName, path)
+                             },
+                             "parent": root
+                           })
+  }
 }
diff --git a/Services/FilePickerService.qml b/Services/FilePickerService.qml
new file mode 100644
index 00000000..94ff4ede
--- /dev/null
+++ b/Services/FilePickerService.qml
@@ -0,0 +1,47 @@
+pragma Singleton
+
+import QtQuick
+import Quickshell
+
+QtObject {
+  id: root
+
+  // Function to open a file manager dialog
+  function open(options) {
+    var component = Qt.createComponent(Qt.resolvedUrl(Quickshell.shellDir + "/Widgets/NFilePicker.qml"))
+    if (component.status === Component.Ready) {
+      // Extract directory from file path if it's a file
+      var initialPath = options.initialPath || Quickshell.env("HOME")
+      if (options.selectFiles && initialPath !== Quickshell.env("HOME")) {
+        // If selecting files and path is not home, extract directory
+        var pathParts = initialPath.split('/')
+        if (pathParts.length > 1) {
+          pathParts.pop() // Remove filename
+          initialPath = pathParts.join('/') || '/'
+        }
+      }
+
+      var dialog = component.createObject(options.parent || Overlay.overlay, {
+                                            "title": options.title || "Select File/Folder",
+                                            "initialPath": initialPath,
+                                            "selectFiles": options.selectFiles || false,
+                                            "selectFolders": !options.selectFiles || false,
+                                            "scaling": options.scaling || 1.0
+                                          })
+      if (dialog) {
+        if (options.onSelected) {
+          if (options.selectFiles) {
+            dialog.fileSelected.connect(options.onSelected)
+          } else {
+            dialog.folderSelected.connect(options.onSelected)
+          }
+        }
+        dialog.open()
+        return dialog
+      }
+    } else {
+      console.error("Component error:", component.errorString())
+    }
+    return null
+  }
+}
diff --git a/Widgets/NFilePicker.qml b/Widgets/NFilePicker.qml
new file mode 100644
index 00000000..39459404
--- /dev/null
+++ b/Widgets/NFilePicker.qml
@@ -0,0 +1,816 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import Qt.labs.folderlistmodel
+import Quickshell
+import Quickshell.Io
+import qs.Commons
+import qs.Services
+import qs.Widgets
+import "../Helpers/FuzzySort.js" as FuzzySort
+
+Popup {
+  id: root
+
+  // Properties
+  property string title: "File Picker"
+  property string initialPath: Quickshell.env("HOME") || "/home"
+  property bool selectFiles: true
+  property bool selectFolders: true
+  property var nameFilters: ["*"]
+  property bool showDirs: true
+  property real scaling: 1.0
+  property var selectedPaths: []
+  property string currentPath: initialPath
+  property bool shouldResetSelection: false
+
+  // Signals
+  signal fileSelected(string path)
+  signal filesSelected(var paths)
+  signal folderSelected(string path)
+  signal cancelled
+
+  function openFileManager() {
+    if (!root.currentPath)
+      root.currentPath = root.initialPath
+    shouldResetSelection = true
+    open()
+  }
+
+  function getFileIcon(fileName) {
+    const ext = fileName.split('.').pop().toLowerCase()
+    const iconMap = {
+      "txt": 'filepicker-file-text',
+      "md": 'filepicker-file-text',
+      "log": 'filepicker-file-text',
+      "jpg": 'filepicker-photo',
+      "jpeg": 'filepicker-photo',
+      "png": 'filepicker-photo',
+      "gif": 'filepicker-photo',
+      "bmp": 'filepicker-photo',
+      "svg": 'filepicker-photo',
+      "mp4": 'filepicker-video',
+      "avi": 'filepicker-video',
+      "mkv": 'filepicker-video',
+      "mov": 'filepicker-video',
+      "mp3": 'filepicker-music',
+      "wav": 'filepicker-music',
+      "flac": 'filepicker-music',
+      "ogg": 'filepicker-music',
+      "zip": 'filepicker-archive',
+      "tar": 'filepicker-archive',
+      "gz": 'filepicker-archive',
+      "rar": 'filepicker-archive',
+      "7z": 'filepicker-archive',
+      "pdf": 'filepicker-text',
+      "doc": 'filepicker-text',
+      "docx": 'filepicker-text',
+      "xls": 'filepicker-table',
+      "xlsx": 'filepicker-table',
+      "ppt": 'filepicker-presentation',
+      "pptx": 'filepicker-presentation',
+      "html": 'filepicker-code',
+      "htm": 'filepicker-code',
+      "css": 'filepicker-code',
+      "js": 'filepicker-code',
+      "json": 'filepicker-code',
+      "xml": 'filepicker-code',
+      "exe": 'filepicker-settings',
+      "app": 'filepicker-settings',
+      "deb": 'filepicker-settings',
+      "rpm": 'filepicker-settings'
+    }
+    return iconMap[ext] || 'filepicker-file'
+  }
+
+  function formatFileSize(bytes) {
+    if (bytes === 0)
+      return "0 B"
+    const k = 1024, sizes = ["B", "KB", "MB", "GB", "TB"]
+    const i = Math.floor(Math.log(bytes) / Math.log(k))
+    return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + " " + sizes[i]
+  }
+
+  function confirmSelection() {
+    if (filePickerPanel.currentSelection.length === 0)
+      return
+
+    root.selectedPaths = filePickerPanel.currentSelection
+    const path = filePickerPanel.currentSelection[0]
+
+    if (filePickerPanel.currentSelection.length === 1) {
+      const isDir = folderModel.get(folderModel.indexOf(path), "fileIsDir")
+      if (root.selectFiles && !root.selectFolders)
+        root.fileSelected(path)
+      else if (root.selectFolders && !root.selectFiles)
+        root.folderSelected(path)
+      else
+        isDir ? root.folderSelected(path) : root.fileSelected(path)
+    } else {
+      root.filesSelected(filePickerPanel.currentSelection)
+    }
+    root.close()
+  }
+
+  function updateFilteredModel() {
+    filteredModel.clear()
+    const searchText = filePickerPanel.filterText.toLowerCase()
+
+    for (var i = 0; i < folderModel.count; i++) {
+      const fileName = folderModel.get(i, "fileName")
+      const filePath = folderModel.get(i, "filePath")
+      const fileIsDir = folderModel.get(i, "fileIsDir")
+      const fileSize = folderModel.get(i, "fileSize")
+
+      if (root.selectFolders && !root.selectFiles && !fileIsDir)
+        continue
+      if (searchText === "" || fileName.toLowerCase().includes(searchText)) {
+        filteredModel.append({
+                               "fileName": fileName,
+                               "filePath": filePath,
+                               "fileIsDir": fileIsDir,
+                               "fileSize": fileSize
+                             })
+      }
+    }
+  }
+
+  width: 900 * scaling
+  height: 700 * scaling
+  modal: true
+  closePolicy: Popup.CloseOnEscape
+  anchors.centerIn: Overlay.overlay
+
+  background: Rectangle {
+    color: Color.mSurfaceVariant
+    radius: Style.radiusL * scaling
+    border.color: Color.mOutline
+    border.width: Math.max(1, Style.borderS * scaling)
+  }
+
+  Rectangle {
+    id: filePickerPanel
+    anchors.fill: parent
+    anchors.margins: Style.marginL * scaling
+    color: Color.transparent
+
+    property string filterText: ""
+    property var currentSelection: []
+    property bool viewMode: true // true = grid, false = list
+    property string searchText: ""
+    property bool showSearchBar: false
+
+    focus: true
+
+    Keys.onPressed: event => {
+                      if (event.modifiers & Qt.ControlModifier && event.key === Qt.Key_F) {
+                        filePickerPanel.showSearchBar = !filePickerPanel.showSearchBar
+                        if (filePickerPanel.showSearchBar)
+                        Qt.callLater(() => searchInput.forceActiveFocus())
+                        event.accepted = true
+                      } else if (event.key === Qt.Key_Escape && filePickerPanel.showSearchBar) {
+                        filePickerPanel.showSearchBar = false
+                        filePickerPanel.searchText = ""
+                        filePickerPanel.filterText = ""
+                        root.updateFilteredModel()
+                        event.accepted = true
+                      }
+                    }
+
+    ColumnLayout {
+      anchors.fill: parent
+      spacing: Style.marginM * scaling
+
+      // Header
+      RowLayout {
+        Layout.fillWidth: true
+        spacing: Style.marginM * scaling
+
+        NIcon {
+          icon: "filepicker-folder"
+          color: Color.mPrimary
+          font.pointSize: Style.fontSizeXXL * scaling
+        }
+        NText {
+          text: root.title
+          font.pointSize: Style.fontSizeXL * scaling
+          font.weight: Style.fontWeightBold
+          color: Color.mPrimary
+          Layout.fillWidth: true
+        }
+        NIconButton {
+          icon: "filepicker-refresh"
+          tooltipText: "Refresh"
+          onClicked: folderModel.refresh()
+        }
+        NIconButton {
+          icon: "filepicker-close"
+          tooltipText: "Close"
+          onClicked: {
+            root.cancelled()
+            root.close()
+          }
+        }
+      }
+
+      NDivider {
+        Layout.fillWidth: true
+      }
+
+      // Navigation toolbar
+      Rectangle {
+        Layout.fillWidth: true
+        Layout.preferredHeight: 45 * scaling
+        color: Color.mSurfaceVariant
+        radius: Style.radiusS * scaling
+        border.color: Color.mOutline
+        border.width: Math.max(1, Style.borderS * scaling)
+
+        RowLayout {
+          anchors.fill: parent
+          anchors.margins: Style.marginS * scaling
+          spacing: Style.marginS * scaling
+
+          NIconButton {
+            icon: "filepicker-arrow-up"
+            tooltipText: "Up"
+            baseSize: Style.baseWidgetSize * 0.8
+            enabled: folderModel.folder.toString() !== "file:///"
+            onClicked: {
+              const parentPath = folderModel.parentFolder.toString().replace("file://", "")
+              folderModel.folder = "file://" + parentPath
+              root.currentPath = parentPath
+            }
+          }
+
+          NIconButton {
+            icon: "filepicker-home"
+            tooltipText: "Home"
+            baseSize: Style.baseWidgetSize * 0.8
+            onClicked: {
+              const homePath = Quickshell.env("HOME") || "/home"
+              folderModel.folder = "file://" + homePath
+              root.currentPath = homePath
+            }
+          }
+
+          NIconButton {
+            icon: filePickerPanel.viewMode ? "filepicker-list" : "filepicker-layout-grid"
+            tooltipText: filePickerPanel.viewMode ? "List View" : "Grid View"
+            baseSize: Style.baseWidgetSize * 0.8
+            onClicked: filePickerPanel.viewMode = !filePickerPanel.viewMode
+          }
+
+          NIconButton {
+            icon: filePickerPanel.showSearchBar ? "filepicker-x" : "filepicker-search"
+            tooltipText: filePickerPanel.showSearchBar ? "Close Search" : "Search"
+            baseSize: Style.baseWidgetSize * 0.8
+            onClicked: {
+              filePickerPanel.showSearchBar = !filePickerPanel.showSearchBar
+              if (!filePickerPanel.showSearchBar) {
+                filePickerPanel.searchText = ""
+                filePickerPanel.filterText = ""
+                root.updateFilteredModel()
+              }
+            }
+          }
+
+          NTextInput {
+            id: locationInput
+            text: root.currentPath
+            placeholderText: "Enter path..."
+            Layout.fillWidth: true
+            onEditingFinished: {
+              const newPath = text.trim()
+              if (newPath !== "" && newPath !== root.currentPath) {
+                folderModel.folder = "file://" + newPath
+                root.currentPath = newPath
+              } else {
+                text = root.currentPath
+              }
+            }
+            Connections {
+              target: root
+              function onCurrentPathChanged() {
+                if (!locationInput.activeFocus)
+                  locationInput.text = root.currentPath
+              }
+            }
+          }
+        }
+      }
+
+      // Search bar
+      Rectangle {
+        Layout.fillWidth: true
+        Layout.preferredHeight: 45 * scaling
+        color: Color.mSurfaceVariant
+        radius: Style.radiusS * scaling
+        border.color: Color.mOutline
+        border.width: Math.max(1, Style.borderS * scaling)
+        visible: filePickerPanel.showSearchBar
+
+        RowLayout {
+          anchors.fill: parent
+          anchors.margins: Style.marginS * scaling
+          spacing: Style.marginS * scaling
+
+          NIcon {
+            icon: "filepicker-search"
+            color: Color.mOnSurfaceVariant
+            font.pointSize: Style.fontSizeS * scaling
+          }
+          NTextInput {
+            id: searchInput
+            placeholderText: "Search files and folders..."
+            Layout.fillWidth: true
+            text: filePickerPanel.searchText
+            onTextChanged: {
+              filePickerPanel.searchText = text
+              filePickerPanel.filterText = text
+              root.updateFilteredModel()
+            }
+            Keys.onEscapePressed: {
+              filePickerPanel.showSearchBar = false
+              filePickerPanel.searchText = ""
+              filePickerPanel.filterText = ""
+              root.updateFilteredModel()
+            }
+          }
+          NIconButton {
+            icon: "filepicker-x"
+            tooltipText: "Clear"
+            baseSize: Style.baseWidgetSize * 0.6
+            visible: filePickerPanel.searchText.length > 0
+            onClicked: {
+              searchInput.text = ""
+              filePickerPanel.searchText = ""
+              filePickerPanel.filterText = ""
+              root.updateFilteredModel()
+            }
+          }
+        }
+      }
+
+      // File list area
+      Rectangle {
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        color: Color.mSurface
+        radius: Style.radiusM * scaling
+        border.color: Color.mOutline
+        border.width: Math.max(1, Style.borderS * scaling)
+        clip: true
+
+        FolderListModel {
+          id: folderModel
+          folder: "file://" + root.currentPath
+          nameFilters: root.nameFilters
+          showDirs: root.showDirs
+          showHidden: true
+          sortField: FolderListModel.Name
+          sortReversed: false
+          onFolderChanged: {
+            root.currentPath = folder.toString().replace("file://", "")
+            filePickerPanel.currentSelection = []
+          }
+          onStatusChanged: {
+            if (status === FolderListModel.Error) {
+              if (root.currentPath !== Quickshell.env("HOME")) {
+                folder = "file://" + Quickshell.env("HOME")
+                root.currentPath = Quickshell.env("HOME")
+              }
+            } else if (status === FolderListModel.Ready) {
+              root.updateFilteredModel()
+            }
+          }
+        }
+
+        ListModel {
+          id: filteredModel
+        }
+
+        // Common scroll bar component
+        Component {
+          id: scrollBarComponent
+          ScrollBar {
+            policy: ScrollBar.AsNeeded
+            contentItem: Rectangle {
+              implicitWidth: 6 * scaling
+              implicitHeight: 100
+              radius: Style.radiusM * scaling
+              color: parent.pressed ? Qt.alpha(Color.mTertiary, 0.8) : parent.hovered ? Qt.alpha(Color.mTertiary, 0.8) : Qt.alpha(Color.mTertiary, 0.8)
+              opacity: parent.policy === ScrollBar.AlwaysOn || parent.active ? 1.0 : 0.0
+              Behavior on opacity {
+                NumberAnimation {
+                  duration: Style.animationFast
+                }
+              }
+              Behavior on color {
+                ColorAnimation {
+                  duration: Style.animationFast
+                }
+              }
+            }
+            background: Rectangle {
+              implicitWidth: 6 * scaling
+              implicitHeight: 100
+              color: Color.transparent
+              opacity: parent.policy === ScrollBar.AlwaysOn || parent.active ? 0.3 : 0.0
+              radius: (Style.radiusM * scaling) / 2
+              Behavior on opacity {
+                NumberAnimation {
+                  duration: Style.animationFast
+                }
+              }
+            }
+          }
+        }
+
+        // Grid view
+        GridView {
+          id: gridView
+          anchors.fill: parent
+          anchors.margins: Style.marginM * scaling
+          model: filteredModel
+          visible: filePickerPanel.viewMode
+          clip: true
+
+          property int columns: Math.max(1, Math.floor(width / (120 * scaling)))
+          property int itemSize: Math.floor((width - leftMargin - rightMargin - (columns * Style.marginS * scaling)) / columns)
+
+          cellWidth: Math.floor((width - leftMargin - rightMargin) / columns)
+          cellHeight: Math.floor(itemSize * 0.8) + Style.marginXS * scaling + Style.fontSizeS * scaling + Style.marginM * scaling
+
+          leftMargin: Style.marginS * scaling
+          rightMargin: Style.marginS * scaling
+          topMargin: Style.marginS * scaling
+          bottomMargin: Style.marginS * scaling
+
+          ScrollBar.vertical: scrollBarComponent.createObject(gridView, {
+                                                                "parent": gridView,
+                                                                "x": gridView.mirrored ? 0 : gridView.width - width,
+                                                                "y": 0,
+                                                                "height": gridView.height
+                                                              })
+
+          delegate: Rectangle {
+            id: gridItem
+            width: gridView.itemSize
+            height: gridView.cellHeight
+            color: Color.transparent
+            radius: Style.radiusM * scaling
+
+            property bool isSelected: filePickerPanel.currentSelection.includes(model.filePath)
+
+            Rectangle {
+              anchors.fill: parent
+              color: Color.transparent
+              radius: parent.radius
+              border.color: isSelected ? Color.mSecondary : Color.mSurface
+              border.width: Math.max(1, Style.borderL * scaling)
+              Behavior on color {
+                ColorAnimation {
+                  duration: Style.animationFast
+                }
+              }
+            }
+
+            Rectangle {
+              anchors.fill: parent
+              color: (mouseArea.containsMouse && !isSelected) ? Color.mTertiary : Color.transparent
+              radius: parent.radius
+              border.color: (mouseArea.containsMouse && !isSelected) ? Color.mTertiary : Color.transparent
+              border.width: Math.max(1, Style.borderS * scaling)
+              Behavior on color {
+                ColorAnimation {
+                  duration: Style.animationFast
+                }
+              }
+              Behavior on border.color {
+                ColorAnimation {
+                  duration: Style.animationFast
+                }
+              }
+            }
+
+            ColumnLayout {
+              anchors.fill: parent
+              anchors.margins: Style.marginS * scaling
+              spacing: Style.marginXS * scaling
+
+              Rectangle {
+                id: iconContainer
+                Layout.fillWidth: true
+                Layout.preferredHeight: Math.round(gridView.itemSize * 0.67)
+                color: Color.transparent
+
+                property bool isImage: {
+                  if (model.fileIsDir)
+                    return false
+                  const ext = model.fileName.split('.').pop().toLowerCase()
+                  return ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg', 'ico'].includes(ext)
+                }
+
+                Image {
+                  id: thumbnail
+                  anchors.fill: parent
+                  anchors.margins: Style.marginXS * scaling
+                  source: iconContainer.isImage ? "file://" + model.filePath : ""
+                  fillMode: Image.PreserveAspectFit
+                  visible: iconContainer.isImage && status === Image.Ready
+                  smooth: false
+                  cache: true
+                  asynchronous: true
+                  sourceSize.width: 120 * scaling
+                  sourceSize.height: 120 * scaling
+                  onStatusChanged: {
+                    if (status === Image.Error)
+                      visible = false
+                  }
+
+                  Rectangle {
+                    anchors.fill: parent
+                    color: Color.mSurfaceVariant
+                    radius: Style.radiusS * scaling
+                    visible: thumbnail.status === Image.Loading
+                    NIcon {
+                      icon: "filepicker-photo"
+                      font.pointSize: Style.fontSizeL * scaling
+                      color: Color.mOnSurfaceVariant
+                      anchors.centerIn: parent
+                    }
+                  }
+                }
+
+                NIcon {
+                  icon: model.fileIsDir ? "filepicker-folder" : root.getFileIcon(model.fileName)
+                  font.pointSize: Style.fontSizeXXL * 2 * scaling
+                  color: {
+                    if (isSelected)
+                      return Color.mSecondary
+                    else if (mouseArea.containsMouse)
+                      return model.fileIsDir ? Color.mOnTertiary : Color.mOnTertiary
+                    else
+                      return model.fileIsDir ? Color.mPrimary : Color.mOnSurfaceVariant
+                  }
+                  anchors.centerIn: parent
+                  visible: !iconContainer.isImage || thumbnail.status !== Image.Ready
+                }
+
+                Rectangle {
+                  anchors.top: parent.top
+                  anchors.right: parent.right
+                  anchors.margins: Style.marginS * scaling
+                  width: 24 * scaling
+                  height: 24 * scaling
+                  radius: width / 2
+                  color: Color.mSecondary
+                  border.color: Color.mOutline
+                  border.width: Math.max(1, Style.borderS * scaling)
+                  visible: isSelected
+                  NIcon {
+                    icon: "filepicker-check"
+                    font.pointSize: Style.fontSizeS * scaling
+                    font.weight: Style.fontWeightBold
+                    color: Color.mOnSecondary
+                    anchors.centerIn: parent
+                  }
+                }
+              }
+
+              NText {
+                text: model.fileName
+                color: {
+                  if (isSelected)
+                    return Color.mSecondary
+                  else if (mouseArea.containsMouse)
+                    return Color.mOnTertiary
+                  else
+                    return Color.mOnSurface
+                }
+                font.pointSize: Style.fontSizeS * scaling
+                font.weight: isSelected ? Style.fontWeightBold : Style.fontWeightRegular
+                Layout.fillWidth: true
+                horizontalAlignment: Text.AlignHCenter
+                wrapMode: Text.WordWrap
+                elide: Text.ElideRight
+                maximumLineCount: 2
+              }
+            }
+
+            MouseArea {
+              id: mouseArea
+              anchors.fill: parent
+              hoverEnabled: true
+              acceptedButtons: Qt.LeftButton | Qt.RightButton
+
+              onClicked: mouse => {
+                           if (mouse.button === Qt.LeftButton) {
+                             if (model.fileIsDir) {
+                               if (root.selectFolders && !root.selectFiles) {
+                                 filePickerPanel.currentSelection = [model.filePath]
+                               } else {
+                                 folderModel.folder = "file://" + model.filePath
+                                 root.currentPath = model.filePath
+                               }
+                             } else {
+                               if (root.selectFiles)
+                               filePickerPanel.currentSelection = [model.filePath]
+                             }
+                           }
+                         }
+
+              onDoubleClicked: mouse => {
+                                 if (mouse.button === Qt.LeftButton) {
+                                   if (model.fileIsDir) {
+                                     if (root.selectFolders && !root.selectFiles) {
+                                       filePickerPanel.currentSelection = [model.filePath]
+                                       root.confirmSelection()
+                                     } else {
+                                       folderModel.folder = "file://" + model.filePath
+                                       root.currentPath = model.filePath
+                                     }
+                                   } else {
+                                     if (root.selectFiles) {
+                                       filePickerPanel.currentSelection = [model.filePath]
+                                       root.confirmSelection()
+                                     }
+                                   }
+                                 }
+                               }
+            }
+          }
+        }
+
+        // List view
+        ListView {
+          id: listView
+          anchors.fill: parent
+          anchors.margins: Style.marginS * scaling
+          model: filteredModel
+          visible: !filePickerPanel.viewMode
+          clip: true
+
+          ScrollBar.vertical: scrollBarComponent.createObject(listView, {
+                                                                "parent": listView,
+                                                                "x": listView.mirrored ? 0 : listView.width - width,
+                                                                "y": 0,
+                                                                "height": listView.height
+                                                              })
+
+          delegate: Rectangle {
+            id: listItem
+            width: listView.width
+            height: 40 * scaling
+            color: {
+              if (filePickerPanel.currentSelection.includes(model.filePath))
+                return Color.mSecondary
+              if (mouseArea.containsMouse)
+                return Qt.alpha(Color.mOnSurface, 0.1)
+              return Color.transparent
+            }
+            radius: Style.radiusS * scaling
+            Behavior on color {
+              ColorAnimation {
+                duration: Style.animationFast
+              }
+            }
+
+            RowLayout {
+              anchors.fill: parent
+              anchors.leftMargin: Style.marginM * scaling
+              anchors.rightMargin: Style.marginM * scaling
+              spacing: Style.marginM * scaling
+
+              NIcon {
+                icon: model.fileIsDir ? "filepicker-folder" : root.getFileIcon(model.fileName)
+                font.pointSize: Style.fontSizeL * scaling
+                color: model.fileIsDir ? (filePickerPanel.currentSelection.includes(model.filePath) ? Color.mOnSecondary : Color.mPrimary) : Color.mOnSurfaceVariant
+              }
+
+              NText {
+                text: model.fileName
+                color: filePickerPanel.currentSelection.includes(model.filePath) ? Color.mOnSecondary : Color.mOnSurface
+                font.pointSize: Style.fontSizeM * scaling
+                font.weight: filePickerPanel.currentSelection.includes(model.filePath) ? Style.fontWeightBold : Style.fontWeightRegular
+                Layout.fillWidth: true
+                elide: Text.ElideRight
+              }
+
+              NText {
+                text: model.fileIsDir ? "" : root.formatFileSize(model.fileSize)
+                color: filePickerPanel.currentSelection.includes(model.filePath) ? Color.mOnSecondary : Color.mOnSurfaceVariant
+                font.pointSize: Style.fontSizeS * scaling
+                visible: !model.fileIsDir
+                Layout.preferredWidth: implicitWidth
+              }
+            }
+
+            MouseArea {
+              id: mouseArea
+              anchors.fill: parent
+              hoverEnabled: true
+              acceptedButtons: Qt.LeftButton | Qt.RightButton
+
+              onClicked: mouse => {
+                           if (mouse.button === Qt.LeftButton) {
+                             if (model.fileIsDir) {
+                               if (root.selectFolders && !root.selectFiles) {
+                                 filePickerPanel.currentSelection = [model.filePath]
+                               } else {
+                                 folderModel.folder = "file://" + model.filePath
+                                 root.currentPath = model.filePath
+                               }
+                             } else {
+                               if (root.selectFiles)
+                               filePickerPanel.currentSelection = [model.filePath]
+                             }
+                           }
+                         }
+
+              onDoubleClicked: mouse => {
+                                 if (mouse.button === Qt.LeftButton) {
+                                   if (model.fileIsDir) {
+                                     if (root.selectFolders && !root.selectFiles) {
+                                       filePickerPanel.currentSelection = [model.filePath]
+                                       root.confirmSelection()
+                                     } else {
+                                       folderModel.folder = "file://" + model.filePath
+                                       root.currentPath = model.filePath
+                                     }
+                                   } else {
+                                     if (root.selectFiles) {
+                                       filePickerPanel.currentSelection = [model.filePath]
+                                       root.confirmSelection()
+                                     }
+                                   }
+                                 }
+                               }
+            }
+          }
+        }
+      }
+
+      // Footer
+      RowLayout {
+        Layout.fillWidth: true
+        spacing: Style.marginM * scaling
+
+        NText {
+          text: {
+            if (filePickerPanel.searchText.length > 0) {
+              return "Searching for: \"" + filePickerPanel.searchText + "\" (" + filteredModel.count + " matches)"
+            } else if (filePickerPanel.currentSelection.length > 0) {
+              return filePickerPanel.currentSelection.length + " item(s) selected"
+            } else {
+              return filteredModel.count + " items"
+            }
+          }
+          color: filePickerPanel.searchText.length > 0 ? Color.mPrimary : Color.mOnSurfaceVariant
+          font.pointSize: Style.fontSizeS * scaling
+          Layout.fillWidth: true
+        }
+
+        NButton {
+          text: "Cancel"
+          outlined: true
+          onClicked: {
+            root.cancelled()
+            root.close()
+          }
+        }
+
+        NButton {
+          text: {
+            if (root.selectFolders && !root.selectFiles)
+              return "Select Folder"
+            else if (root.selectFiles && !root.selectFolders)
+              return "Select File"
+            else
+              return "Select"
+          }
+          icon: "filepicker-check"
+          enabled: filePickerPanel.currentSelection.length > 0
+          onClicked: root.confirmSelection()
+        }
+      }
+    }
+
+    Connections {
+      target: root
+      function onShouldResetSelectionChanged() {
+        if (root.shouldResetSelection) {
+          filePickerPanel.currentSelection = []
+          root.shouldResetSelection = false
+        }
+      }
+    }
+
+    Component.onCompleted: {
+      if (!root.currentPath)
+        root.currentPath = root.initialPath
+      folderModel.folder = "file://" + root.currentPath
+    }
+  }
+}
diff --git a/Widgets/NInputButton.qml b/Widgets/NInputButton.qml
new file mode 100644
index 00000000..ed1bafd0
--- /dev/null
+++ b/Widgets/NInputButton.qml
@@ -0,0 +1,83 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import qs.Commons
+import qs.Widgets
+
+ColumnLayout {
+  id: root
+  Layout.fillWidth: true
+
+  property alias text: input.text
+  property alias placeholderText: input.placeholderText
+  property string label: ""
+  property string description: ""
+  property alias buttonIcon: button.icon
+  property alias buttonTooltip: button.tooltipText
+  property alias buttonEnabled: button.enabled
+  property real maximumWidth: 0
+
+  signal buttonClicked
+  signal inputTextChanged(string text)
+  signal inputEditingFinished
+
+  spacing: Style.marginS * scaling
+
+  // Label and description
+  NLabel {
+    label: root.label
+    description: root.description
+    visible: root.label !== "" || root.description !== ""
+    Layout.fillWidth: true
+  }
+
+  // Input field with button
+  RowLayout {
+    Layout.fillWidth: true
+    spacing: Style.marginM * scaling
+
+    // Input field container
+    Rectangle {
+      id: inputContainer
+      Layout.fillWidth: true
+      Layout.maximumWidth: root.maximumWidth > 0 ? root.maximumWidth : -1
+      implicitHeight: Style.baseWidgetSize * 1.1 * scaling
+
+      radius: Style.radiusM * scaling
+      color: Color.mSurface
+      border.color: input.activeFocus ? Color.mSecondary : Color.mOutline
+      border.width: Math.max(1, Style.borderS * scaling)
+
+      Behavior on border.color {
+        ColorAnimation {
+          duration: Style.animationFast
+        }
+      }
+
+      TextField {
+        id: input
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.margins: Style.marginM * scaling
+
+        color: Color.mOnSurface
+        font.pointSize: Style.fontSizeS * scaling
+        font.family: Settings.data.ui.fontDefault
+        selectByMouse: true
+
+        background: Item {} // Remove default background since we have our own Rectangle
+
+        onTextChanged: root.inputTextChanged(text)
+        onEditingFinished: root.inputEditingFinished()
+      }
+    }
+
+    // Button
+    NIconButton {
+      id: button
+      baseSize: Style.baseWidgetSize
+      onClicked: root.buttonClicked()
+    }
+  }
+}