diff --git a/docs/docs/segment-path.md b/docs/docs/segment-path.md
index 1a23cc95..e544558d 100644
--- a/docs/docs/segment-path.md
+++ b/docs/docs/segment-path.md
@@ -18,7 +18,6 @@ Display the current path.
   "foreground": "#ffffff",
   "background": "#61AFEF",
   "properties": {
-    "prefix": "  ",
     "style": "folder"
   }
 }
diff --git a/segment_path.go b/segment_path.go
index b60cd38a..7b48bd0f 100755
--- a/segment_path.go
+++ b/segment_path.go
@@ -58,8 +58,8 @@ func (pt *path) init(props *properties, env environmentInfo) {
 func (pt *path) getShortPath() string {
 	pwd := pt.env.getcwd()
 	mappedLocations := map[string]string{
-		"HKCU:": pt.props.getString(WindowsRegistryIcon, "REGISTRY"),
-		"HKLM:": pt.props.getString(WindowsRegistryIcon, "REGISTRY"),
+		"HKCU:": pt.props.getString(WindowsRegistryIcon, "\uE0B1"),
+		"HKLM:": pt.props.getString(WindowsRegistryIcon, "\uE0B1"),
 		"Microsoft.PowerShell.Core\\FileSystem::": "",
 		pt.env.homeDir(): pt.props.getString(HomeIcon, "~"),
 	}
diff --git a/themes/agnoster.json b/themes/agnoster.json
index 908ee303..ebee0881 100644
--- a/themes/agnoster.json
+++ b/themes/agnoster.json
@@ -28,10 +28,9 @@
           "foreground": "#100e23",
           "background": "#91ddff",
           "properties" : {
-              "home_icon": "",
-              "folder_icon": "",
-              "windows_registry_icon": "",
-              "folder_separator_icon": "  ",
+              "home_icon": "\uF7DB",
+              "folder_icon": "\uF115",
+              "folder_separator_icon": " \uE0B1 ",
               "style": "agnoster"
           }
         },
diff --git a/themes/agnosterplus.json b/themes/agnosterplus.json
index 7d8884c7..5578f5a8 100644
--- a/themes/agnosterplus.json
+++ b/themes/agnosterplus.json
@@ -40,10 +40,9 @@
           "foreground": "#100e23",
           "background": "#91ddff",
           "properties" : {
-              "home_icon": "",
-              "folder_icon": "",
-              "windows_registry_icon": "",
-              "folder_separator_icon": "  ",
+              "home_icon": "\uF7DB",
+              "folder_icon": "\uF115",
+              "folder_separator_icon": " \uE0B1 ",
               "style": "agnoster"
           }
         },
diff --git a/themes/aliens.json b/themes/aliens.json
index d503cde4..6ecfb930 100644
--- a/themes/aliens.json
+++ b/themes/aliens.json
@@ -23,7 +23,6 @@
           "foreground": "#ffffff",
           "background": "#C678DD",
           "properties": {
-            "home_icon": "~",
             "style": "short"
           }
         },
diff --git a/themes/avit.json b/themes/avit.json
index 9fa3743e..5ce9e754 100644
--- a/themes/avit.json
+++ b/themes/avit.json
@@ -10,7 +10,6 @@
           "foreground": "#ffffff",
           "properties": {
             "prefix": "",
-            "home_icon": "~",
             "style": "short"
           }
         },
diff --git a/themes/darkblood.json b/themes/darkblood.json
index fdfb7e6e..0813af60 100644
--- a/themes/darkblood.json
+++ b/themes/darkblood.json
@@ -56,7 +56,6 @@
           "style": "plain",
           "foreground": "#ffffff",
           "properties": {
-            "home_icon": "~",
             "style": "short",
             "prefix": "<#CB4B16>┖[</>",
             "postfix": "<#CB4B16>]></>"
diff --git a/themes/emodipt.json b/themes/emodipt.json
index aad42bc5..c929fbe2 100644
--- a/themes/emodipt.json
+++ b/themes/emodipt.json
@@ -24,7 +24,6 @@
           "style": "plain",
           "foreground": "#61AFEF",
           "properties": {
-            "home_icon": "~",
             "style": "agnoster",
             "postfix": " on"
           }
diff --git a/themes/fish.json b/themes/fish.json
index 215d3d1b..60c958b2 100644
--- a/themes/fish.json
+++ b/themes/fish.json
@@ -31,9 +31,7 @@
           "foreground": "#ffffff",
           "background": "#007ACC",
           "properties" : {
-              "home_icon": "~",
-              "folder_icon": "",
-              "windows_registry_icon": "",
+              "folder_icon": "\uF115",
               "folder_separator_icon": "",
               "style": "short",
               "prefix": "<transparent>\uE0B0</> ",
diff --git a/themes/honukai.json b/themes/honukai.json
index c22745a6..1d599a8c 100644
--- a/themes/honukai.json
+++ b/themes/honukai.json
@@ -20,9 +20,7 @@
           "style": "plain",
           "foreground": "#0973C0",
           "properties": {
-            "home_icon": "~",
-            "folder_icon": "",
-            "windows_registry_icon": "",
+            "folder_icon": "\uF115",
             "folder_separator_icon": "",
             "style": "short"
           }
diff --git a/themes/paradox.json b/themes/paradox.json
index df68d995..35793928 100644
--- a/themes/paradox.json
+++ b/themes/paradox.json
@@ -28,9 +28,7 @@
           "foreground": "#100e23",
           "background": "#91ddff",
           "properties": {
-            "home_icon": "~",
-            "folder_icon": "",
-            "windows_registry_icon": "",
+            "folder_icon": "\uF115",
             "folder_separator_icon": "",
             "style": "short"
           }
diff --git a/themes/powerlevel10k_classic.json b/themes/powerlevel10k_classic.json
index ed1b152a..a2ff2f29 100644
--- a/themes/powerlevel10k_classic.json
+++ b/themes/powerlevel10k_classic.json
@@ -25,7 +25,6 @@
           "foreground": "#26C6DA",
           "background": "#546E7A",
           "properties": {
-            "home_icon": "~",
             "style": "short",
             "postfix": " "
           }
diff --git a/themes/powerlevel10k_lean.json b/themes/powerlevel10k_lean.json
index d8513481..9004208e 100644
--- a/themes/powerlevel10k_lean.json
+++ b/themes/powerlevel10k_lean.json
@@ -28,7 +28,6 @@
           "foreground": "#77E4F7",
           "properties": {
             "prefix": "",
-            "home_icon": "~",
             "style": "short"
           }
         },
diff --git a/themes/powerline.json b/themes/powerline.json
index f63d204a..3f4a0bf6 100644
--- a/themes/powerline.json
+++ b/themes/powerline.json
@@ -24,7 +24,6 @@
           "foreground": "#100e23",
           "background": "#91ddff",
           "properties" : {
-              "home_icon": "~",
               "style": "short"
           }
         },
diff --git a/themes/sorin.json b/themes/sorin.json
index 8b4ba123..e6f3d0a8 100644
--- a/themes/sorin.json
+++ b/themes/sorin.json
@@ -27,7 +27,6 @@
           "style": "plain",
           "foreground": "#0973C0",
           "properties": {
-            "home_icon": "~",
             "style": "short"
           }
         },
diff --git a/themes/star.json b/themes/star.json
index 5dcab81b..204da2b4 100644
--- a/themes/star.json
+++ b/themes/star.json
@@ -19,7 +19,6 @@
           "style": "plain",
           "foreground": "#55B9C4",
           "properties": {
-            "home_icon": "~",
             "style": "folder",
             "prefix": ""
           }