diff --git a/README.md b/README.md
index ab25587..41a03d5 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Finch S3 Client is an open source project, and we welcome contributions from the
 ## License
 Finch S3 Client is released under the [MIT License](https://github.com/mantis-software-company/finch/blob/main/LICENSE).
 
-Icons used in GUI was copied from GNOME [Adwaita](https://gitlab.gnome.org/GNOME/adwaita-icon-theme) icon theme. 
+Icons used in GUI is taken from [Feather Icons](https://feathericons.com/).
 
 ## Credits
 S3 Client was created by [Furkan Kalkan](https://github.com/geekdinazor).
diff --git a/finch/__main__.py b/finch/__main__.py
index 932ed8a..89ca70a 100644
--- a/finch/__main__.py
+++ b/finch/__main__.py
@@ -16,6 +16,7 @@
 
 from finch.about import AboutWindow
 from finch.common import ObjectType, s3_session, apply_theme, center_window, CONFIG_PATH, StringUtils, resource_path
+from finch.cors import CORSWindow
 from finch.credentials import CredentialsManager, ManageCredentialsWindow
 from finch.download import DownloadProgressDialog
 from finch.error import show_error_dialog
@@ -156,7 +157,7 @@ def show_s3_files(self, cred_index):
 
                 download_action = QAction(self)
                 download_action.setText("&Download")
-                download_action.setIcon(QIcon(resource_path('img/save.svg')))
+                download_action.setIcon(QIcon(resource_path('img/download.svg')))
                 download_action.triggered.connect(self.download_file)
                 download_action.setDisabled(True)
 
@@ -296,6 +297,15 @@ def open_context_menu(self, position):
                 create_folder_action.setIcon(QIcon(resource_path('img/new-folder.svg')))
                 create_folder_action.triggered.connect(self.create_folder)
                 menu.addAction(create_folder_action)
+
+                tools_menu = menu.addMenu("Tools")
+                tools_menu.setIcon(QIcon(resource_path('img/tools.svg')))
+
+                cors_action = QAction(self)
+                cors_action.setText("&CORS Configurations")
+                cors_action.setIcon(QIcon(resource_path('img/globe.svg')))
+                cors_action.triggered.connect(self.show_cors_window)
+                tools_menu.addAction(cors_action)
             elif indexes[1].data() == ObjectType.FOLDER:
                 delete_folder_action = QAction("Delete Folder")
                 delete_folder_action.setIcon(QIcon(resource_path('img/trash.svg')))
@@ -492,6 +502,15 @@ def search(self):
                 action.setDisabled(True)
         self.layout.addWidget(self.search_widget)
 
+    def show_cors_window(self) -> None:
+        """ Open CORS configuration window """
+        indexes = self.tree_widget.selectedIndexes()
+        if indexes[1].data() == ObjectType.BUCKET:
+            bucket_name = self.get_bucket_name_from_selected_item()
+            # get bucket name and pass it to CORSWindow
+            self.cors_window = CORSWindow(bucket_name=bucket_name)
+            self.cors_window.show()
+
     def open_about_window(self) -> None:
         """ Open about window """
         self.about_window = AboutWindow()
diff --git a/finch/common.py b/finch/common.py
index 7394157..e1f5dc2 100644
--- a/finch/common.py
+++ b/finch/common.py
@@ -92,3 +92,10 @@ def format_size(file_size: Union[int, float], decimal_places=2) -> str:
                 break
             file_size /= 1024.0
         return f'{StringUtils.remove_trailing_zeros(f"{file_size:.{decimal_places}f}"): >8} {unit}'
+
+    def format_list_with_conjunction(items: list, conjunction='and') -> str:
+        """Format list items with proper punctuation and conjunction.
+        Example: ['a', 'b', 'c'] -> 'a, b and c'"""
+        if len(items) > 1:
+            return f"{', '.join(items[:-1])} {conjunction} {items[-1]}"
+        return items[0] if items else ''
\ No newline at end of file
diff --git a/finch/cors.py b/finch/cors.py
new file mode 100644
index 0000000..8be5910
--- /dev/null
+++ b/finch/cors.py
@@ -0,0 +1,325 @@
+from PyQt5.QtCore import Qt
+from PyQt5.QtGui import QIcon
+from PyQt5.QtWidgets import (QWidget, QVBoxLayout, QHBoxLayout, QPushButton,
+                             QMessageBox, QGroupBox, QFormLayout, QLineEdit,
+                             QListWidget, QListWidgetItem, QCheckBox, QTextEdit,
+                             QLabel)
+from botocore.exceptions import ClientError
+
+from finch.common import s3_session, center_window, resource_path, StringUtils
+from finch.error import show_error_dialog
+
+
+class CORSWindow(QWidget):
+    """
+    CORS Window to manage CORS configurations for passed bucket name.
+    """
+    def __init__(self, bucket_name):
+        super().__init__()
+        self.bucket_name = bucket_name
+        self.setWindowTitle(f"CORS Configurations - {bucket_name}")
+        self.resize(600, 400)
+        center_window(self)
+
+        layout = QVBoxLayout()
+        self.setLayout(layout)
+
+        # List of CORS Rules
+        self.rules_list = QListWidget()
+        self.rules_list.itemClicked.connect(self.show_rule_details)
+        self.rules_list.currentRowChanged.connect(self.show_rule_details)
+        layout.addWidget(self.rules_list)
+
+        # Rule Editor Group
+        rule_group = QGroupBox("Rule Details")
+        rule_layout = QFormLayout()
+        rule_group.setLayout(rule_layout)
+
+        # Set the form layout to expand fields horizontally
+        rule_layout.setFieldGrowthPolicy(QFormLayout.ExpandingFieldsGrow)
+
+        self.allowed_origins_input = QTextEdit()
+        self.allowed_origins_input.setMaximumHeight(80)
+        rule_layout.addRow("Allowed Origins:", self.allowed_origins_input)
+        help_label = QLabel("Enter * or http://example.com\nOne origin per line")
+        help_label.setStyleSheet("QLabel { font-size: 11px; font-style: italic; color: #666; }")
+        rule_layout.addRow("", help_label)
+
+        # Methods as checkboxes
+        methods_group = QWidget()
+        methods_layout = QHBoxLayout()
+        methods_group.setLayout(methods_layout)
+        self.method_checkboxes = {}
+        for method in ["GET", "PUT", "POST", "DELETE", "HEAD"]:
+            checkbox = QCheckBox(method)
+            self.method_checkboxes[method] = checkbox
+            methods_layout.addWidget(checkbox)
+        rule_layout.addRow("Allowed Methods:", methods_group)
+
+        self.allowed_headers_input = QTextEdit()
+        self.allowed_headers_input.setMaximumHeight(80)
+        rule_layout.addRow("Allowed Headers:", self.allowed_headers_input)
+        help_label = QLabel("Enter * or specific headers\nOne header per line")
+        help_label.setStyleSheet("QLabel { font-size: 11px; font-style: italic; color: #666; }")
+        rule_layout.addRow("", help_label)
+
+        self.expose_headers_input = QTextEdit()
+        self.expose_headers_input.setMaximumHeight(80)
+        rule_layout.addRow("Expose Headers:", self.expose_headers_input)
+        help_label = QLabel("Enter headers to expose\nOne header per line")
+        help_label.setStyleSheet("QLabel { font-size: 11px; font-style: italic; color: #666; }")
+        rule_layout.addRow("", help_label)
+
+        self.max_age_input = QLineEdit()
+        rule_layout.addRow("Max Age (seconds):", self.max_age_input)
+        help_label = QLabel("Enter maximum age in seconds")
+        help_label.setStyleSheet("QLabel { font-size: 11px; font-style: italic; color: #666; }")
+        rule_layout.addRow("", help_label)
+
+        # Add buttons to form
+        buttons_widget = QWidget()
+        buttons_layout = QHBoxLayout()
+        buttons_widget.setLayout(buttons_layout)
+
+        self.save_rule_button = QPushButton("Save Changes")
+        self.save_rule_button.setIcon(QIcon(resource_path("img/save.svg")))
+        self.save_rule_button.clicked.connect(self.save_rule)
+        self.save_rule_button.setEnabled(False)
+        
+        self.delete_rule_button = QPushButton("Delete Rule")
+        self.delete_rule_button.setIcon(QIcon(resource_path("img/trash.svg")))
+        self.delete_rule_button.clicked.connect(self.delete_rule)
+        self.delete_rule_button.setEnabled(False)
+
+        buttons_layout.addWidget(self.save_rule_button)
+        buttons_layout.addWidget(self.delete_rule_button)
+        buttons_layout.setAlignment(Qt.AlignLeft)
+        rule_layout.addRow("", buttons_widget)
+
+        layout.addWidget(rule_group)
+
+        # Bottom buttons
+        button_layout = QHBoxLayout()
+        self.add_rule_button = QPushButton("Add New Rule")
+        self.add_rule_button.setIcon(QIcon(resource_path("img/plus.svg")))
+        self.add_rule_button.clicked.connect(self.add_new_rule)
+        
+        self.apply_button = QPushButton("Apply CORS Rules")
+        self.apply_button.setIcon(QIcon(resource_path("img/save.svg")))
+        self.apply_button.clicked.connect(self.apply_cors)
+
+        button_layout.addWidget(self.add_rule_button)
+        button_layout.addWidget(self.apply_button)
+        button_layout.setAlignment(Qt.AlignRight)
+        
+        layout.addLayout(button_layout)
+
+        # Start with form disabled
+        self._enable_form(False)
+        
+        # Load existing CORS configuration
+        self.load_cors_config()
+
+    def load_cors_config(self):
+        """Load existing CORS configuration for the bucket"""
+        try:
+            response = s3_session.resource.meta.client.get_bucket_cors(Bucket=self.bucket_name)
+            rules = response.get('CORSRules', [])
+            
+            for rule in rules:
+                item = QListWidgetItem(self._format_rule_display(
+                    rule['AllowedMethods'],
+                    rule['AllowedOrigins']
+                ))
+                item.setData(Qt.UserRole, rule)
+                self.rules_list.addItem(item)
+            
+            # Select first rule if any exist
+            if self.rules_list.count() > 0:
+                self.rules_list.setCurrentRow(0)
+
+        except ClientError as e:
+            if e.response['Error']['Code'] == 'NoSuchCORSConfiguration':
+                # No CORS configuration exists yet
+                pass
+            else:
+                show_error_dialog(str(e))
+
+    def show_rule_details(self, item_or_row):
+        """Show details of selected rule"""
+        # Convert row number to item if needed
+        if isinstance(item_or_row, int):
+            item = self.rules_list.item(item_or_row)
+        else:
+            item = item_or_row
+
+        if not item:
+            self._enable_form(False)
+            return
+
+        self._enable_form(True)
+        rule = item.data(Qt.UserRole)
+        self.allowed_origins_input.setPlainText("\n".join(rule.get('AllowedOrigins', [])))
+        
+        # Set method checkboxes
+        allowed_methods = rule.get('AllowedMethods', [])
+        for method, checkbox in self.method_checkboxes.items():
+            checkbox.setChecked(method in allowed_methods)
+            
+        self.allowed_headers_input.setPlainText("\n".join(rule.get('AllowedHeaders', [])))
+        self.expose_headers_input.setPlainText("\n".join(rule.get('ExposeHeaders', [])))
+        self.max_age_input.setText(str(rule.get('MaxAgeSeconds', '')))
+        self.save_rule_button.setEnabled(False)  # Disable save button when loading rule
+        self.delete_rule_button.setEnabled(True)
+
+    def add_new_rule(self):
+        """Add empty rule to the list"""
+        # Save existing changes if any
+        if self.save_rule_button.isEnabled():
+            if not self._get_rule_from_form():  # Returns None if validation fails
+                return  # Don't add new rule if current rule has validation errors
+            self.save_rule()
+
+        # Then add new rule
+        item = QListWidgetItem("New Rule")
+        item.setData(Qt.UserRole, {"AllowedOrigins": [], "AllowedMethods": []})
+        self.rules_list.addItem(item)
+        self.rules_list.setCurrentItem(item)
+        self._clear_form()
+        self._enable_form(True)
+        self.save_rule_button.setEnabled(True)
+        self.delete_rule_button.setEnabled(True)
+
+    def _format_rule_display(self, methods, origins):
+        """Format CORS rules to display in the list"""
+        methods_text = StringUtils.format_list_with_conjunction(methods)
+        origins_text = StringUtils.format_list_with_conjunction(['anywhere' if o == '*' else o for o in origins])
+        return f"{methods_text} on {origins_text}"
+
+    def save_rule(self):
+        """Save current form data to selected rule"""
+        current_item = self.rules_list.currentItem()
+        if current_item:
+            updated_rule = self._get_rule_from_form()
+            if updated_rule:
+                current_item.setData(Qt.UserRole, updated_rule)
+                current_item.setText(self._format_rule_display(
+                    updated_rule['AllowedMethods'],
+                    updated_rule['AllowedOrigins']
+                ))
+                self.save_rule_button.setEnabled(False)
+
+    def _on_form_changed(self):
+        """Enable save button when form content changes"""
+        if self.rules_list.currentItem():
+            current_rule = self.rules_list.currentItem().data(Qt.UserRole)
+            new_rule = self._get_rule_from_form(validate=False)
+            if new_rule:
+                self.save_rule_button.setEnabled(current_rule != new_rule)
+
+    def _get_rule_from_form(self, validate=True):
+        """Get rule dict from form fields"""
+        origins = [o.strip() for o in self.allowed_origins_input.toPlainText().splitlines() if o.strip()]
+        methods = [method for method, checkbox in self.method_checkboxes.items() if checkbox.isChecked()]
+        
+        if validate:
+            if not origins:
+                show_error_dialog("At least one origin is required")
+                return None
+                
+            if not methods:
+                show_error_dialog("At least one method must be selected")
+                return None
+
+        rule = {
+            "AllowedOrigins": origins,
+            "AllowedMethods": methods
+        }
+
+        headers = [h.strip() for h in self.allowed_headers_input.toPlainText().splitlines() if h.strip()]
+        if headers:
+            rule["AllowedHeaders"] = headers
+
+        expose = [h.strip() for h in self.expose_headers_input.toPlainText().splitlines() if h.strip()]
+        if expose:
+            rule["ExposeHeaders"] = expose
+
+        if self.max_age_input.text().strip():
+            try:
+                rule["MaxAgeSeconds"] = int(self.max_age_input.text())
+            except ValueError:
+                if validate:
+                    show_error_dialog("Max Age must be a number")
+                    return None
+
+        return rule
+
+    def _clear_form(self):
+        """Clear all form fields"""
+        self.allowed_origins_input.clear()
+        for checkbox in self.method_checkboxes.values():
+            checkbox.setChecked(False)
+        self.allowed_headers_input.clear()
+        self.expose_headers_input.clear()
+        self.max_age_input.clear()
+        self.save_rule_button.setEnabled(False)
+        self.delete_rule_button.setEnabled(False)
+
+    def delete_rule(self):
+        """Delete selected CORS rule"""
+        current_row = self.rules_list.currentRow()
+        if current_row >= 0:
+            self.rules_list.takeItem(current_row)
+            self._clear_form()
+            
+            # Select last rule if any exist
+            new_count = self.rules_list.count()
+            if new_count > 0:
+                last_row = new_count - 1
+                self.rules_list.setCurrentRow(last_row)
+                self.show_rule_details(last_row)  # Explicitly load the form
+            else:
+                self._enable_form(False)
+
+    def apply_cors(self):
+        """Apply CORS configuration to bucket"""
+        try:
+            rules = []
+            
+            # Update the current rule if one is selected
+            current_item = self.rules_list.currentItem()
+            if current_item:
+                updated_rule = self._get_rule_from_form()
+                if updated_rule:
+                    current_item.setData(Qt.UserRole, updated_rule)
+                    current_item.setText(f"{StringUtils.format_list_with_conjunction(updated_rule['AllowedMethods'])} on {', '.join(updated_rule['AllowedOrigins'])}")
+
+            # Collect all rules
+            for i in range(self.rules_list.count()):
+                rules.append(self.rules_list.item(i).data(Qt.UserRole))
+
+            if rules:
+                s3_session.resource.meta.client.put_bucket_cors(
+                    Bucket=self.bucket_name,
+                    CORSConfiguration={
+                        'CORSRules': rules
+                    }
+                )
+            else:
+                s3_session.resource.meta.client.delete_bucket_cors(Bucket=self.bucket_name)
+            
+            QMessageBox.information(self, "Success", "CORS configuration applied successfully")
+            
+        except Exception as e:
+            show_error_dialog(str(e))
+
+    def _enable_form(self, enabled=True):
+        """Enable/disable all form fields"""
+        self.allowed_origins_input.setEnabled(enabled)
+        for checkbox in self.method_checkboxes.values():
+            checkbox.setEnabled(enabled)
+        self.allowed_headers_input.setEnabled(enabled)
+        self.expose_headers_input.setEnabled(enabled)
+        self.max_age_input.setEnabled(enabled)
+        self.save_rule_button.setEnabled(False)  # Always start with save disabled
+        self.delete_rule_button.setEnabled(enabled)
\ No newline at end of file
diff --git a/finch/credentials.py b/finch/credentials.py
index 021e5f3..d516d55 100644
--- a/finch/credentials.py
+++ b/finch/credentials.py
@@ -3,9 +3,9 @@
 from typing import List
 
 import keyring
-from PyQt5.QtCore import QAbstractTableModel, Qt, pyqtSignal, QItemSelectionModel
+from PyQt5.QtCore import QAbstractTableModel, Qt, pyqtSignal
 from PyQt5.QtGui import QIcon
-from PyQt5.QtWidgets import QWidget, QGridLayout, QLabel, QLineEdit, QPushButton, QVBoxLayout, \
+from PyQt5.QtWidgets import QWidget, QVBoxLayout, \
     QTableView, QToolBar, QAction, QBoxLayout, QAbstractItemView, QHeaderView, QItemDelegate, QApplication, QStyle, \
     QStyledItemDelegate
 from slugify import slugify
@@ -196,7 +196,7 @@ def __init__(self):
         self.credential_toolbar.setToolButtonStyle(Qt.ToolButtonTextUnderIcon)
         add_row_action = QAction(self)
         add_row_action.setText("&Create Credential")
-        add_row_action.setIcon(QIcon(resource_path('img/plus.svg')))
+        add_row_action.setIcon(QIcon(resource_path('img/new-credential.svg')))
         add_row_action.triggered.connect(self.add_row)
 
         self.delete_row_action = QAction(self)
@@ -204,13 +204,7 @@ def __init__(self):
         self.delete_row_action.setIcon(QIcon(resource_path('img/trash.svg')))
         self.delete_row_action.triggered.connect(self.delete_row)
 
-        # save_action = QAction(self)
-        # save_action.setText("&Save Credentials")
-        # save_action.setIcon(QtGui.QIcon.fromTheme("media-floppy-symbolic"))
-        # save_action.triggered.connect(self.save_credentials)
-
         self.credential_toolbar.addAction(add_row_action)
-        # self.credential_toolbar.addAction(save_action)
 
         self.table_data = QTableView()
         self.table_data.setModel(CredentialsModel(self.temp_credentials_data))
diff --git a/finch/img/about.svg b/finch/img/about.svg
index 2cfb995..d14561b 100644
--- a/finch/img/about.svg
+++ b/finch/img/about.svg
@@ -1,31 +1 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='help-about-symbolic.svg' inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.48.5 r10040' width='16' xmlns='http://www.w3.org/2000/svg'>
-  <metadata id='metadata90'>
-    <rdf:RDF>
-      <cc:Work rdf:about=''>
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='6.91717' inkscape:cy='18.25543' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='true' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1402' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='2560' inkscape:window-y='0' inkscape:zoom='32'>
-    <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='-100px' originy='610px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'/>
-  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-341.0002,-827)'/>
-  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-341.0002,-827)'/>
-  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-341.0002,-827)'/>
-  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-341.0002,-827)'/>
-  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-341.0002,-827)'/>
-  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-341.0002,-827)'/>
-  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-341.0002,-827)'/>
-  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-341.0002,-827)'/>
-  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-341.0002,-827)'>
-    
-    <path sodipodi:arg1='1.5707963' sodipodi:arg2='2.3561945' sodipodi:cx='7.9549513' sodipodi:cy='8.0450487' d='m 7.9549515,15.20505 c -0.736079,0 -1.8727276,-4.246301 -2.3932141,-4.766787 C 5.0412509,9.9177761 0.79494952,8.7811279 0.79494953,8.0450489 0.79494954,7.3089699 5.041251,6.1723213 5.5617374,5.6518348 6.0822239,5.1313484 7.2188721,0.88504695 7.9549511,0.88504696 c 0.736079,10e-9 1.8727276,4.24630144 2.3932139,4.76678794 0.520487,0.5204864 4.766788,1.6571346 4.766788,2.3932136 0,0.736079 -4.246301,1.8727276 -4.766788,2.3932145 -0.5204863,0.520486 -1.6571345,4.766787 -2.3932135,4.766787 z' inkscape:flatsided='false' id='path67' sodipodi:r1='7.1600018' sodipodi:r2='3.3845155' inkscape:randomized='0' inkscape:rounded='0.13800197' sodipodi:sides='4' style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.03395915;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate' transform='matrix(0.97765337,0,0,0.97765339,341.22302,827.13473)' sodipodi:type='star'/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-info"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="16" x2="12" y2="12"></line><line x1="12" y1="8" x2="12.01" y2="8"></line></svg>
\ No newline at end of file
diff --git a/finch/img/close.svg b/finch/img/close.svg
index a167425..f9a189e 100644
--- a/finch/img/close.svg
+++ b/finch/img/close.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 4 4 h 1 h 0.03125 c 0.253906 0.011719 0.511719 0.128906 0.6875 0.3125 l 2.28125 2.28125 l 2.3125 -2.28125 c 0.265625 -0.230469 0.445312 -0.304688 0.6875 -0.3125 h 1 v 1 c 0 0.285156 -0.035156 0.550781 -0.25 0.75 l -2.28125 2.28125 l 2.25 2.25 c 0.1875 0.1875 0.28125 0.453125 0.28125 0.71875 v 1 h -1 c -0.265625 0 -0.53125 -0.09375 -0.71875 -0.28125 l -2.28125 -2.28125 l -2.28125 2.28125 c -0.1875 0.1875 -0.453125 0.28125 -0.71875 0.28125 h -1 v -1 c 0 -0.265625 0.09375 -0.53125 0.28125 -0.71875 l 2.28125 -2.25 l -2.28125 -2.28125 c -0.210938 -0.195312 -0.304688 -0.46875 -0.28125 -0.75 z m 0 0" fill="#bebebe"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-x"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg>
\ No newline at end of file
diff --git a/finch/img/credentials.svg b/finch/img/credentials.svg
index 3fcb5e0..5f9b0f4 100644
--- a/finch/img/credentials.svg
+++ b/finch/img/credentials.svg
@@ -1,34 +1 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='system-users-symbolic.svg' inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.48.4 r9939' width='16' xmlns='http://www.w3.org/2000/svg'>
-  <metadata id='metadata90'>
-    <rdf:RDF>
-      <cc:Work rdf:about=''>
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer11' inkscape:cx='211.96737' inkscape:cy='71.90811' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='702' inkscape:window-maximized='1' inkscape:window-width='1366' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'>
-    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='197.9998px' originy='432px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'/>
-  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-43.000399,-649)'/>
-  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-43.000399,-649)'/>
-  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-43.000399,-649)'>
-    <path inkscape:connector-curvature='0' d='m 56.288664,658.6875 c -0.493789,0.47964 -1.077431,0.69712 -1.788291,0.69712 -0.71086,0 -1.297231,-0.22349 -1.79102,-0.70313 -0.77657,0.27945 -1.705229,0.99058 -1.706257,2.23257 l -0.0027,2.3167 C 50.999881,663.65691 51.312586,664 51.700387,664 l 5.600024,0 c 0.387802,0 0.700003,-0.34309 0.700003,-0.76924 l 0,-2.30769 c 0,-1.0667 -0.77162,-1.96599 -1.711724,-2.23557 z' id='path9137' sodipodi:nodetypes='csccsssscc' style='fill:#bebebe;fill-opacity:1;stroke:none'/>
-    <path sodipodi:cx='49.5' sodipodi:cy='342.5' d='m 52,342.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z' id='path9139' sodipodi:rx='2.5' sodipodi:ry='2.5' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate' transform='matrix(0.92307481,0,0,0.92307481,8.808202,340.15457)' sodipodi:type='arc'/>
-    <path inkscape:connector-curvature='0' d='m 49.288642,654.6875 c -0.493789,0.47964 -1.077431,0.69712 -1.788291,0.69712 -0.71086,0 -1.297231,-0.22349 -1.79102,-0.70313 -0.77657,0.27945 -1.705229,0.99058 -1.706257,2.23257 l -0.0027,2.3167 C 43.999859,659.65691 44.312564,660 44.700365,660 l 5.735381,0 c 0.06219,-0.3952 0.261624,-0.72266 0.564646,-1 l 0,-2.07693 c 0,-1.0667 -0.77162,-1.96599 -1.711724,-2.23557 z' id='path9178' sodipodi:nodetypes='csccssccccc' style='fill:#bebebe;fill-opacity:1;stroke:none'/>
-    <path sodipodi:cx='49.5' sodipodi:cy='342.5' d='m 52,342.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z' id='path9180' sodipodi:rx='2.5' sodipodi:ry='2.5' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate' transform='matrix(0.92307481,0,0,0.92307481,1.80818,336.15457)' sodipodi:type='arc'/>
-    
-  </g>
-  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-43.000399,-649)'/>
-  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-43.000399,-649)'/>
-  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-43.000399,-649)'/>
-  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-43.000399,-649)'/>
-  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-43.000399,-649)'/>
-  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-43.000399,-649)'/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-users"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="9" cy="7" r="4"></circle><path d="M23 21v-2a4 4 0 0 0-3-3.87"></path><path d="M16 3.13a4 4 0 0 1 0 7.75"></path></svg>
\ No newline at end of file
diff --git a/finch/img/download.svg b/finch/img/download.svg
new file mode 100644
index 0000000..c65b7fd
--- /dev/null
+++ b/finch/img/download.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-download-cloud"><polyline points="8 17 12 21 16 17"></polyline><line x1="12" y1="12" x2="12" y2="21"></line><path d="M20.88 18.09A5 5 0 0 0 18 9h-1.26A8 8 0 1 0 3 16.29"></path></svg>
\ No newline at end of file
diff --git a/finch/img/globe.svg b/finch/img/globe.svg
new file mode 100644
index 0000000..8d97689
--- /dev/null
+++ b/finch/img/globe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-globe"><circle cx="12" cy="12" r="10"></circle><line x1="2" y1="12" x2="22" y2="12"></line><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"></path></svg>
\ No newline at end of file
diff --git a/finch/img/new-credential.svg b/finch/img/new-credential.svg
index eae33db..0c047ff 100644
--- a/finch/img/new-credential.svg
+++ b/finch/img/new-credential.svg
@@ -1,33 +1 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='contact-new-symbolic.svg' inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.48.5 r10040' width='16' xmlns='http://www.w3.org/2000/svg'>
-  <metadata id='metadata90'>
-    <rdf:RDF>
-      <cc:Work rdf:about=''>
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='12.236067' inkscape:cy='5.87665' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='true' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1375' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='45.254834'>
-    <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='-19.999998px' originy='510px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'/>
-  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-261.0002,-727)'/>
-  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-261.0002,-727)'/>
-  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-261.0002,-727)'/>
-  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-261.0002,-727)'/>
-  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-261.0002,-727)'/>
-  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-261.0002,-727)'/>
-  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-261.0002,-727)'/>
-  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-261.0002,-727)'/>
-  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-261.0002,-727)'>
-    
-    <path inkscape:connector-curvature='0' d='m 269.55489,735.09373 c -0.70541,0.62353 -1.53918,0.90625 -2.55469,0.90625 -1.01551,0 -1.85318,-0.29053 -2.55859,-0.91406 -1.10938,0.36328 -2.43603,1.28775 -2.4375,2.90234 l -0.004,3.01172 c -7.2e-4,0.554 0.446,1.00002 1,1.00002 l 8,0 c 0.554,0 1,-0.44602 1,-1.00002 l 0,-3 c 0,-1.38672 -1.10231,-2.5558 -2.44531,-2.90625 z' id='path3940-5-0' sodipodi:nodetypes='csccsssscc' style='fill:#bebebe;fill-opacity:1;stroke:none'/>
-    <path sodipodi:cx='49.5' sodipodi:cy='342.5' d='m 52,342.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z' id='path3942-6-0' sodipodi:rx='2.5' sodipodi:ry='2.5' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate' transform='matrix(1.2,0,0,1.2,207.6002,320.99997)' sodipodi:type='arc'/>
-    <path inkscape:connector-curvature='0' d='m 273.00019,728.00327 0,1.99673 -1.99999,0 0,1.99673 1.99999,0 0,1.99673 2.00001,0 0,-1.99673 2,0 0,-1.99673 -2,0 0,-1.99673 -2.00001,0 z' id='path26815-7' style='fill:#bebebe;fill-opacity:1;stroke:none;display:inline'/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-user-plus"><path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="8.5" cy="7" r="4"></circle><line x1="20" y1="8" x2="20" y2="14"></line><line x1="23" y1="11" x2="17" y2="11"></line></svg>
\ No newline at end of file
diff --git a/finch/img/new-folder.svg b/finch/img/new-folder.svg
index 6981754..eef92ad 100644
--- a/finch/img/new-folder.svg
+++ b/finch/img/new-folder.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg7384" width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata id="metadata90">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title>Gnome Symbolic Icon Theme</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <title id="title9167">Gnome Symbolic Icon Theme</title>
- <g id="layer12" transform="translate(-301 -727)">
-  <path id="path7307" d="m313 736v1.9968h-2v1.9967h2v1.9967h2v-1.9967h2v-1.9967h-2v-1.9968z" style="fill:#bebebe"/>
-  <path id="path9166-8" d="m303 728c-0.83333 0-1.5253 0.56422-1.7695 1.0527-0.24426 0.48852-0.23047 0.94727-0.23047 0.94727v10c0 0.83333 0.56422 1.5253 1.0527 1.7695 0.48852 0.24426 0.94727 0.23047 0.94727 0.23047h6s1 0 1-1-1-1-1-1h-6v-10h4.5859l2 2h5.4141v2c0 1 1 1 1 1s1 0 1-1v-2s0.0138-0.45875-0.23047-0.94727c-0.24426-0.48851-0.9362-1.0527-1.7695-1.0527h-4.5859l-2-2z" style="color-rendering:auto;color:#000000;dominant-baseline:auto;fill-rule:evenodd;fill:#bebebe;font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;image-rendering:auto;isolation:auto;mix-blend-mode:normal;shape-padding:0;shape-rendering:auto;solid-color:#000000;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
- </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-folder-plus"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"></path><line x1="12" y1="11" x2="12" y2="17"></line><line x1="9" y1="14" x2="15" y2="14"></line></svg>
\ No newline at end of file
diff --git a/finch/img/plus.svg b/finch/img/plus.svg
index 87d0cde..1367c24 100644
--- a/finch/img/plus.svg
+++ b/finch/img/plus.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg7384" width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata id="metadata90">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title>Gnome Symbolic Icon Theme</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <title id="title9167">Gnome Symbolic Icon Theme</title>
- <g id="layer12" transform="translate(-60 -726)">
-  <path id="rect31992" d="m67 729v4h-4v2h4v4h2v-4h4v-2h-4v-4h-2z" style="color:#bebebe;fill:#bebebe"/>
- </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus"><line x1="12" y1="5" x2="12" y2="19"></line><line x1="5" y1="12" x2="19" y2="12"></line></svg>
\ No newline at end of file
diff --git a/finch/img/refresh.svg b/finch/img/refresh.svg
index d7b9cff..8a8369c 100644
--- a/finch/img/refresh.svg
+++ b/finch/img/refresh.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg7384" width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata id="metadata90">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title>Gnome Symbolic Icon Theme</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <title id="title9167">Gnome Symbolic Icon Theme</title>
- <g id="layer12" transform="translate(-241 -747)">
-  <path id="path4597" d="m247.72 749c-0.19186 9e-3 -0.37223 0.0353-0.5625 0.0625-1.5222 0.21741-2.9782 1.023-3.9688 2.3438-1.9812 2.6414-1.4227 6.425 1.2188 8.4062 2.6415 1.9812 6.425 1.4227 8.4062-1.2188 0.12268-0.17164 0.18932-0.38275 0.1875-0.59375v-1h-1c-0.31415-1e-3 -0.62517 0.15406-0.8125 0.40625-1.3326 1.7767-3.817 2.1139-5.5938 0.78125-1.7767-1.3326-2.1139-3.817-0.78125-5.5938 1.3326-1.7767 3.817-2.1139 5.5938-0.78125 0.42946 0.32212 0.76954 0.73295 1.0312 1.1875h-1.4375c-0.55228 0-1 0.44772-1 1v1h6v-5-1h-1c-0.55229 0-1 0.44772-1 1v1.6875c-0.38225-0.57796-0.84927-1.0822-1.4062-1.5-1.1556-0.86677-2.532-1.2523-3.875-1.1875z" style="block-progression:tb;color:#bebebe;fill:#bebebe;text-indent:0;text-transform:none"/>
- </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-refresh-ccw"><polyline points="1 4 1 10 7 10"></polyline><polyline points="23 20 23 14 17 14"></polyline><path d="M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15"></path></svg>
\ No newline at end of file
diff --git a/finch/img/save.svg b/finch/img/save.svg
index 61622b5..631a83c 100644
--- a/finch/img/save.svg
+++ b/finch/img/save.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg7384" width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata id="metadata90">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title>Gnome Symbolic Icon Theme</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <title id="title9167">Gnome Symbolic Icon Theme</title>
- <g id="layer12" transform="translate(-80,-648)">
-  <path id="rect4390-9" d="m84.406 657a0.50005 0.50005 0 0 0-0.3125 0.21875l-1 1.5a0.50005 0.50005 0 1 0 0.8125 0.5625l1-1.5a0.50005 0.50005 0 0 0-0.5-0.78125zm7 0a0.50005 0.50005 0 0 0-0.3125 0.78125l1 1.5a0.50005 0.50005 0 1 0 0.8125-0.5625l-1-1.5a0.50005 0.50005 0 0 0-0.5-0.21875z" style="block-progression:tb;color:#bebebe;fill:#bebebe;text-indent:0;text-transform:none"/>
-  <g id="g4555" transform="translate(-80,110)">
-   <path id="path3613" d="m167 539v5.5625l-1.2812-1.2812c-0.18816-0.18815-0.45345-0.28124-0.71875-0.28125h-1v1c1e-5 0.2653 0.0931 0.53058 0.28125 0.71875l3 3 0.28125 0.28125h0.875l0.28125-0.28125 3-3c0.18819-0.18817 0.28124-0.45345 0.28125-0.71875v-1h-1c-0.2653 1e-5 -0.53059 0.0931-0.71875 0.28125l-1.2812 1.2812v-5.5625z" style="block-progression:tb;color:#000000;fill:#bebebe;text-indent:0;text-transform:none"/>
-   <path id="rect11668-7-5" d="m163 549v4h10v-4zm3.3438 1.4375c0.0208-1e-3 0.0417-1e-3 0.0625 0 0.29096-0.0556 0.59898 0.20383 0.59375 0.5v0.0625h2v-0.0625c-4e-3 -0.26416 0.23582-0.50712 0.5-0.50712s0.50373 0.24296 0.5 0.50712v0.0625c0 0.54535-0.45465 1-1 1h-2c-0.54535 0-1-0.45465-1-1v-0.0625c-0.0108-0.21706 0.13723-0.43234 0.34375-0.5z" style="color:#000000;fill-rule:evenodd;fill:#bebebe"/>
-  </g>
- </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-save"><path d="M19 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11l5 5v11a2 2 0 0 1-2 2z"></path><polyline points="17 21 17 13 7 13 7 21"></polyline><polyline points="7 3 7 8 15 8"></polyline></svg>
\ No newline at end of file
diff --git a/finch/img/search.svg b/finch/img/search.svg
index e5d0a75..727aac3 100644
--- a/finch/img/search.svg
+++ b/finch/img/search.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 6.5 0 c -3.578125 0 -6.5 2.921875 -6.5 6.5 s 2.921875 6.5 6.5 6.5 c 1.429688 0 2.753906 -0.46875 3.828125 -1.257812 l 3.945313 3.945312 c 0.957031 0.9375 2.363281 -0.5 1.40625 -1.4375 l -3.929688 -3.929688 c 0.785156 -1.074218 1.25 -2.394531 1.25 -3.820312 c 0 -3.578125 -2.921875 -6.5 -6.5 -6.5 z m 0 2 c 2.496094 0 4.5 2.003906 4.5 4.5 s -2.003906 4.5 -4.5 4.5 s -4.5 -2.003906 -4.5 -4.5 s 2.003906 -4.5 4.5 -4.5 z m 0 0" fill="#bebebe"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-search"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line></svg>
\ No newline at end of file
diff --git a/finch/img/settings.svg b/finch/img/settings.svg
new file mode 100644
index 0000000..b97ea61
--- /dev/null
+++ b/finch/img/settings.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-settings"><circle cx="12" cy="12" r="3"></circle><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"></path></svg>
\ No newline at end of file
diff --git a/finch/img/tools.svg b/finch/img/tools.svg
new file mode 100644
index 0000000..e395051
--- /dev/null
+++ b/finch/img/tools.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-tool"><path d="M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-6.91 6.91a2.12 2.12 0 0 1-3-3l6.91-6.91a6 6 0 0 1 7.94-7.94l-3.76 3.76z"></path></svg>
\ No newline at end of file
diff --git a/finch/img/trash.svg b/finch/img/trash.svg
index 422c464..4cb713f 100644
--- a/finch/img/trash.svg
+++ b/finch/img/trash.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg7384" width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata id="metadata90">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title>Gnome Symbolic Icon Theme</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <title id="title9167">Gnome Symbolic Icon Theme</title>
- <g id="layer13" transform="translate(-481 -175)">
-  <path id="path3799" d="m484 180v9h9v-9h2v9c0 2-2 2-2 2h-9c-2 0-2-2-2-2v-9zm4 1h1v6h-1zm2 0h1v6h-1zm-4 0h0.99999v6h-0.99999zm-1-6c-2 0-2 2-2 2h-2v2h15v-2h-2c0-2-2-2-2-2h-7zm0 1h7v1h-7v-1z" style="fill:#bebebe"/>
- </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-trash"><polyline points="3 6 5 6 21 6"></polyline><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path></svg>
\ No newline at end of file
diff --git a/finch/img/upload.svg b/finch/img/upload.svg
index 01c9734..17415fa 100644
--- a/finch/img/upload.svg
+++ b/finch/img/upload.svg
@@ -1,35 +1 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='document-send-symbolic.svg' inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16.000099' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.92pre3 r' viewBox='0 0 16 16.000099' width='16' xmlns='http://www.w3.org/2000/svg'>
-  <metadata id='metadata90'>
-    <rdf:RDF>
-      <cc:Work rdf:about=''>
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='13.730346' inkscape:cy='11.09041' inkscape:document-units='px' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:measure-end='0,0' inkscape:measure-start='0,0' inkscape:object-nodes='true' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1016' inkscape:window-maximized='1' inkscape:window-width='1920' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='16'>
-    <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='-160.06251' originy='590.00009' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'>
-    <linearGradient gradientTransform='matrix(-2.7365795,0.28202934,-0.18908311,-0.99988321,239.54008,-879.45557)' id='linearGradient19282' osb:paint='solid'>
-      <stop id='stop19284' offset='0' style='stop-color:#666666;stop-opacity:1;'/>
-    </linearGradient>
-  </defs>
-  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-401.06271,-807)'/>
-  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-401.06271,-807)'/>
-  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-401.06271,-807)'/>
-  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-401.06271,-807)'/>
-  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-401.06271,-807)'/>
-  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-401.06271,-807)'/>
-  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-401.06271,-807)'/>
-  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-401.06271,-807)'/>
-  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-401.06271,-807)'>
-    <path inkscape:connector-curvature='0' d='m 404.0002,808 a 1.0001,1.0001 0 0 0 -1,1 v 13 a 1.0001,1.0001 0 0 0 1,1 h 2 a 1.0001,1.0001 0 1 0 0,-2 h -1 v -11 h 5.58594 l 2.41406,2.41406 V 821 h -3 v -2 -1.58594 l 0.29297,0.29297 c 0.1875,0.18755 0.44183,0.29293 0.70703,0.29297 h 1 v -1 c 0,-0.27 -0.10919,-0.52853 -0.30273,-0.7168 l -2.69727,-2.69726 -2.70703,2.70703 c -0.18755,0.1875 -0.29293,0.44183 -0.29297,0.70703 v 1 h 1 c 0.2652,-4e-5 0.51976,-0.10566 0.70703,-0.29297 0.004,-0.003 0.007,-0.007 0.01,-0.01 l 0.28297,-0.28297 V 819 v 3 a 1.0001,1.0001 0 0 0 1,1 h 5 a 1.0001,1.0001 0 0 0 1,-1 v -10 a 1.0001,1.0001 0 0 0 -0.29297,-0.70703 l -3,-3 A 1.0001,1.0001 0 0 0 411.0002,808 Z' id='path9920' style='color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate'/>
-    
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#bebebe" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-upload-cloud"><polyline points="16 16 12 12 8 16"></polyline><line x1="12" y1="12" x2="12" y2="21"></line><path d="M20.39 18.39A5 5 0 0 0 18 9h-1.26A8 8 0 1 0 3 16.3"></path><polyline points="16 16 12 12 8 16"></polyline></svg>
\ No newline at end of file