diff --git a/setup.sh b/setup.sh
index a62312d7..af6f1dbf 100644
--- a/setup.sh
+++ b/setup.sh
@@ -13,26 +13,17 @@ usage() {
 }
 
 # Parse command-line options
-while getopts ":i:-:" opt; do
-    case $opt in
-        i)
-            icon="$OPTARG"
+while [[ $# -gt 0 ]]; do
+    key="$1"
+
+    case $key in
+        --icon)
+            icon="$2"
+            shift # past argument
+            shift # past value
             ;;
-        -)
-            case "${OPTARG}" in
-                icon=*)
-                    icon="${OPTARG#*=}"
-                    ;;
-                *)
-                    usage
-                    ;;
-            esac
-            ;;
-        :)
-            echo "Option -$OPTARG requires an argument."
-            usage
-            ;;
-        ?)
+        *)
+            # unknown option
             usage
             ;;
     esac
@@ -69,14 +60,14 @@ overwrite_starship_toml() {
     if [ -f "./terminal/starship.toml" ]; then
         echo "Overwriting starship.toml..."
         mkdir -p ~/.config/starship
-        cp ./terminal/starship.toml ~/.config/starship.toml
+        cp ./terminal/starship.toml ~/.config/starship/starship.toml
         
         # Check if icon parameter is provided
         if [ ! -z "$icon" ]; then
             echo "Adding icon [$icon](bg:color_purple fg:color_white) to starship.toml..."
             # Escape special characters in icon variable for sed
             escaped_icon=$(printf '%s\n' "$icon" | sed -e 's/[]\/$*.^[]/\\&/g')
-            sed -i "5i\icon = \"$escaped_icon\"" ~/.config/starship.toml
+            sed -i "5i\icon = \"$escaped_icon\"" ~/.config/starship/starship.toml
         fi
 
     else