Repository: JanDeDobbeleer/oh-my-posh
Pull request #3810 (2023-05-08 08:42:34)

fix(font)!: update to Nerd Font V3
fix(font)!: update to Nerd Font V3



Patch:
diff --git a/src/engine/config.go b/src/engine/config.go
index 076013c1..c5e69240 100644
--- a/src/engine/config.go
+++ b/src/engine/config.go
@@ -325,7 +325,7 @@ func defaultConfig(env platform.Environment, warning bool) *Config {
 						TrailingDiamond: "\ue0b0",
 						Background:      "p:yellow",
 						Foreground:      "p:black",
-						Template:        " {{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }} ",
+						Template:        " {{ if .SSHSession }}\U000f0318 {{ end }}{{ .UserName }} ",
 					},
 					{
 						Type:            PATH,
@@ -336,7 +336,7 @@ func defaultConfig(env platform.Environment, warning bool) *Config {
 						Properties: properties.Map{
 							properties.Style: "folder",
 						},
-						Template: " \uf74a {{ path .Path .Location }} ",
+						Template: " \U000f024b {{ path .Path .Location }} ",
 					},
 					{
 						Type:            GIT,
@@ -396,7 +396,7 @@ func defaultConfig(env platform.Environment, warning bool) *Config {
 						Style:      Plain,
 						Background: "transparent",
 						Foreground: "p:green",
-						Template:   "\uf898 ",
+						Template:   "\U000f0399 ",
 						Properties: properties.Map{
 							segments.HomeEnabled:         false,
 							segments.FetchPackageManager: false,
@@ -408,7 +408,7 @@ func defaultConfig(env platform.Environment, warning bool) *Config {
 						Style:      Plain,
 						Background: "transparent",
 						Foreground: "p:blue",
-						Template:   "\ufcd1 ",
+						Template:   "\U000f07d3 ",
 						Properties: properties.Map{
 							properties.FetchVersion: false,
 						},
diff --git a/src/engine/image.go b/src/engine/image.go
index f54ebb38..a7934990 100644
--- a/src/engine/image.go
+++ b/src/engine/image.go
@@ -220,7 +220,7 @@ var doubleWidthRunes = []RuneRange{
 	// Font Awesome Extension
 	{Start: '\ue200', End: '\ue2a9'},
 	// Material Design Icons
-	{Start: '\uf500', End: '\ufd46'},
+	{Start: '\U000f0001', End: '\U000f0848'},
 	// Weather
 	{Start: '\ue300', End: '\ue3eb'},
 	// Octicons
diff --git a/src/engine/migrate.go b/src/engine/migrate.go
index dc1b362e..4d58ea6e 100644
--- a/src/engine/migrate.go
+++ b/src/engine/migrate.go
@@ -109,7 +109,7 @@ func (segment *Segment) migrationOne(env platform.Environment) {
 	case SESSION:
 		hasTemplate := segment.hasProperty(segmentTemplate)
 		segment.migrateTemplate()
-		segment.migrateIconOverride("ssh_icon", "\uf817 ")
+		segment.migrateIconOverride("ssh_icon", "\U000f0318 ")
 		template := segment.Properties.GetString(segmentTemplate, segment.writer.Template())
 		template = strings.ReplaceAll(template, ".ComputerName", ".HostName")
 		if !segment.Properties.GetBool(properties.Property("display_host"), true) {
diff --git a/src/segments/connection.go b/src/segments/connection.go
index 699f1043..75f9fb24 100644
--- a/src/segments/connection.go
+++ b/src/segments/connection.go
@@ -19,7 +19,7 @@ const (
 )
 
 func (c *Connection) Template() string {
-	return " {{ if eq .Type \"wifi\"}}\uf1eb{{ else if eq .Type \"ethernet\"}}\uf6ff{{ end }} "
+	return " {{ if eq .Type \"wifi\"}}\uf1eb{{ else if eq .Type \"ethernet\"}}\U000f0200{{ end }} "
 }
 
 func (c *Connection) Enabled() bool {
diff --git a/src/segments/fossil.go b/src/segments/fossil.go
index b094808b..d911ea86 100644
--- a/src/segments/fossil.go
+++ b/src/segments/fossil.go
@@ -34,7 +34,7 @@ type Fossil struct {
 }
 
 func (f *Fossil) Template() string {
-	return " \ufb2b {{.Branch}} {{.Status.String}} "
+	return " \U000f062c {{.Branch}} {{.Status.String}} "
 }
 
 func (f *Fossil) Enabled() bool {
diff --git a/src/segments/owm.go b/src/segments/owm.go
index 4c8cbcbe..a7a41d70 100644
--- a/src/segments/owm.go
+++ b/src/segments/owm.go
@@ -114,7 +114,7 @@ func (d *Owm) setStatus() error {
 	case "01n":
 		fallthrough
 	case "01d":
-		icon = "\ufa98"
+		icon = "\U000f0599"
 	case "02n":
 		fallthrough
 	case "02d":
@@ -130,7 +130,7 @@ func (d *Owm) setStatus() error {
 	case "09n":
 		fallthrough
 	case "09d":
-		icon = "\ufa95"
+		icon = "\U000f0596"
 	case "10n":
 		fallthrough
 	case "10d":
@@ -159,7 +159,7 @@ func (d *Owm) setStatus() error {
 	case "":
 		fallthrough
 	case "standard":
-		d.UnitIcon = "°K" // \ufa05"
+		d.UnitIcon = "°K" // \U000f0506"
 	}
 	return nil
 }
diff --git a/src/segments/project.go b/src/segments/project.go
index 6e4ed69b..fae97a60 100644
--- a/src/segments/project.go
+++ b/src/segments/project.go
@@ -75,7 +75,7 @@ func (n *Project) Enabled() bool {
 }
 
 func (n *Project) Template() string {
-	return " {{ if .Error }}{{ .Error }}{{ else }}{{ if .Version }}\uf487 {{.Version}} {{ end }}{{ if .Name }}{{ .Name }} {{ end }}{{ if .Target }}\uf9fd {{.Target}} {{ end }}{{ end }}" //nolint:lll
+	return " {{ if .Error }}{{ .Error }}{{ else }}{{ if .Version }}\uf487 {{.Version}} {{ end }}{{ if .Name }}{{ .Name }} {{ end }}{{ if .Target }}\U000f04fe {{.Target}} {{ end }}{{ end }}" //nolint:lll
 }
 
 func (n *Project) Init(props properties.Properties, env platform.Environment) {
diff --git a/src/segments/session.go b/src/segments/session.go
index 59a5be55..5dc7ede8 100644
--- a/src/segments/session.go
+++ b/src/segments/session.go
@@ -22,7 +22,7 @@ func (s *Session) Enabled() bool {
 }
 
 func (s *Session) Template() string {
-	return " {{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }}@{{ .HostName }} "
+	return " {{ if .SSHSession }}\U000f0318 {{ end }}{{ .UserName }}@{{ .HostName }} "
 }
 
 func (s *Session) Init(props properties.Properties, env platform.Environment) {
diff --git a/src/segments/strava.go b/src/segments/strava.go
index 6791e516..d4d83c9f 100644
--- a/src/segments/strava.go
+++ b/src/segments/strava.go
@@ -111,9 +111,9 @@ func (s *Strava) getActivityIcon() string {
 	case "VirtualRide":
 		fallthrough
 	case "Ride":
-		return s.props.GetString(RideIcon, "\uf5a2")
+		return s.props.GetString(RideIcon, "\U000f00a3")
 	case "Run":
-		return s.props.GetString(RunIcon, "\ufc0c")
+		return s.props.GetString(RunIcon, "\U000f070e")
 	case "NordicSki":
 	case "AlpineSki":
 	case "BackcountrySki":
diff --git a/themes/1_shell.omp.json b/themes/1_shell.omp.json
index d3b4a893..b6c909f0 100644
--- a/themes/1_shell.omp.json
+++ b/themes/1_shell.omp.json
@@ -34,7 +34,7 @@
             "fetch_worktree_count": true
           },
           "style": "diamond",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         }
       ],
@@ -75,7 +75,7 @@
         {
           "foreground": "#81ff91",
           "style": "diamond",
-          "template": "<#ffffff>\uf6dc</> <#ffffff>RAM:</> {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB ",
+          "template": "<#ffffff>\udb80\udddd</> <#ffffff>RAM:</> {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB ",
           "type": "sysinfo"
         }
       ],
@@ -90,7 +90,7 @@
           "leading_diamond": "<#00c7fc> \ue285 </><#ffafd2>{</>",
           "properties": {
             "folder_icon": "\uf07b",
-            "folder_separator_icon": "\uf9e0",
+            "folder_separator_icon": "\udb81\udce1",
             "home_icon": "home",
             "style": "agnoster_full"
           },
diff --git a/themes/M365Princess.omp.json b/themes/M365Princess.omp.json
index 5298c293..a53c00f8 100644
--- a/themes/M365Princess.omp.json
+++ b/themes/M365Princess.omp.json
@@ -18,7 +18,7 @@
           "foreground": "#ffffff",
           "background": "#047e84",
           "powerline_symbol": "\ue0b0",
-          "template": "{{ if .Env.PNPPSSITE }} \uf672 {{ .Env.PNPPSSITE }}{{ end }}"
+          "template": "{{ if .Env.PNPPSSITE }} \udb80\udd73 {{ .Env.PNPPSSITE }}{{ end }}"
         },
         {
           "type": "text",
@@ -64,7 +64,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " \u279c ({{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }}) ",
+          "template": " \u279c ({{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }}) ",
           "type": "git"
         },
         {
diff --git a/themes/agnoster.omp.json b/themes/agnoster.omp.json
index 9f5b798e..6910259a 100644
--- a/themes/agnoster.omp.json
+++ b/themes/agnoster.omp.json
@@ -27,7 +27,7 @@
           "properties": {
             "folder_icon": "\uf115",
             "folder_separator_icon": " \ue0b1 ",
-            "home_icon": "\uf7db",
+            "home_icon": "\udb80\udedc",
             "style": "agnoster"
           },
           "style": "powerline",
diff --git a/themes/agnosterplus.omp.json b/themes/agnosterplus.omp.json
index a56c5ffe..89e125a6 100644
--- a/themes/agnosterplus.omp.json
+++ b/themes/agnosterplus.omp.json
@@ -33,7 +33,7 @@
           "properties": {
             "folder_icon": "\uf115",
             "folder_separator_icon": " \ue0b1 ",
-            "home_icon": "\uf7db",
+            "home_icon": "\udb80\udedc",
             "style": "agnoster"
           },
           "style": "powerline",
diff --git a/themes/amro.omp.json b/themes/amro.omp.json
index cfebf14b..e4056d8b 100644
--- a/themes/amro.omp.json
+++ b/themes/amro.omp.json
@@ -7,7 +7,7 @@
         {
           "foreground": "#45F1C2",
           "style": "plain",
-          "template": "\uf508 {{ .UserName }} on",
+          "template": "\udb80\udc09 {{ .UserName }} on",
           "type": "session"
         },
         {
@@ -28,7 +28,7 @@
             "fetch_upstream_icon": true
           },
           "style": "plain",
-          "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         }
       ],
diff --git a/themes/atomic.omp.json b/themes/atomic.omp.json
index 2e7bdc69..b55dc1f5 100644
--- a/themes/atomic.omp.json
+++ b/themes/atomic.omp.json
@@ -25,11 +25,11 @@
           "powerline_symbol": "\ue0b0",
           "properties": {
             "folder_icon": " \uf07b ",
-            "home_icon": "\uf7dd",
+            "home_icon": "\udb80\udede",
             "style": "folder"
           },
           "style": "powerline",
-          "template": " \uf07b\uf553{{ .Path }} ",
+          "template": " \uf07b\udb80\udc54{{ .Path }} ",
           "type": "path"
         },
         {
@@ -59,7 +59,7 @@
             "threshold": 0
           },
           "style": "diamond",
-          "template": " \ufa1e{{ .FormattedMs }}\u2800",
+          "template": " \udb81\udd1f{{ .FormattedMs }}\u2800",
           "trailing_diamond": "\ue0b4",
           "type": "executiontime"
         }
@@ -76,7 +76,7 @@
           "properties": {
             "fetch_package_manager": true,
             "npm_icon": " <#cc3a3a>\ue5fa</> ",
-            "yarn_icon": " <#348cba>\uf61a</>"
+            "yarn_icon": " <#348cba>\udb80\udd1b</>"
           },
           "style": "diamond",
           "template": "\ue718 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}",
@@ -115,7 +115,7 @@
           "foreground": "#06aad5",
           "leading_diamond": "\ue0b6",
           "style": "diamond",
-          "template": "\ufcd1 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
+          "template": "\udb81\udfd3 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
           "trailing_diamond": "\ue0b4 ",
           "type": "go"
         },
@@ -196,7 +196,7 @@
           "foreground": "#ffffff",
           "leading_diamond": "\ue0b6",
           "style": "diamond",
-          "template": "\ufd31 {{.Context}}{{if .Namespace}} :: {{.Namespace}}{{end}}",
+          "template": "\udb82\udc33 {{.Context}}{{if .Namespace}} :: {{.Namespace}}{{end}}",
           "trailing_diamond": "\ue0b4",
           "type": "kubectl"
         },
@@ -224,7 +224,7 @@
           "invert_powerline": true,
           "leading_diamond": "\ue0b2",
           "properties": {
-            "charged_icon": "\uf58e ",
+            "charged_icon": "\udb85\udfe6 ",
             "charging_icon": "\uf1e6 ",
             "discharging_icon": "\ue234 "
           },
@@ -241,7 +241,7 @@
             "time_format": "_2,15:04"
           },
           "style": "diamond",
-          "template": " \uf5ef {{ .CurrentDate | date .Format }} ",
+          "template": " \udb80\udcf0 {{ .CurrentDate | date .Format }} ",
           "trailing_diamond": "\ue0b4",
           "type": "time"
         }
@@ -265,7 +265,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": "\ue285\ufb00 ",
+          "template": "\ue285\udb81\ude01 ",
           "type": "exit"
         }
       ],
diff --git a/themes/atomicBit.omp.json b/themes/atomicBit.omp.json
index 0c229755..736eaf3a 100644
--- a/themes/atomicBit.omp.json
+++ b/themes/atomicBit.omp.json
@@ -32,7 +32,7 @@
           "properties": {
             "fetch_package_manager": true,
             "npm_icon": " <#cc3a3a>\ue5fa</> ",
-            "yarn_icon": " <#348cba>\uf61a</>"
+            "yarn_icon": " <#348cba>\udb80\udd1b</>"
           },
           "style": "plain",
           "template": "<#ffffff>(</>{{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}<#ffffff>)</>",
@@ -135,7 +135,7 @@
             "{{if eq \"Full\" .State.String}}#33DD2D{{end}}"
           ],
           "properties": {
-            "charged_icon": "\uf58e ",
+            "charged_icon": "\udb85\udfe6 ",
             "charging_icon": "\uf1e6 ",
             "discharging_icon": "\ue234 "
           },
@@ -149,7 +149,7 @@
             "time_format": "_2,15:04"
           },
           "style": "plain",
-          "template": "<#ffffff>[</>\uf5ef{{ .CurrentDate | date .Format }}<#ffffff>]</>",
+          "template": "<#ffffff>[</>\udb80\udcf0{{ .CurrentDate | date .Format }}<#ffffff>]</>",
           "type": "time"
         }
       ],
@@ -182,7 +182,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": "\ue285\ufb00 ",
+          "template": "\ue285\udb81\ude01 ",
           "type": "exit"
         }
       ],
diff --git a/themes/blue-owl.omp.json b/themes/blue-owl.omp.json
index 94fc1617..1580e62b 100644
--- a/themes/blue-owl.omp.json
+++ b/themes/blue-owl.omp.json
@@ -23,9 +23,9 @@
           "foreground": "#ffffff",
           "leading_diamond": "<transparent,#01579B>\ue0b0</>",
           "properties": {
-            "folder_icon": "\uf6d7",
+            "folder_icon": "\udb80\uddd8",
             "folder_separator_icon": "<transparent> \ue0bd </>",
-            "home_icon": "\uf7db",
+            "home_icon": "\udb80\udedc",
             "style": "agnoster_short"
           },
           "style": "diamond",
@@ -48,7 +48,7 @@
             "fetch_status": true
           },
           "style": "powerline",
-          "template": " {{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
diff --git a/themes/blueish.omp.json b/themes/blueish.omp.json
index 2e4b1bac..c29e2936 100644
--- a/themes/blueish.omp.json
+++ b/themes/blueish.omp.json
@@ -34,7 +34,7 @@
           "foreground": "#193549",
           "powerline_symbol": "\ue0b0",
           "style": "powerline",
-          "template": " {{ if not .Error }}{{ .Icon }}{{ .Percentage }}{{ end }}{{ .Error }}\uf295 \uf583 ",
+          "template": " {{ if not .Error }}{{ .Icon }}{{ .Percentage }}{{ end }}{{ .Error }}\uf295 \udb80\udc84 ",
           "type": "battery"
         },
         {
@@ -57,7 +57,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -81,7 +81,7 @@
           "foreground": "#ffffff",
           "powerline_symbol": "\ue0b0",
           "style": "powerline",
-          "template": " \ufd31 {{.Context}} :: {{if .Namespace}}{{.Namespace}}{{else}}default{{end}} ",
+          "template": " \udb82\udc33 {{.Context}} :: {{if .Namespace}}{{.Namespace}}{{else}}default{{end}} ",
           "type": "kubectl"
         },
         {
@@ -95,7 +95,7 @@
             "always_enabled": true
           },
           "style": "diamond",
-          "template": " \ufc8d ",
+          "template": " \udb81\udf8f ",
           "trailing_diamond": "\ue0b0",
           "type": "exit"
         }
diff --git a/themes/bubbles.omp.json b/themes/bubbles.omp.json
index 08e43b0b..4b404303 100644
--- a/themes/bubbles.omp.json
+++ b/themes/bubbles.omp.json
@@ -57,7 +57,7 @@
             "fetch_version": false
           },
           "style": "diamond",
-          "template": "\ufcd1{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
+          "template": "\udb81\udfd3{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
           "trailing_diamond": "\ue0b4",
           "type": "go"
         },
diff --git a/themes/bubblesextra.omp.json b/themes/bubblesextra.omp.json
index fd4b4bf3..5c12ac1f 100644
--- a/themes/bubblesextra.omp.json
+++ b/themes/bubblesextra.omp.json
@@ -33,7 +33,7 @@
             "fetch_upstream_icon": true
           },
           "style": "diamond",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "trailing_diamond": "\ue0b4",
           "type": "git"
         },
@@ -57,7 +57,7 @@
             "fetch_version": false
           },
           "style": "diamond",
-          "template": "\ufcd1{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
+          "template": "\udb81\udfd3{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
           "trailing_diamond": "\ue0b4",
           "type": "go"
         },
diff --git a/themes/bubblesline.omp.json b/themes/bubblesline.omp.json
index 727febce..533e3e02 100644
--- a/themes/bubblesline.omp.json
+++ b/themes/bubblesline.omp.json
@@ -48,7 +48,7 @@
             "fetch_version": false
           },
           "style": "diamond",
-          "template": "\ufcd1{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
+          "template": "\udb81\udfd3{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
           "trailing_diamond": "\ue0b4",
           "type": "go"
         },
diff --git a/themes/capr4n.omp.json b/themes/capr4n.omp.json
index 2d0d47b4..2a9558fe 100644
--- a/themes/capr4n.omp.json
+++ b/themes/capr4n.omp.json
@@ -8,7 +8,7 @@
           "background": "#003543",
           "foreground": "#ffffff",
           "style": "plain",
-          "template": " \uf64f {{ .CurrentDate | date .Format }} ",
+          "template": " \udb82\udd54 {{ .CurrentDate | date .Format }} ",
           "type": "time"
         },
         {
@@ -18,7 +18,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": " \ufa1e{{ .FormattedMs }} ",
+          "template": " \udb81\udd1f{{ .FormattedMs }} ",
           "type": "executiontime"
         }
       ],
diff --git a/themes/catppuccin.omp.json b/themes/catppuccin.omp.json
index 11d6b155..b47ae973 100644
--- a/themes/catppuccin.omp.json
+++ b/themes/catppuccin.omp.json
@@ -1,71 +1,71 @@
-{
-  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
-  "palette": {
-        "os": "#ACB0BE",
-        "pink": "#F5BDE6",
-        "lavender": "#B7BDF8",
-        "blue":  "#8AADF4",
-        "wight": "#FFFFFF",
-        "text": "#494D64"
-  },
-  "blocks": [
-    {
-      "alignment": "left",
-      "segments": [
-        {
-          "background": "p:blue",
-          "foreground": "p:wight",
-          "powerline_symbol": "\ue0b4",
-          "leading_diamond": "\ue0b6",
-          "style": "diamond",
-          "template": "{{.Icon}} ",
-          "type": "os"
-        },
-        {
-          "background": "p:blue",
-          "foreground": "p:text",
-          "powerline_symbol": "\ue0b4",
-          "style": "diamond",
-          "template": "{{ .UserName }}@{{ .HostName }}",
-          "type": "session"
-        },
-        {
-          "background": "p:pink",
-          "foreground": "p:text",
-          "properties": {
-            "folder_icon": "..\ue5fe..",
-            "home_icon": "~",
-            "style": "agnoster_short"
-          },
-          "powerline_symbol": "\ue0b4",
-          "style": "powerline",
-          "template": " {{ .Path }}",
-          "type": "path"
-        },
-        {
-          "background": "p:lavender",
-          "foreground": "p:text",
-          "style": "powerline",
-          "properties": {
-            "branch_icon": "\ue725 ",
-            "cherry_pick_icon": "\ue29b ",
-            "commit_icon": "\uf417 ",
-            "fetch_status": false,
-            "fetch_upstream_icon": false,
-            "merge_icon": "\ue727 ",
-            "no_commits_icon": "\uf594 ",
-            "rebase_icon": "\ue728 ",
-            "revert_icon": "\uf0e2 ",
-            "tag_icon": "\uf412 "
-          },
-          "powerline_symbol": "\ue0b4",
-          "template": " {{ .HEAD }}",
-          "type": "git"
-        }
-      ],
-      "type": "prompt"
-    }
-  ],
-  "final_space": true,
-  "version": 2
-}
+{
+  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+  "palette": {
+        "os": "#ACB0BE",
+        "pink": "#F5BDE6",
+        "lavender": "#B7BDF8",
+        "blue":  "#8AADF4",
+        "wight": "#FFFFFF",
+        "text": "#494D64"
+  },
+  "blocks": [
+    {
+      "alignment": "left",
+      "segments": [
+        {
+          "background": "p:blue",
+          "foreground": "p:wight",
+          "powerline_symbol": "\ue0b4",
+          "leading_diamond": "\ue0b6",
+          "style": "diamond",
+          "template": "{{.Icon}} ",
+          "type": "os"
+        },
+        {
+          "background": "p:blue",
+          "foreground": "p:text",
+          "powerline_symbol": "\ue0b4",
+          "style": "diamond",
+          "template": "{{ .UserName }}@{{ .HostName }}",
+          "type": "session"
+        },
+        {
+          "background": "p:pink",
+          "foreground": "p:text",
+          "properties": {
+            "folder_icon": "..\ue5fe..",
+            "home_icon": "~",
+            "style": "agnoster_short"
+          },
+          "powerline_symbol": "\ue0b4",
+          "style": "powerline",
+          "template": " {{ .Path }}",
+          "type": "path"
+        },
+        {
+          "background": "p:lavender",
+          "foreground": "p:text",
+          "style": "powerline",
+          "properties": {
+            "branch_icon": "\ue725 ",
+            "cherry_pick_icon": "\ue29b ",
+            "commit_icon": "\uf417 ",
+            "fetch_status": false,
+            "fetch_upstream_icon": false,
+            "merge_icon": "\ue727 ",
+            "no_commits_icon": "\udb80\udc95 ",
+            "rebase_icon": "\ue728 ",
+            "revert_icon": "\uf0e2 ",
+            "tag_icon": "\uf412 "
+          },
+          "powerline_symbol": "\ue0b4",
+          "template": " {{ .HEAD }}",
+          "type": "git"
+        }
+      ],
+      "type": "prompt"
+    }
+  ],
+  "final_space": true,
+  "version": 2
+}
diff --git a/themes/catppuccin_frappe.omp.json b/themes/catppuccin_frappe.omp.json
index d9b30a20..ce1aac97 100644
--- a/themes/catppuccin_frappe.omp.json
+++ b/themes/catppuccin_frappe.omp.json
@@ -1,68 +1,68 @@
-{
-  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
-  "palette": {
-        "os": "#ACB0BE",
-        "closer": "p:os",
-        "pink": "#F4B8E4",
-        "lavender": "#BABBF1",
-        "blue":  "#8CAAEE"
-  },
-  "blocks": [
-    {
-      "alignment": "left",
-      "segments": [
-        {
-          "foreground": "p:os",
-          "style": "plain",
-          "template": "{{.Icon}} ",
-          "type": "os"
-        },
-        {
-          "foreground": "p:blue",
-          "style": "plain",
-          "template": "{{ .UserName }}@{{ .HostName }} ",
-          "type": "session"
-        },
-        {
-          "foreground": "p:pink",
-          "properties": {
-            "folder_icon": "..\ue5fe..",
-            "home_icon": "~",
-            "style": "agnoster_short"
-          },
-          "style": "plain",
-          "template": "{{ .Path }} ",
-          "type": "path"
-        },
-        {
-          "foreground": "p:lavender",
-          "properties": {
-            "branch_icon": "\ue725 ",
-            "cherry_pick_icon": "\ue29b ",
-            "commit_icon": "\uf417 ",
-            "fetch_status": false,
-            "fetch_upstream_icon": false,
-            "merge_icon": "\ue727 ",
-            "no_commits_icon": "\uf594 ",
-            "rebase_icon": "\ue728 ",
-            "revert_icon": "\uf0e2 ",
-            "tag_icon": "\uf412 "
-          },
-          "template": "{{ .HEAD }} ",
-          "style": "plain",
-          "type": "git"
-        },
-        {
-          "style": "plain",
-          "foreground": "p:closer",
-          "template": "\uf105",
-          "type": "text"
-        }
-      ],
-      "type": "prompt"
-    }
-  ],
-  "final_space": true,
-  "version": 2
-}
-
+{
+  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+  "palette": {
+        "os": "#ACB0BE",
+        "closer": "p:os",
+        "pink": "#F4B8E4",
+        "lavender": "#BABBF1",
+        "blue":  "#8CAAEE"
+  },
+  "blocks": [
+    {
+      "alignment": "left",
+      "segments": [
+        {
+          "foreground": "p:os",
+          "style": "plain",
+          "template": "{{.Icon}} ",
+          "type": "os"
+        },
+        {
+          "foreground": "p:blue",
+          "style": "plain",
+          "template": "{{ .UserName }}@{{ .HostName }} ",
+          "type": "session"
+        },
+        {
+          "foreground": "p:pink",
+          "properties": {
+            "folder_icon": "..\ue5fe..",
+            "home_icon": "~",
+            "style": "agnoster_short"
+          },
+          "style": "plain",
+          "template": "{{ .Path }} ",
+          "type": "path"
+        },
+        {
+          "foreground": "p:lavender",
+          "properties": {
+            "branch_icon": "\ue725 ",
+            "cherry_pick_icon": "\ue29b ",
+            "commit_icon": "\uf417 ",
+            "fetch_status": false,
+            "fetch_upstream_icon": false,
+            "merge_icon": "\ue727 ",
+            "no_commits_icon": "\udb80\udc95 ",
+            "rebase_icon": "\ue728 ",
+            "revert_icon": "\uf0e2 ",
+            "tag_icon": "\uf412 "
+          },
+          "template": "{{ .HEAD }} ",
+          "style": "plain",
+          "type": "git"
+        },
+        {
+          "style": "plain",
+          "foreground": "p:closer",
+          "template": "\uf105",
+          "type": "text"
+        }
+      ],
+      "type": "prompt"
+    }
+  ],
+  "final_space": true,
+  "version": 2
+}
+
diff --git a/themes/catppuccin_latte.omp.json b/themes/catppuccin_latte.omp.json
index 42feb78b..b090f2f1 100644
--- a/themes/catppuccin_latte.omp.json
+++ b/themes/catppuccin_latte.omp.json
@@ -1,68 +1,68 @@
-{
-  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
-  "palette": {
-        "os": "#ACB0BE",
-        "closer": "p:os",
-        "pink": "#ea76cb",
-        "lavender": "#7287FD",
-        "blue":  "#1e66f5"
-  },
-  "blocks": [
-    {
-      "alignment": "left",
-      "segments": [
-        {
-          "foreground": "p:os",
-          "style": "plain",
-          "template": "{{.Icon}} ",
-          "type": "os"
-        },
-        {
-          "foreground": "p:blue",
-          "style": "plain",
-          "template": "{{ .UserName }}@{{ .HostName }} ",
-          "type": "session"
-        },
-        {
-          "foreground": "p:pink",
-          "properties": {
-            "folder_icon": "..\ue5fe..",
-            "home_icon": "~",
-            "style": "agnoster_short"
-          },
-          "style": "plain",
-          "template": "{{ .Path }} ",
-          "type": "path"
-        },
-        {
-          "foreground": "p:lavender",
-          "properties": {
-            "branch_icon": "\ue725 ",
-            "cherry_pick_icon": "\ue29b ",
-            "commit_icon": "\uf417 ",
-            "fetch_status": false,
-            "fetch_upstream_icon": false,
-            "merge_icon": "\ue727 ",
-            "no_commits_icon": "\uf594 ",
-            "rebase_icon": "\ue728 ",
-            "revert_icon": "\uf0e2 ",
-            "tag_icon": "\uf412 "
-          },
-          "template": "{{ .HEAD }} ",
-          "style": "plain",
-          "type": "git"
-        },
-        {
-          "style": "plain",
-          "foreground": "p:closer",
-          "template": "\uf105",
-          "type": "text"
-        }
-      ],
-      "type": "prompt"
-    }
-  ],
-  "final_space": true,
-  "version": 2
-}
-
+{
+  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+  "palette": {
+        "os": "#ACB0BE",
+        "closer": "p:os",
+        "pink": "#ea76cb",
+        "lavender": "#7287FD",
+        "blue":  "#1e66f5"
+  },
+  "blocks": [
+    {
+      "alignment": "left",
+      "segments": [
+        {
+          "foreground": "p:os",
+          "style": "plain",
+          "template": "{{.Icon}} ",
+          "type": "os"
+        },
+        {
+          "foreground": "p:blue",
+          "style": "plain",
+          "template": "{{ .UserName }}@{{ .HostName }} ",
+          "type": "session"
+        },
+        {
+          "foreground": "p:pink",
+          "properties": {
+            "folder_icon": "..\ue5fe..",
+            "home_icon": "~",
+            "style": "agnoster_short"
+          },
+          "style": "plain",
+          "template": "{{ .Path }} ",
+          "type": "path"
+        },
+        {
+          "foreground": "p:lavender",
+          "properties": {
+            "branch_icon": "\ue725 ",
+            "cherry_pick_icon": "\ue29b ",
+            "commit_icon": "\uf417 ",
+            "fetch_status": false,
+            "fetch_upstream_icon": false,
+            "merge_icon": "\ue727 ",
+            "no_commits_icon": "\udb80\udc95 ",
+            "rebase_icon": "\ue728 ",
+            "revert_icon": "\uf0e2 ",
+            "tag_icon": "\uf412 "
+          },
+          "template": "{{ .HEAD }} ",
+          "style": "plain",
+          "type": "git"
+        },
+        {
+          "style": "plain",
+          "foreground": "p:closer",
+          "template": "\uf105",
+          "type": "text"
+        }
+      ],
+      "type": "prompt"
+    }
+  ],
+  "final_space": true,
+  "version": 2
+}
+
diff --git a/themes/catppuccin_macchiato.omp.json b/themes/catppuccin_macchiato.omp.json
index abb0a263..9f2f36ab 100644
--- a/themes/catppuccin_macchiato.omp.json
+++ b/themes/catppuccin_macchiato.omp.json
@@ -1,67 +1,67 @@
-{
-  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
-  "palette": {
-        "os": "#ACB0BE",
-        "closer": "p:os",
-        "pink": "#F5BDE6",
-        "lavender": "#B7BDF8",
-        "blue":  "#8AADF4"
-  },
-  "blocks": [
-    {
-      "alignment": "left",
-      "segments": [
-        {
-          "foreground": "p:os",
-          "style": "plain",
-          "template": "{{.Icon}} ",
-          "type": "os"
-        },
-        {
-          "foreground": "p:blue",
-          "style": "plain",
-          "template": "{{ .UserName }}@{{ .HostName }} ",
-          "type": "session"
-        },
-        {
-          "foreground": "p:pink",
-          "properties": {
-            "folder_icon": "..\ue5fe..",
-            "home_icon": "~",
-            "style": "agnoster_short"
-          },
-          "style": "plain",
-          "template": "{{ .Path }} ",
-          "type": "path"
-        },
-        {
-          "foreground": "p:lavender",
-          "properties": {
-            "branch_icon": "\ue725 ",
-            "cherry_pick_icon": "\ue29b ",
-            "commit_icon": "\uf417 ",
-            "fetch_status": false,
-            "fetch_upstream_icon": false,
-            "merge_icon": "\ue727 ",
-            "no_commits_icon": "\uf594 ",
-            "rebase_icon": "\ue728 ",
-            "revert_icon": "\uf0e2 ",
-            "tag_icon": "\uf412 "
-          },
-          "template": "{{ .HEAD }} ",
-          "style": "plain",
-          "type": "git"
-        },
-        {
-          "style": "plain",
-          "foreground": "p:closer",
-          "template": "\uf105",
-          "type": "text"
-        }
-      ],
-      "type": "prompt"
-    }
-  ],
-  "final_space": true,
-  "version": 2
-}
+{
+  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+  "palette": {
+        "os": "#ACB0BE",
+        "closer": "p:os",
+        "pink": "#F5BDE6",
+        "lavender": "#B7BDF8",
+        "blue":  "#8AADF4"
+  },
+  "blocks": [
+    {
+      "alignment": "left",
+      "segments": [
+        {
+          "foreground": "p:os",
+          "style": "plain",
+          "template": "{{.Icon}} ",
+          "type": "os"
+        },
+        {
+          "foreground": "p:blue",
+          "style": "plain",
+          "template": "{{ .UserName }}@{{ .HostName }} ",
+          "type": "session"
+        },
+        {
+          "foreground": "p:pink",
+          "properties": {
+            "folder_icon": "..\ue5fe..",
+            "home_icon": "~",
+            "style": "agnoster_short"
+          },
+          "style": "plain",
+          "template": "{{ .Path }} ",
+          "type": "path"
+        },
+        {
+          "foreground": "p:lavender",
+          "properties": {
+            "branch_icon": "\ue725 ",
+            "cherry_pick_icon": "\ue29b ",
+            "commit_icon": "\uf417 ",
+            "fetch_status": false,
+            "fetch_upstream_icon": false,
+            "merge_icon": "\ue727 ",
+            "no_commits_icon": "\udb80\udc95 ",
+            "rebase_icon": "\ue728 ",
+            "revert_icon": "\uf0e2 ",
+            "tag_icon": "\uf412 "
+          },
+          "template": "{{ .HEAD }} ",
+          "style": "plain",
+          "type": "git"
+        },
+        {
+          "style": "plain",
+          "foreground": "p:closer",
+          "template": "\uf105",
+          "type": "text"
+        }
+      ],
+      "type": "prompt"
+    }
+  ],
+  "final_space": true,
+  "version": 2
+}
diff --git a/themes/catppuccin_mocha.omp.json b/themes/catppuccin_mocha.omp.json
index 319bb493..64353ca3 100644
--- a/themes/catppuccin_mocha.omp.json
+++ b/themes/catppuccin_mocha.omp.json
@@ -1,67 +1,67 @@
-{
-  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
-  "palette": {
-        "os": "#ACB0BE",
-        "closer": "p:os",
-        "pink": "#F5C2E7",
-        "lavender": "#B4BEFE",
-        "blue":  "#89B4FA"
-  },
-  "blocks": [
-    {
-      "alignment": "left",
-      "segments": [
-        {
-          "foreground": "p:os",
-          "style": "plain",
-          "template": "{{.Icon}} ",
-          "type": "os"
-        },
-        {
-          "foreground": "p:blue",
-          "style": "plain",
-          "template": "{{ .UserName }}@{{ .HostName }} ",
-          "type": "session"
-        },
-        {
-          "foreground": "p:pink",
-          "properties": {
-            "folder_icon": "..\ue5fe..",
-            "home_icon": "~",
-            "style": "agnoster_short"
-          },
-          "style": "plain",
-          "template": "{{ .Path }} ",
-          "type": "path"
-        },
-        {
-          "foreground": "p:lavender",
-          "properties": {
-            "branch_icon": "\ue725 ",
-            "cherry_pick_icon": "\ue29b ",
-            "commit_icon": "\uf417 ",
-            "fetch_status": false,
-            "fetch_upstream_icon": false,
-            "merge_icon": "\ue727 ",
-            "no_commits_icon": "\uf594 ",
-            "rebase_icon": "\ue728 ",
-            "revert_icon": "\uf0e2 ",
-            "tag_icon": "\uf412 "
-          },
-          "template": "{{ .HEAD }} ",
-          "style": "plain",
-          "type": "git"
-        },
-        {
-          "style": "plain",
-          "foreground": "p:closer",
-          "template": "\uf105",
-          "type": "text"
-        }
-      ],
-      "type": "prompt"
-    }
-  ],
-  "final_space": true,
-  "version": 2
-}
+{
+  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+  "palette": {
+        "os": "#ACB0BE",
+        "closer": "p:os",
+        "pink": "#F5C2E7",
+        "lavender": "#B4BEFE",
+        "blue":  "#89B4FA"
+  },
+  "blocks": [
+    {
+      "alignment": "left",
+      "segments": [
+        {
+          "foreground": "p:os",
+          "style": "plain",
+          "template": "{{.Icon}} ",
+          "type": "os"
+        },
+        {
+          "foreground": "p:blue",
+          "style": "plain",
+          "template": "{{ .UserName }}@{{ .HostName }} ",
+          "type": "session"
+        },
+        {
+          "foreground": "p:pink",
+          "properties": {
+            "folder_icon": "..\ue5fe..",
+            "home_icon": "~",
+            "style": "agnoster_short"
+          },
+          "style": "plain",
+          "template": "{{ .Path }} ",
+          "type": "path"
+        },
+        {
+          "foreground": "p:lavender",
+          "properties": {
+            "branch_icon": "\ue725 ",
+            "cherry_pick_icon": "\ue29b ",
+            "commit_icon": "\uf417 ",
+            "fetch_status": false,
+            "fetch_upstream_icon": false,
+            "merge_icon": "\ue727 ",
+            "no_commits_icon": "\udb80\udc95 ",
+            "rebase_icon": "\ue728 ",
+            "revert_icon": "\uf0e2 ",
+            "tag_icon": "\uf412 "
+          },
+          "template": "{{ .HEAD }} ",
+          "style": "plain",
+          "type": "git"
+        },
+        {
+          "style": "plain",
+          "foreground": "p:closer",
+          "template": "\uf105",
+          "type": "text"
+        }
+      ],
+      "type": "prompt"
+    }
+  ],
+  "final_space": true,
+  "version": 2
+}
diff --git a/themes/cinnamon.omp.json b/themes/cinnamon.omp.json
index ad3e5096..89375637 100644
--- a/themes/cinnamon.omp.json
+++ b/themes/cinnamon.omp.json
@@ -37,13 +37,13 @@
           "background": "#491545",
           "foreground": "#ffffff",
           "properties": {
-            "paused_icon": "\uf8e3 ",
+            "paused_icon": "\udb80\udfe4 ",
             "playing_icon": "\ue602 ",
             "stopped_icon": "\uf04d ",
             "track_separator": " - "
           },
           "style": "plain",
-          "template": " \uf9c6 {{ .Icon }}{{ if ne .Status \"stopped\" }}{{ .Artist }} - {{ .Track }}{{ end }} ",
+          "template": " \udb81\udcc7 {{ .Icon }}{{ if ne .Status \"stopped\" }}{{ .Artist }} - {{ .Track }}{{ end }} ",
           "type": "spotify"
         },
         {
@@ -56,7 +56,7 @@
             "always_enabled": true
           },
           "style": "diamond",
-          "template": " \uf7d4 ",
+          "template": " \udb86\udca0 ",
           "trailing_diamond": "\ue0b4",
           "type": "exit"
         }
diff --git a/themes/clean-detailed.omp.json b/themes/clean-detailed.omp.json
index beab4743..01a06c4f 100644
--- a/themes/clean-detailed.omp.json
+++ b/themes/clean-detailed.omp.json
@@ -12,7 +12,7 @@
           "properties": {
             "macos": "\uf179 ",
             "ubuntu": "\uf31b ",
-            "windows": "\uf871 "
+            "windows": "\udb80\udf72 "
           },
           "style": "diamond",
           "template": " {{ if .WSL }}WSL at {{ end }}{{.Icon}}",
@@ -33,7 +33,7 @@
           "foreground": "#ffffff",
           "leading_diamond": "\ue0b2",
           "style": "diamond",
-          "template": "\uf85a MEM: {{ round .PhysicalPercentUsed .Precision }}% | {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB \uf85a ",
+          "template": "\udb80\udf5b MEM: {{ round .PhysicalPercentUsed .Precision }}% | {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB \udb80\udf5b ",
           "trailing_diamond": "<transparent,#516BEB>\ue0b2</>",
           "type": "sysinfo"
         },
@@ -68,7 +68,7 @@
             "fetch_worktree_count": true
           },
           "style": "diamond",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "trailing_diamond": "\ue0b0",
           "type": "git"
         }
@@ -100,8 +100,8 @@
         {
           "properties": {
             "folder_icon": "\uf07b ",
-            "folder_separator_icon": " \uf554 ",
-            "home_icon": "\uf7db "
+            "folder_separator_icon": " \udb80\udc55 ",
+            "home_icon": "\udb80\udedc "
           },
           "style": "plain",
           "template": " {{ .Path }} ",
diff --git a/themes/cloud-context.omp.json b/themes/cloud-context.omp.json
index c5f56adf..dcf352c4 100644
--- a/themes/cloud-context.omp.json
+++ b/themes/cloud-context.omp.json
@@ -27,7 +27,7 @@
           },
           "style": "powerline",
           "powerline_symbol": "",
-          "template": " <p:symbol-color>\uf65e</> {{ dateInZone .Format .CurrentDate \"UTC\" }} ",
+          "template": " <p:symbol-color>\udb80\udd5f</> {{ dateInZone .Format .CurrentDate \"UTC\" }} ",
           "type": "time"
         },
         {
@@ -35,7 +35,7 @@
           "foreground": "p:kubernetes-text",
           "style": "powerline",
           "powerline_symbol": "\ue0b4",
-          "template": "<p:symbol-color>\ufd31</> {{.Context}}{{if .Namespace}} \uf061 {{.Namespace}}{{end}}",
+          "template": "<p:symbol-color>\udb82\udc33</> {{.Context}}{{if .Namespace}} \uf061 {{.Namespace}}{{end}}",
           "type": "kubectl"
         },
         {
@@ -93,7 +93,7 @@
           },
           "style": "powerline",
           "powerline_symbol": "\ue0b4",
-          "template": " <p:symbol-color>\ufbab</> {{ .FormattedMs }}",
+          "template": " <p:symbol-color>\udb81\udead</> {{ .FormattedMs }}",
           "type": "executiontime"
         },
         {
@@ -104,7 +104,7 @@
           },
           "style": "powerline",
           "powerline_symbol": "\ue0b4",
-          "template": "{{ if eq .Code 0 }} \uf7d0 {{ end }}",
+          "template": "{{ if eq .Code 0 }} \udb82\udcd0 {{ end }}",
           "type": "exit"
         },
         {
@@ -155,7 +155,7 @@
           },
           "style": "powerline",
           "powerline_symbol": "\ue0b4",
-          "template": "{{ .HEAD }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "{{ .HEAD }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         }
       ],
diff --git a/themes/cloud-native-azure.omp.json b/themes/cloud-native-azure.omp.json
index c97b30aa..8984eae5 100644
--- a/themes/cloud-native-azure.omp.json
+++ b/themes/cloud-native-azure.omp.json
@@ -9,7 +9,7 @@
           "foreground": "#ffffff",
           "leading_diamond": "\ue0b6",
           "style": "diamond",
-          "template": " {{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }}@{{ .HostName }} ",
+          "template": " {{ if .SSHSession }}\udb80\udf18 {{ end }}{{ .UserName }}@{{ .HostName }} ",
           "trailing_diamond": "\ue0b0",
           "type": "session"
         },
@@ -40,7 +40,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -83,8 +83,8 @@
           "powerline_symbol": "\ue0b2",
           "properties": {
             "charged_icon": "\ue22f ",
-            "charging_icon": "\uf583 ",
-            "discharging_icon": "\uf582 "
+            "charging_icon": "\udb80\udc84 ",
+            "discharging_icon": "\udb80\udc83 "
           },
           "style": "powerline",
           "template": " {{ if not .Error }}{{ .Icon }}{{ .Percentage }}{{ end }}{{ .Error }}\uf295 ",
@@ -96,7 +96,7 @@
           "invert_powerline": true,
           "leading_diamond": "\ue0b2",
           "style": "diamond",
-          "template": " \uf64f {{ .CurrentDate | date .Format }} ",
+          "template": " \udb82\udd54 {{ .CurrentDate | date .Format }} ",
           "trailing_diamond": "\ue0b4",
           "type": "time"
         }
@@ -112,7 +112,7 @@
           "foreground": "#000000",
           "leading_diamond": "\ue0b6",
           "style": "diamond",
-          "template": " \ufd31 Kubernetes {{.Context}} cluster {{if .Namespace}}- {{.Namespace}} namespace{{end}} ",
+          "template": " \udb82\udc33 Kubernetes {{.Context}} cluster {{if .Namespace}}- {{.Namespace}} namespace{{end}} ",
           "trailing_diamond": "\ue0b0",
           "type": "kubectl"
         },
diff --git a/themes/cobalt2.omp.json b/themes/cobalt2.omp.json
index 0ab8eb15..a62b013f 100644
--- a/themes/cobalt2.omp.json
+++ b/themes/cobalt2.omp.json
@@ -32,7 +32,7 @@
             "fetch_status": true
           },
           "style": "diamond",
-          "template": " {{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         }
       ],
diff --git a/themes/craver.omp.json b/themes/craver.omp.json
index dcf1a738..db3e0d44 100644
--- a/themes/craver.omp.json
+++ b/themes/craver.omp.json
@@ -53,7 +53,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -73,7 +73,7 @@
             "threshold": 1
           },
           "style": "powerline",
-          "template": " <#fefefe>\ufbab</> {{ .FormattedMs }} ",
+          "template": " <#fefefe>\udb81\udead</> {{ .FormattedMs }} ",
           "type": "executiontime"
         },
         {
@@ -84,7 +84,7 @@
           "foreground": "#242424",
           "powerline_symbol": "\ue0b4",
           "style": "powerline",
-          "template": " \uf7d4 ",
+          "template": " \udb86\udca0 ",
           "type": "exit"
         }
       ],
diff --git a/themes/dracula.omp.json b/themes/dracula.omp.json
index 87df367b..3374c624 100644
--- a/themes/dracula.omp.json
+++ b/themes/dracula.omp.json
@@ -34,7 +34,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " \ue725 ({{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }}) ",
+          "template": " \ue725 ({{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }}) ",
           "type": "git"
         },
         {
diff --git a/themes/easy-term.omp.json b/themes/easy-term.omp.json
index a7fbc16e..0d921ea7 100644
--- a/themes/easy-term.omp.json
+++ b/themes/easy-term.omp.json
@@ -66,7 +66,7 @@
             "fetch_status": true,
             "fetch_upstream_icon": true
           },
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "trailing_diamond": "\ue0b4",
           "type": "git"
         }
diff --git a/themes/emodipt-extend.omp.json b/themes/emodipt-extend.omp.json
index dee909a9..8fcbae03 100644
--- a/themes/emodipt-extend.omp.json
+++ b/themes/emodipt-extend.omp.json
@@ -43,7 +43,7 @@
               "fetch_upstream_icon": true
             },
             "style": "plain",
-            "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+            "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
             "type": "git"
           }
         ],
diff --git a/themes/free-ukraine.omp.json b/themes/free-ukraine.omp.json
index 6b79d8c3..0282a3c4 100644
--- a/themes/free-ukraine.omp.json
+++ b/themes/free-ukraine.omp.json
@@ -34,7 +34,7 @@
           "background": "#0057b7",
           "foreground": "#FBD951",
           "properties": {
-            "home_icon": "\uf7dd",
+            "home_icon": "\udb80\udede",
             "style": "mixed"
           },
           "style": "diamond",
@@ -52,7 +52,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " \uf1d3  {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0}}\uf692 {{ .StashCount }}{{ end }}{{ if gt .WorktreeCount 0}} \uf1bb {{ .WorktreeCount }}{{ end }} ",
+          "template": " \uf1d3  {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0}}\udb80\udd93 {{ .StashCount }}{{ end }}{{ if gt .WorktreeCount 0}} \uf1bb {{ .WorktreeCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -115,9 +115,9 @@
           "invert_powerline": true,
           "leading_diamond": "\ue0b2",
           "properties": {
-            "charged_icon": "\uf583 ",
+            "charged_icon": "\udb80\udc84 ",
             "charging_icon": "\uf492 ",
-            "discharging_icon": "\uf58c "
+            "discharging_icon": "\udb80\udc8d "
           },
           "style": "diamond",
           "template": " {{ if not .Error }}{{ .Icon }}{{ .Percentage }}{{ end }}{{ .Error }}% <#111111>\ue0b2</>",
@@ -132,7 +132,7 @@
             "always_enabled": true
           },
           "style": "diamond",
-          "template": " \uf608 {{ .FormattedMs }} <#111111>\ue0b2</>",
+          "template": " \udb80\udd09 {{ .FormattedMs }} <#111111>\ue0b2</>",
           "type": "executiontime"
         },
         {
@@ -144,7 +144,7 @@
             "time_format": "_2,15:04"
           },
           "style": "diamond",
-          "template": " \uf5ef {{ .CurrentDate | date .Format }}",
+          "template": " \udb80\udcf0 {{ .CurrentDate | date .Format }}",
           "trailing_diamond": "\ue0b4",
           "type": "time"
         }
@@ -185,7 +185,7 @@
             "display_host": false
           },
           "style": "powerline",
-          "template": " {{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }} ",
+          "template": " {{ if .SSHSession }}\udb80\udf18 {{ end }}{{ .UserName }} ",
           "type": "session"
         }
       ],
diff --git a/themes/froczh.omp.json b/themes/froczh.omp.json
index a681fd6b..258c3450 100644
--- a/themes/froczh.omp.json
+++ b/themes/froczh.omp.json
@@ -25,9 +25,9 @@
                     "foreground": "#ffffff",
                     "leading_diamond": "<transparent,#01579B>\ue0b0</>",
                     "properties": {
-                        "folder_icon": "\uf6d7",
+                        "folder_icon": "\udb80\uddd8",
                         "folder_separator_icon": "<transparent> \ue0bd </>",
-                        "home_icon": "\uf7db",
+                        "home_icon": "\udb80\udedc",
                         "style": "agnoster_short"
                     },
                     "style": "diamond",
@@ -50,7 +50,7 @@
                         "fetch_status": true
                     },
                     "style": "powerline",
-                    "template": " {{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+                    "template": " {{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
                     "type": "git"
                 },
                 {
@@ -108,7 +108,7 @@
                         "threshold": 0
                     },
                     "style": "diamond",
-                    "template": "\ufa1e {{ .FormattedMs }}s ",
+                    "template": "\udb81\udd1f {{ .FormattedMs }}s ",
                     "type": "executiontime"
                 },
                 {
diff --git a/themes/gmay.omp.json b/themes/gmay.omp.json
index 98fdf4d8..b470cdd7 100644
--- a/themes/gmay.omp.json
+++ b/themes/gmay.omp.json
@@ -50,7 +50,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -80,7 +80,7 @@
             "always_enabled": true
           },
           "style": "diamond",
-          "template": " \uf7d4 ",
+          "template": " \udb86\udca0 ",
           "trailing_diamond": "\ue0b4",
           "type": "exit"
         }
@@ -94,7 +94,7 @@
         {
           "foreground": "#f1184c",
           "style": "plain",
-          "template": "\uf7c6 ",
+          "template": "\udb80\udec7 ",
           "type": "text"
         }
       ],
diff --git a/themes/grandpa-style.omp.json b/themes/grandpa-style.omp.json
index e04de502..ffa3458a 100644
--- a/themes/grandpa-style.omp.json
+++ b/themes/grandpa-style.omp.json
@@ -22,9 +22,9 @@
           "background": "#5a3d29",
           "foreground": "#43CCEA",
           "properties": {
-            "folder_icon": "\uf6d7",
+            "folder_icon": "\udb80\uddd8",
             "folder_separator_icon": "<transparent> \ue0bd </>",
-            "home_icon": "\uf7db",
+            "home_icon": "\udb80\udedc",
             "style": "agnoster_short"
           },
           "style": "plain",
@@ -46,7 +46,7 @@
             "fetch_status": true
           },
           "style": "diamond",
-          "template": " {{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -83,7 +83,7 @@
           "foreground": "#43CCEA",
           "leading_diamond": "\ue0c5",
           "style": "diamond",
-          "template": "  {{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }}<transparent> / </>{{ .HostName }}",
+          "template": "  {{ if .SSHSession }}\udb80\udf18 {{ end }}{{ .UserName }}<transparent> / </>{{ .HostName }}",
           "type": "session"
         },
         {
diff --git a/themes/gruvbox.omp.json b/themes/gruvbox.omp.json
index 9013c925..2c93f8a4 100644
--- a/themes/gruvbox.omp.json
+++ b/themes/gruvbox.omp.json
@@ -41,7 +41,7 @@
             "branch_identical_icon": "\u25CF"
           },
           "style": "powerline",
-          "template": " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "trailing_diamond": "\ue0b4",
           "type": "git"
         },
diff --git a/themes/hul10.omp.json b/themes/hul10.omp.json
index 230eeae8..c2584e95 100644
--- a/themes/hul10.omp.json
+++ b/themes/hul10.omp.json
@@ -21,7 +21,7 @@
           "background": "#464646",
           "foreground": "p:white",
           "properties": {
-            "windows": "\uf871",
+            "windows": "\udb80\udf72",
             "linux": "\uf17c",
             "ubuntu": "\uf31b",
             "macos": "\uf179"
@@ -94,7 +94,7 @@
           "properties": {
             "folder_icon": "\uf07b",
             "folder_separator_template": "<#93d0ff> \u00bb </>",
-            "home_icon": "\uf7db",
+            "home_icon": "\udb80\udedc",
             "style": "agnoster"
           },
           "style": "plain",
diff --git a/themes/huvix.omp.json b/themes/huvix.omp.json
index 5fef53eb..86d4c8ee 100644
--- a/themes/huvix.omp.json
+++ b/themes/huvix.omp.json
@@ -22,7 +22,7 @@
         {
           "foreground": "#7FD5EA",
           "style": "powerline",
-          "template": "(\ufcd1{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}) ",
+          "template": "(\udb81\udfd3{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}) ",
           "type": "go"
         },
         {
diff --git a/themes/if_tea.omp.json b/themes/if_tea.omp.json
index a1f9247a..b8c5d871 100644
--- a/themes/if_tea.omp.json
+++ b/themes/if_tea.omp.json
@@ -22,7 +22,7 @@
             "opensuse": "\uf314",
             "raspbian": "\uf315",
             "ubuntu": "\uf31b ",
-            "windows": "\uf871 ",
+            "windows": "\udb80\udf72 ",
             "wsl": "\ue712"
           },
           "style": "diamond",
@@ -36,7 +36,7 @@
           "style": "diamond",
           "leading_diamond": "<transparent,#00c7fc>\ue0b0</>",
           "properties": {
-            "template": " \uf85a CPU: {{ round .PhysicalPercentUsed .Precision }}% | "
+            "template": " \udb80\udf5b CPU: {{ round .PhysicalPercentUsed .Precision }}% | "
           },
           "type": "sysinfo"
         },
@@ -44,7 +44,7 @@
           "background": "#00c7fc",
           "foreground": "#000000",
           "style": "diamond",
-          "template": "RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB \uf85a ",
+          "template": "RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB \udb80\udf5b ",
           "trailing_diamond": "<transparent,#00c7fc>\ue0b2</>",
           "type": "sysinfo"
         },
@@ -79,7 +79,7 @@
             "fetch_worktree_count": true
           },
           "style": "diamond",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "trailing_diamond": "\ue0b0",
           "type": "git"
         }
@@ -113,7 +113,7 @@
             "time_format": "3:04:05 PM | Monday"
           },
           "style": "diamond",
-          "template": " \uf64f {{ .CurrentDate | date .Format }} \uf5ef ",
+          "template": " \udb82\udd54 {{ .CurrentDate | date .Format }} \udb80\udcf0 ",
           "trailing_diamond": "\ue0b0",
           "type": "time"
         },
@@ -131,7 +131,7 @@
           "leading_diamond": "<transparent,#F8677b>\ue0b0</>",
           "properties": {
             "folder_icon": "\uf07b ",
-            "folder_separator_icon": " \uf554 ",
+            "folder_separator_icon": " \udb80\udc55 ",
             "home_icon": " ",
             "style": "agnoster_full",
             "template": " \ue5ff {{ .Path }} "
diff --git a/themes/illusi0n.omp.json b/themes/illusi0n.omp.json
index 545fd7dc..cd2827bf 100644
--- a/themes/illusi0n.omp.json
+++ b/themes/illusi0n.omp.json
@@ -66,7 +66,7 @@
             "fetch_upstream_icon": true
           },
           "style": "plain",
-          "template": "<#ff8800>on</> {{.UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "<#ff8800>on</> {{.UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
diff --git a/themes/iterm2.omp.json b/themes/iterm2.omp.json
index 67a067f0..91e0612d 100644
--- a/themes/iterm2.omp.json
+++ b/themes/iterm2.omp.json
@@ -50,7 +50,7 @@
             "fetch_status": true
           },
           "style": "powerline",
-          "template": " {{ .HEAD }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .HEAD }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -64,7 +64,7 @@
             "always_enabled": true
           },
           "style": "powerline",
-          "template": " \ufc8d ",
+          "template": " \udb81\udf8f ",
           "type": "exit"
         }
       ],
@@ -84,7 +84,7 @@
           "invert_powerline": true,
           "powerline_symbol": "\ue0b2",
           "style": "powerline",
-          "template": " {{ if not .Error }}{{ .Icon }}{{ .Percentage }}{{ end }}{{ .Error }}\uf295 \uf583 ",
+          "template": " {{ if not .Error }}{{ .Icon }}{{ .Percentage }}{{ end }}{{ .Error }}\uf295 \udb80\udc84 ",
           "type": "battery"
         },
         {
@@ -106,7 +106,7 @@
           "invert_powerline": true,
           "powerline_symbol": "\ue0b2",
           "style": "powerline",
-          "template": "<#fff> \uf64f </>{{ .CurrentDate | date .Format }} ",
+          "template": "<#fff> \udb82\udd54 </>{{ .CurrentDate | date .Format }} ",
           "type": "time"
         }
       ],
diff --git a/themes/jandedobbeleer.omp.json b/themes/jandedobbeleer.omp.json
index f8277b19..48606dda 100644
--- a/themes/jandedobbeleer.omp.json
+++ b/themes/jandedobbeleer.omp.json
@@ -23,7 +23,7 @@
             "style": "folder"
           },
           "style": "powerline",
-          "template": " \uf74a  {{ .Path }} ",
+          "template": " \udb80\ude4b  {{ .Path }} ",
           "type": "path"
         },
         {
@@ -44,7 +44,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "trailing_diamond": "\ue0b4",
           "type": "git"
         },
@@ -56,7 +56,7 @@
             "fetch_version": true
           },
           "style": "powerline",
-          "template": " \uf898 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} ",
+          "template": " \udb80\udf99 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} ",
           "type": "node"
         },
         {
@@ -146,7 +146,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": "<transparent>\ue0b0</> \ufbab{{ .FormattedMs }}\u2800",
+          "template": "<transparent>\ue0b0</> \udb81\udead{{ .FormattedMs }}\u2800",
           "type": "executiontime"
         },
         {
diff --git a/themes/jblab_2021.omp.json b/themes/jblab_2021.omp.json
index 071be516..872922ab 100644
--- a/themes/jblab_2021.omp.json
+++ b/themes/jblab_2021.omp.json
@@ -27,9 +27,9 @@
           "foreground": "#0C212F",
           "leading_diamond": "<transparent,#26BDBB>\ue0b0</>",
           "properties": {
-            "folder_icon": "\uf6d7",
+            "folder_icon": "\udb80\uddd8",
             "folder_separator_icon": "<transparent> \ue0b1 </>",
-            "home_icon": "\uf7db",
+            "home_icon": "\udb80\udedc",
             "style": "agnoster_short"
           },
           "style": "diamond",
@@ -53,7 +53,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
diff --git a/themes/jonnychipz.omp.json b/themes/jonnychipz.omp.json
index ddcc001c..5049ab29 100644
--- a/themes/jonnychipz.omp.json
+++ b/themes/jonnychipz.omp.json
@@ -87,7 +87,7 @@
           "properties": {
             "folder_icon": "<#000000>\ue5fe </>",
             "folder_separator_icon": "<#000000>\ue0b1 </>",
-            "home_icon": "\uf7db ",
+            "home_icon": "\udb80\udedc ",
             "style": "agnoster_short"
           },
           "style": "diamond",
diff --git a/themes/jtracey93.omp.json b/themes/jtracey93.omp.json
index 4bf73822..63410f65 100644
--- a/themes/jtracey93.omp.json
+++ b/themes/jtracey93.omp.json
@@ -12,7 +12,7 @@
             "display_host": false
           },
           "style": "diamond",
-          "template": "{{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }} ",
+          "template": "{{ if .SSHSession }}\udb80\udf18 {{ end }}{{ .UserName }} ",
           "type": "session"
         },
         {
diff --git a/themes/jv_sitecorian.omp.json b/themes/jv_sitecorian.omp.json
index b85faa86..7ec64f58 100644
--- a/themes/jv_sitecorian.omp.json
+++ b/themes/jv_sitecorian.omp.json
@@ -33,7 +33,7 @@
           "background": "#185F7B",
           "foreground": "#ffffff",
           "properties": {
-            "home_icon": "\uf7dd  ",
+            "home_icon": "\udb80\udede  ",
             "style": "mixed"
           },
           "style": "diamond",
@@ -51,7 +51,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -71,7 +71,7 @@
             "always_enabled": true
           },
           "style": "powerline",
-          "template": " {{ if gt .Code 0 }}\uf525{{ else }}\uf469 \u2665{{ end }} ",
+          "template": " {{ if gt .Code 0 }}\udb80\udc26{{ else }}\uf469 \u2665{{ end }} ",
           "type": "exit"
         }
       ],
@@ -89,7 +89,7 @@
             "time_format": "3:04:05 PM"
           },
           "style": "diamond",
-          "template": " {{ .CurrentDate | date .Format }}<#ffffff> \uf64f </>",
+          "template": " {{ .CurrentDate | date .Format }}<#ffffff> \udb82\udd54 </>",
           "trailing_diamond": "\ue0c4",
           "type": "time"
         },
diff --git a/themes/kushal.omp.json b/themes/kushal.omp.json
index 9c5819e4..ab50a69f 100644
--- a/themes/kushal.omp.json
+++ b/themes/kushal.omp.json
@@ -71,7 +71,7 @@
           "powerline_symbol": "\ue0b0",
           "foreground": "#ffffff",
           "background": "#7FD5EA",
-          "template": " \u202d\ufcd1 {{ .Full }} "
+          "template": " \u202d\udb81\udfd3 {{ .Full }} "
         },
         {
           "type": "rust",
@@ -99,7 +99,7 @@
             "fetch_worktree_count": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#CAEBE1> \uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#CAEBE1> \uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         }
       ],
@@ -153,7 +153,7 @@
         {
           "foreground": "#F2D3B6",
           "properties": {
-            "time_format": "<#D6DEEB>\uf64f 15:04:05</> <#79DFE1>|</> \uf5ef 2 Jan, Monday"
+            "time_format": "<#D6DEEB>\udb82\udd54 15:04:05</> <#79DFE1>|</> \udb80\udcf0 2 Jan, Monday"
           },
           "style": "plain",
           "template": "{{ .CurrentDate | date .Format }} <#79DFE1>|</>",
@@ -164,8 +164,8 @@
           "leading_diamond": "<#00C7FC> \uf07b </><#B6D6F2> in </>",
           "properties": {
             "folder_icon": " \uf07c ",
-            "folder_separator_icon": " \uf554 ",
-            "home_icon": "\uf7db ",
+            "folder_separator_icon": " \udb80\udc55 ",
+            "home_icon": "\udb80\udedc ",
             "style": "agnoster_short",
             "max_depth": 3
           },
diff --git a/themes/lambda.omp.json b/themes/lambda.omp.json
index 2b178a3f..622f8e7b 100644
--- a/themes/lambda.omp.json
+++ b/themes/lambda.omp.json
@@ -7,7 +7,7 @@
         {
           "foreground": "#F5F5F5",
           "style": "plain",
-          "template": "\ufb26 ",
+          "template": "\udb81\ude27 ",
           "type": "text"
         },
         {
diff --git a/themes/lambdageneration.omp.json b/themes/lambdageneration.omp.json
index ac6a6fd2..90e421f4 100644
--- a/themes/lambdageneration.omp.json
+++ b/themes/lambdageneration.omp.json
@@ -58,8 +58,8 @@
           ],
           "properties": {
             "charged_icon": "\uf240 ",
-            "charging_icon": "\uf583 ",
-            "discharging_icon": "\uf583 ",
+            "charging_icon": "\udb80\udc84 ",
+            "discharging_icon": "\udb80\udc84 ",
             "text": "\ue0b0"
           },
           "style": "powerline",
@@ -92,7 +92,7 @@
           "foreground": "#fb7e14",
           "leading_diamond": "\ue0b6",
           "style": "diamond",
-          "template": " {{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }}@{{ .HostName }} <#fb7e14>\ue0b3</> ",
+          "template": " {{ if .SSHSession }}\udb80\udf18 {{ end }}{{ .UserName }}@{{ .HostName }} <#fb7e14>\ue0b3</> ",
           "type": "session"
         },
         {
@@ -102,7 +102,7 @@
             "time_format": "15:04:05, _2"
           },
           "style": "diamond",
-          "template": "{{ .CurrentDate | date .Format }} \uf5ef ",
+          "template": "{{ .CurrentDate | date .Format }} \udb80\udcf0 ",
           "trailing_diamond": "\ue0b4",
           "type": "time"
         }
@@ -121,7 +121,7 @@
           "foreground": "#292929",
           "style": "diamond",
           "leading_diamond": "\u2570\u2500\ue0b6",
-          "template": "\ufb26",
+          "template": "\udb81\ude27",
           "trailing_diamond": "\ue0b4",
           "type": "path"
         }
diff --git a/themes/larserikfinholt.omp.json b/themes/larserikfinholt.omp.json
index e39d56a6..aafabc91 100644
--- a/themes/larserikfinholt.omp.json
+++ b/themes/larserikfinholt.omp.json
@@ -23,7 +23,7 @@
             "style": "folder"
           },
           "style": "powerline",
-          "template": " \uf74a  {{ .Path }} ",
+          "template": " \udb80\ude4b  {{ .Path }} ",
           "type": "path"
         },
         {
@@ -43,7 +43,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -53,7 +53,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": "<transparent>\ue0b0</> \ufbab{{ .FormattedMs }}\u2800",
+          "template": "<transparent>\ue0b0</> \udb81\udead{{ .FormattedMs }}\u2800",
           "type": "executiontime"
         },
         {
diff --git a/themes/lightgreen.omp.json b/themes/lightgreen.omp.json
index e43193da..4705aefe 100644
--- a/themes/lightgreen.omp.json
+++ b/themes/lightgreen.omp.json
@@ -56,7 +56,7 @@
             "fetch_status": true
           },
           "style": "plain",
-          "template": "<#000000>\ue0b1 </>{{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "<#000000>\ue0b1 </>{{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -73,7 +73,7 @@
           "foreground": "#06aad5",
           "leading_diamond": "\ue0b6",
           "style": "diamond",
-          "template": "\ufcd1 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
+          "template": "\udb81\udfd3 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
           "trailing_diamond": "\ue0b4 ",
           "type": "go"
         },
@@ -99,7 +99,7 @@
           "foreground": "#ffffff",
           "leading_diamond": "\ue0b6",
           "style": "diamond",
-          "template": "\ufd31 {{.Context}}{{if .Namespace}} :: {{.Namespace}}{{end}}",
+          "template": "\udb82\udc33 {{.Context}}{{if .Namespace}} :: {{.Namespace}}{{end}}",
           "trailing_diamond": "\ue0b4",
           "type": "kubectl"
         }
@@ -136,7 +136,7 @@
           "invert_powerline": true,
           "leading_diamond": "\ue0b2",
           "properties": {
-            "charged_icon": "\uf58e ",
+            "charged_icon": "\udb85\udfe6 ",
             "charging_icon": "\uf1e6 ",
             "discharging_icon": "\ue234 "
           },
diff --git a/themes/marcduiker.omp.json b/themes/marcduiker.omp.json
index 2de40e78..4c91b712 100644
--- a/themes/marcduiker.omp.json
+++ b/themes/marcduiker.omp.json
@@ -33,7 +33,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
diff --git a/themes/markbull.omp.json b/themes/markbull.omp.json
index 6eeee9b4..0afe6df3 100644
--- a/themes/markbull.omp.json
+++ b/themes/markbull.omp.json
@@ -15,7 +15,7 @@
           "foreground": "#1d1626",
           "powerline_symbol": "\ue0b0",
           "style": "powerline",
-          "template": " \uf26c  {{ if .SSHSession }}\uf817  {{ end }}{{ .UserName }}@{{ .HostName }} ",
+          "template": " \uf26c  {{ if .SSHSession }}\udb80\udf18  {{ end }}{{ .UserName }}@{{ .HostName }} ",
           "type": "session"
         },
         {
@@ -54,9 +54,9 @@
           "properties": {
             "azure_devops_icon": "\ufd03 ",
             "bitbucket_icon": "\uf171 ",
-            "branch_gone_icon": "\uf68e ",
+            "branch_gone_icon": "\udb80\udd8f ",
             "branch_icon": "\ue0a0 ",
-            "branch_identical_icon": "\uf690 ",
+            "branch_identical_icon": "\udb80\udd91 ",
             "commit_icon": "\uf417 ",
             "fetch_stash_count": true,
             "fetch_status": true,
@@ -68,7 +68,7 @@
             "tag_icon": "\uf412 "
           },
           "style": "powerline",
-          "template": " {{ if( .UpstreamIcon ) }}{{ url .UpstreamIcon .UpstreamURL }} {{ end }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} <#ed1941>\uf044 {{.Working.String}}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} <#225a1f>\uf046 {{.Staging.String}}</>{{ end }}{{ if gt .StashCount 0 }}  \uf692 {{.StashCount}}{{ end }}{{ if gt .WorktreeCount 0 }}{{if .IsWorkTree}}<#1d953f>{{ end }}  \uf1bb {{if .IsWorkTree}}</>{{ end }}{{.WorktreeCount}}{{ end }} ",
+          "template": " {{ if( .UpstreamIcon ) }}{{ url .UpstreamIcon .UpstreamURL }} {{ end }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} <#ed1941>\uf044 {{.Working.String}}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} <#225a1f>\uf046 {{.Staging.String}}</>{{ end }}{{ if gt .StashCount 0 }}  \udb80\udd93 {{.StashCount}}{{ end }}{{ if gt .WorktreeCount 0 }}{{if .IsWorkTree}}<#1d953f>{{ end }}  \uf1bb {{if .IsWorkTree}}</>{{ end }}{{.WorktreeCount}}{{ end }} ",
           "type": "git"
         },
         {
diff --git a/themes/microverse-power.omp.json b/themes/microverse-power.omp.json
index 8a8d5041..96695ed9 100644
--- a/themes/microverse-power.omp.json
+++ b/themes/microverse-power.omp.json
@@ -58,7 +58,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -72,7 +72,7 @@
             "always_enabled": true
           },
           "style": "powerline",
-          "template": " \ufc8d ",
+          "template": " \udb81\udf8f ",
           "type": "exit"
         }
       ],
diff --git a/themes/mojada.omp.json b/themes/mojada.omp.json
index 2668c250..60bf182c 100644
--- a/themes/mojada.omp.json
+++ b/themes/mojada.omp.json
@@ -73,7 +73,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -93,7 +93,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": " {{ if gt .Code 0 }}\uf659{{ else }}\uf633{{ end }} ",
+          "template": " {{ if gt .Code 0 }}\udb80\udd5a{{ else }}\udb80\udd34{{ end }} ",
           "type": "exit"
         },
         {
@@ -116,9 +116,9 @@
           "invert_powerline": true,
           "powerline_symbol": "\ue0b2",
           "properties": {
-            "charged_icon": "\uf583 ",
-            "charging_icon": "\uf588 ",
-            "discharging_icon": "\uf57d "
+            "charged_icon": "\udb80\udc84 ",
+            "charging_icon": "\udb80\udc89 ",
+            "discharging_icon": "\udb80\udc7e "
           },
           "style": "powerline",
           "template": " {{ if not .Error }}{{ .Icon }}{{ .Percentage }}{{ end }}{{ .Error }}% ",
diff --git a/themes/montys.omp.json b/themes/montys.omp.json
index c7797e88..03701545 100644
--- a/themes/montys.omp.json
+++ b/themes/montys.omp.json
@@ -19,11 +19,11 @@
           "properties": {
             "folder_icon": "\uf115",
             "folder_separator_icon": "\\",
-            "home_icon": "\uf7db",
+            "home_icon": "\udb80\udedc",
             "style": "full"
           },
           "style": "powerline",
-          "template": " <#000>\uf07b \uf553</> {{ .Path }} ",
+          "template": " <#000>\uf07b \udb80\udc54</> {{ .Path }} ",
           "type": "path"
         },
         {
@@ -37,7 +37,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " \u279c ({{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }}) ",
+          "template": " \u279c ({{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }}) ",
           "type": "git"
         },
         {
@@ -56,7 +56,7 @@
             "always_enabled": true
           },
           "style": "powerline",
-          "template": " \ufbab {{ .FormattedMs }} ",
+          "template": " \udb81\udead {{ .FormattedMs }} ",
           "type": "executiontime"
         },
         {
@@ -81,7 +81,7 @@
             "always_enabled": true
           },
           "style": "diamond",
-          "template": " {{ if gt .Code 0 }}\uf525{{ else }}\uf469{{ end }}",
+          "template": " {{ if gt .Code 0 }}\udb80\udc26{{ else }}\uf469{{ end }}",
           "trailing_diamond": "\ue0b4",
           "type": "exit"
         }
diff --git a/themes/mt.omp.json b/themes/mt.omp.json
index 3f915c67..23a3c567 100644
--- a/themes/mt.omp.json
+++ b/themes/mt.omp.json
@@ -34,7 +34,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " \u279c ({{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }}) ",
+          "template": " \u279c ({{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }}) ",
           "type": "git"
         },
         {
diff --git a/themes/multiverse-neon.omp.json b/themes/multiverse-neon.omp.json
index b80e653a..a6bba2ff 100644
--- a/themes/multiverse-neon.omp.json
+++ b/themes/multiverse-neon.omp.json
@@ -33,7 +33,7 @@
             "fetch_upstream_icon": true
           },
           "style": "diamond",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "trailing_diamond": "\ue0b4",
           "type": "git"
         },
diff --git a/themes/night-owl.omp.json b/themes/night-owl.omp.json
index 1aee6a93..edb85a88 100644
--- a/themes/night-owl.omp.json
+++ b/themes/night-owl.omp.json
@@ -9,7 +9,7 @@
           "foreground": "#011627",
           "leading_diamond": "\u256d\u2500\ue0b6",
           "properties": {
-            "windows": "\uf871"
+            "windows": "\udb80\udf72"
           },
           "style": "diamond",
           "template": " {{ if .WSL }}WSL at {{ end }}{{.Icon}}  ",
@@ -31,7 +31,7 @@
           "properties": {
             "folder_icon": "\uf07c ",
             "folder_separator_icon": "<#011627>\ue0b1</> ",
-            "home_icon": " \uf7db ",
+            "home_icon": " \udb80\udedc ",
             "style": "agnoster"
           },
           "style": "powerline",
@@ -56,7 +56,7 @@
             "fetch_worktree_count": true
           },
           "style": "powerline",
-          "template": " {{ url .UpstreamIcon .UpstreamURL }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ url .UpstreamIcon .UpstreamURL }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -93,7 +93,7 @@
           "foreground": "#ffffff",
           "leading_diamond": "\ue0b2",
           "style": "diamond",
-          "template": "\uf85a {{ round .PhysicalPercentUsed .Precision }}% ",
+          "template": "\udb80\udf5b {{ round .PhysicalPercentUsed .Precision }}% ",
           "trailing_diamond": "<transparent,#8f43f3>\ue0b2</>",
           "type": "sysinfo"
         },
@@ -210,7 +210,7 @@
           "foreground": "#06aad5",
           "leading_diamond": "\ue0b2",
           "style": "diamond",
-          "template": "\ufcd1 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} ",
+          "template": "\udb81\udfd3 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} ",
           "trailing_diamond": "<transparent,#ffffff>\ue0b2</>",
           "type": "go"
         },
@@ -255,7 +255,7 @@
           "foreground": "#ffffff",
           "leading_diamond": "\ue0b2",
           "style": "diamond",
-          "template": "\ufd31 {{.Context}} :: {{if .Namespace}}{{.Namespace}}{{else}}default{{end}} ",
+          "template": "\udb82\udc33 {{.Context}} :: {{if .Namespace}}{{.Namespace}}{{else}}default{{end}} ",
           "trailing_diamond": "<transparent,#316ce4>\ue0b2</>",
           "type": "kubectl"
         },
@@ -275,7 +275,7 @@
           "properties": {
             "fetch_package_manager": true,
             "npm_icon": "<#cc3a3a>\ue71e</> ",
-            "yarn_icon": "<#348cba>\uf61a</> "
+            "yarn_icon": "<#348cba>\udb80\udd1b</> "
           },
           "style": "diamond",
           "template": "\ue718 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} ",
@@ -362,7 +362,7 @@
             "time_format": "15:04:05"
           },
           "style": "diamond",
-          "template": "\uf64f {{ .CurrentDate | date .Format }}",
+          "template": "\udb82\udd54 {{ .CurrentDate | date .Format }}",
           "trailing_diamond": "\ue0b4",
           "type": "time"
         }
diff --git a/themes/nu4a.omp.json b/themes/nu4a.omp.json
index 4c14346e..b44abb68 100644
--- a/themes/nu4a.omp.json
+++ b/themes/nu4a.omp.json
@@ -24,7 +24,7 @@
           "properties": {
             "folder_icon": "\ue5ff",
             "folder_separator_icon": "\ue0b9",
-            "home_icon": "\uf7db",
+            "home_icon": "\udb80\udedc",
             "mapped_locations": {
               "C:\\Users": "\uf007",
               "C:\\Windows": "\ue62a"
diff --git a/themes/patriksvensson.omp.json b/themes/patriksvensson.omp.json
index f722b725..b3249eab 100644
--- a/themes/patriksvensson.omp.json
+++ b/themes/patriksvensson.omp.json
@@ -17,7 +17,7 @@
           "properties": {
             "folder_icon": "\ue5ff",
             "folder_separator_icon": "/",
-            "home_icon": "\uf7db",
+            "home_icon": "\udb80\udedc",
             "style": "agnoster"
           },
           "style": "plain",
@@ -39,7 +39,7 @@
             "github_icon": "\uf408 "
           },
           "style": "plain",
-          "template": " on {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}<red> \uf044 {{ .Working.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<yellow> \uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }}",
+          "template": " on {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}<red> \uf044 {{ .Working.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<yellow> \uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }}",
           "type": "git"
         },
         {
diff --git a/themes/peru.omp.json b/themes/peru.omp.json
index 6433d47b..e098cd78 100644
--- a/themes/peru.omp.json
+++ b/themes/peru.omp.json
@@ -34,7 +34,7 @@
             "fetch_upstream_icon": true
           },
           "style": "plain",
-          "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         }
       ],
diff --git a/themes/pixelrobots.omp.json b/themes/pixelrobots.omp.json
index 21b0c998..d14cca65 100644
--- a/themes/pixelrobots.omp.json
+++ b/themes/pixelrobots.omp.json
@@ -15,7 +15,7 @@
           "background": "#ffea00",
           "foreground": "#000000",
           "style": "powerline",
-          "template": " \ufd31{{.Context}}{{if .Namespace}} :: {{.Namespace}}{{end}} ",
+          "template": " \udb82\udc33{{.Context}}{{if .Namespace}} :: {{.Namespace}}{{end}} ",
           "type": "kubectl"
         },
         {
@@ -92,7 +92,7 @@
           "properties": {
             "folder_icon": "<#B5B2C2>\ue5fe </>",
             "folder_separator_icon": "<#ffea00>\ue0b1 </>",
-            "home_icon": "\uf7db ",
+            "home_icon": "\udb80\udedc ",
             "style": "agnoster_short"
           },
           "style": "diamond",
@@ -113,7 +113,7 @@
             "fetch_upstream_icon": true
           },
           "style": "diamond",
-          "template": "<#ffea00>\ue0b1 </>{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}<#E84855> \uf044 {{ .Working.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#2FDA4E> \uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "<#ffea00>\ue0b1 </>{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}<#E84855> \uf044 {{ .Working.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#2FDA4E> \uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
diff --git a/themes/plague.omp.json b/themes/plague.omp.json
index dfb7c0c9..dc252044 100644
--- a/themes/plague.omp.json
+++ b/themes/plague.omp.json
@@ -18,7 +18,7 @@
           "foreground": "#434343",
           "powerline_symbol": "\ue0b0",
           "style": "powerline",
-          "template": " \uf9c6 {{ .Icon }}{{ if ne .Status \"stopped\" }}{{ .Artist }} - {{ .Track }}{{ end }} ",
+          "template": " \udb81\udcc7 {{ .Icon }}{{ if ne .Status \"stopped\" }}{{ .Artist }} - {{ .Track }}{{ end }} ",
           "type": "spotify"
         },
         {
@@ -41,7 +41,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -57,7 +57,7 @@
           "foreground": "#ffffff",
           "powerline_symbol": "\ue0b0",
           "style": "powerline",
-          "template": " \ufcb5 {{ .Name }} ",
+          "template": " \udb81\udfb7 {{ .Name }} ",
           "type": "shell"
         },
         {
diff --git a/themes/poshmon.omp.json b/themes/poshmon.omp.json
index fe0fb4e2..33777141 100644
--- a/themes/poshmon.omp.json
+++ b/themes/poshmon.omp.json
@@ -10,7 +10,7 @@
           "leading_diamond": "\ue0b6",
           "powerline_symbol": "\ue0b0",
           "style": "diamond",
-          "template": "\uf91c {{ .HostName }} ",
+          "template": "\udb81\udc1d {{ .HostName }} ",
           "type": "session"
         },
         {
@@ -43,7 +43,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " \uf113 {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " \uf113 {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         }
       ],
@@ -59,7 +59,7 @@
           "properties": {
             "fetch_package_manager": true,
             "npm_icon": " <#cc3a3a>\ue5fa</> ",
-            "yarn_icon": " <#348cba>\uf61a</>"
+            "yarn_icon": " <#348cba>\udb80\udd1b</>"
           },
           "style": "diamond",
           "template": "\ue718 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}",
@@ -80,7 +80,7 @@
           "foreground": "#06aad5",
           "leading_diamond": "\ue0b6",
           "style": "diamond",
-          "template": "\ufcd1 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
+          "template": "\udb81\udfd3 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
           "trailing_diamond": "\ue0b4 ",
           "type": "go"
         },
@@ -95,7 +95,7 @@
             "time_format": "_2, 15:04:05"
           },
           "style": "diamond",
-          "template": " \uf5ef {{ .CurrentDate | date .Format }} ",
+          "template": " \udb80\udcf0 {{ .CurrentDate | date .Format }} ",
           "trailing_diamond": "\ue0b4",
           "type": "time"
         }
diff --git a/themes/powerlevel10k_rainbow.omp.json b/themes/powerlevel10k_rainbow.omp.json
index c6679bee..f9ab86f2 100644
--- a/themes/powerlevel10k_rainbow.omp.json
+++ b/themes/powerlevel10k_rainbow.omp.json
@@ -41,7 +41,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         }
       ],
@@ -59,7 +59,7 @@
             "fetch_version": true
           },
           "style": "powerline",
-          "template": " {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} \uf898 ",
+          "template": " {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} \udb80\udf99 ",
           "type": "node"
         },
         {
diff --git a/themes/pure.omp.json b/themes/pure.omp.json
index 1d363b4a..1a44ae8f 100644
--- a/themes/pure.omp.json
+++ b/themes/pure.omp.json
@@ -37,7 +37,7 @@
             "github_icon": ""
           },
           "style": "plain",
-          "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}<#FFAFD7>*</>{{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}<#FFAFD7>*</>{{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         }
       ],
diff --git a/themes/quick-term.omp.json b/themes/quick-term.omp.json
index 60385b9f..7d1f1ba2 100644
--- a/themes/quick-term.omp.json
+++ b/themes/quick-term.omp.json
@@ -67,11 +67,11 @@
             "fetch_status": true,
             "branch_icon": "\uf418 ",
             "branch_identical_icon": "\uf444",
-            "branch_gone_icon": "\uf655"
+            "branch_gone_icon": "\udb80\udd56"
           },
           "style": "diamond",
           "leading_diamond": "<transparent,background>\ue0b0</>",
-          "template": " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} <transparent>\ue0b1</> <#121318>\uf044 {{ .Working.String }}</>{{ end }}{{ if .Staging.Changed }} <transparent>\ue0b1</> <#121318>\uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} <transparent>\ue0b1</> <#121318>\uf692 {{ .StashCount }}</>{{ end }} ",
+          "template": " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} <transparent>\ue0b1</> <#121318>\uf044 {{ .Working.String }}</>{{ end }}{{ if .Staging.Changed }} <transparent>\ue0b1</> <#121318>\uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} <transparent>\ue0b1</> <#121318>\udb80\udd93 {{ .StashCount }}</>{{ end }} ",
           "trailing_diamond": "\ue0b0",
           "type": "git"
         }
@@ -91,7 +91,7 @@
           "invert_powerline": true,
           "style": "powerline",
           "powerline_symbol": "\ue0b2",
-          "template": " \uf608 {{ .FormattedMs }} ",
+          "template": " \udb80\udd09 {{ .FormattedMs }} ",
           "type": "executiontime"
         },
         {
@@ -102,7 +102,7 @@
           },
           "invert_powerline": true,
           "style": "diamond",
-          "template": " \uf5ef {{ .CurrentDate | date .Format }} ",
+          "template": " \udb80\udcf0 {{ .CurrentDate | date .Format }} ",
           "trailing_diamond": "\ue0b0",
           "type": "time"
         }
diff --git a/themes/rudolfs-dark.omp.json b/themes/rudolfs-dark.omp.json
index dca0d9a5..b650da13 100644
--- a/themes/rudolfs-dark.omp.json
+++ b/themes/rudolfs-dark.omp.json
@@ -48,7 +48,7 @@
             "fetch_upstream_icon": true
           },
           "style": "plain",
-          "template": "[ {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ]",
+          "template": "[ {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ]",
           "type": "git"
         },
         {
diff --git a/themes/schema.json b/themes/schema.json
index 7df1c7c1..ef24bd2e 100644
--- a/themes/schema.json
+++ b/themes/schema.json
@@ -2260,13 +2260,13 @@
                     "type": "string",
                     "title": "Alternative icon",
                     "description": "Alternative icon for this activity type",
-                    "default": "\uf5a2"
+                    "default": "\udb80\udca3"
                   },
                   "run_icon": {
                     "type": "string",
                     "title": "Alternative icon",
                     "description": "Alternative icon for this activity type",
-                    "default": "\ufc0c"
+                    "default": "\udb81\udf0e"
                   },
                   "skiing_icon": {
                     "type": "string",
diff --git a/themes/slim.omp.json b/themes/slim.omp.json
index cf7005b0..7ed8606c 100644
--- a/themes/slim.omp.json
+++ b/themes/slim.omp.json
@@ -70,7 +70,7 @@
             "fetch_upstream_icon": true
           },
           "style": "diamond",
-          "template": "<#7a7a7a>\ue0b1 </>{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}<#E84855> \uf044 {{ .Working.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#2FDA4E> \uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "<#7a7a7a>\ue0b1 </>{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}<#E84855> \uf044 {{ .Working.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#2FDA4E> \uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -121,7 +121,7 @@
             "time_format": "15:04:05"
           },
           "style": "diamond",
-          "template": " {{ .CurrentDate | date .Format }}<#007ACC> \uf64f </>",
+          "template": " {{ .CurrentDate | date .Format }}<#007ACC> \udb82\udd54 </>",
           "trailing_diamond": "\u2593\ue0c6",
           "type": "time"
         }
@@ -169,7 +169,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": " \uf705 {{ if gt .Code 0 }}{{ .Code }}{{ end }} ",
+          "template": " \udb81\uddfc {{ if gt .Code 0 }}{{ .Code }}{{ end }} ",
           "type": "exit"
         }
       ],
diff --git a/themes/slimfat.omp.json b/themes/slimfat.omp.json
index 3b9f1218..47aacd1c 100644
--- a/themes/slimfat.omp.json
+++ b/themes/slimfat.omp.json
@@ -68,7 +68,7 @@
             "fetch_upstream_icon": true
           },
           "style": "diamond",
-          "template": "<#7a7a7a>\ue0b1 </>{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}<#E84855> \uf044 {{ .Working.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#2FDA4E> \uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "<#7a7a7a>\ue0b1 </>{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}<#E84855> \uf044 {{ .Working.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#2FDA4E> \uf046 {{ .Staging.String }}</>{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -119,7 +119,7 @@
             "time_format": "15:04:05"
           },
           "style": "diamond",
-          "template": " {{ .CurrentDate | date .Format }}<#007ACC> \uf64f </>",
+          "template": " {{ .CurrentDate | date .Format }}<#007ACC> \udb82\udd54 </>",
           "trailing_diamond": "\u2593\ue0c6",
           "type": "time"
         }
@@ -167,7 +167,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": " \uf705 {{ if gt .Code 0 }}{{ .Code }}{{ end }} ",
+          "template": " \udb81\uddfc {{ if gt .Code 0 }}{{ .Code }}{{ end }} ",
           "type": "exit"
         }
       ],
diff --git a/themes/sonicboom_dark.omp.json b/themes/sonicboom_dark.omp.json
index 5c15215d..f986cb8a 100644
--- a/themes/sonicboom_dark.omp.json
+++ b/themes/sonicboom_dark.omp.json
@@ -42,7 +42,7 @@
           "properties": {
             "folder_icon": "\ue5fe",
             "folder_separator_icon": "<transparent> \ue0bd </>",
-            "home_icon": "\uf7db",
+            "home_icon": "\udb80\udedc",
             "style": "agnoster_short"
           },
           "style": "plain",
@@ -57,7 +57,7 @@
             "fetch_status": true
           },
           "style": "plain",
-          "template": "<#000000>\ue0b1 </>{{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "<#000000>\ue0b1 </>{{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -83,7 +83,7 @@
           "foreground": "#43CCEA",
           "leading_diamond": "\ue0c5",
           "style": "diamond",
-          "template": " {{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }}<transparent> / </>{{ .HostName }}",
+          "template": " {{ if .SSHSession }}\udb80\udf18 {{ end }}{{ .UserName }}<transparent> / </>{{ .HostName }}",
           "type": "session"
         },
         {
@@ -113,7 +113,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": "\ufb0c ",
+          "template": "\udb81\ude0d ",
           "type": "exit"
         }
       ],
diff --git a/themes/sonicboom_light.omp.json b/themes/sonicboom_light.omp.json
index 63c4718a..4c030a70 100644
--- a/themes/sonicboom_light.omp.json
+++ b/themes/sonicboom_light.omp.json
@@ -42,7 +42,7 @@
           "properties": {
             "folder_icon": "\ue5fe",
             "folder_separator_icon": "<transparent> \ue0bd </>",
-            "home_icon": "\uf7db",
+            "home_icon": "\udb80\udedc",
             "style": "agnoster_short"
           },
           "style": "plain",
@@ -57,7 +57,7 @@
             "fetch_status": true
           },
           "style": "plain",
-          "template": "<#000000>\ue0b1 </>{{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "<#000000>\ue0b1 </>{{ .HEAD }}{{ if .Staging.Changed }}<#FF6F00> \uf046 {{ .Staging.String }}</>{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -83,7 +83,7 @@
           "foreground": "#43CCEA",
           "leading_diamond": "\ue0c5",
           "style": "diamond",
-          "template": " {{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }}<transparent> / </>{{ .HostName }}",
+          "template": " {{ if .SSHSession }}\udb80\udf18 {{ end }}{{ .UserName }}<transparent> / </>{{ .HostName }}",
           "type": "session"
         },
         {
@@ -113,7 +113,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": "\ufb0c ",
+          "template": "\udb81\ude0d ",
           "type": "exit"
         }
       ],
diff --git a/themes/space.omp.json b/themes/space.omp.json
index 5f50b24e..433a0ff7 100644
--- a/themes/space.omp.json
+++ b/themes/space.omp.json
@@ -34,7 +34,7 @@
             "fetch_stash_count": true
           },
           "style": "plain",
-          "template": "<#ffffff>on</> {{ .HEAD }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "<#ffffff>on</> {{ .HEAD }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -46,7 +46,7 @@
         {
           "foreground": "#7FD5EA",
           "style": "powerline",
-          "template": "[\ufcd1 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}] ",
+          "template": "[\udb81\udfd3 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}] ",
           "type": "go"
         },
         {
diff --git a/themes/spaceship.omp.json b/themes/spaceship.omp.json
index 9e4ba062..78c9a8cc 100644
--- a/themes/spaceship.omp.json
+++ b/themes/spaceship.omp.json
@@ -26,7 +26,7 @@
             "fetch_stash_count": true
           },
           "style": "plain",
-          "template": "<#ffffff>on</> {{ .HEAD }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": "<#ffffff>on</> {{ .HEAD }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         }
       ],
diff --git a/themes/stelbent-compact.minimal.omp.json b/themes/stelbent-compact.minimal.omp.json
index 3926e60b..cba52c20 100644
--- a/themes/stelbent-compact.minimal.omp.json
+++ b/themes/stelbent-compact.minimal.omp.json
@@ -14,7 +14,7 @@
             "display_host": true
           },
           "style": "plain",
-          "template": "\u250c {{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }}@{{ .HostName }} "
+          "template": "\u250c {{ if .SSHSession }}\udb80\udf18 {{ end }}{{ .UserName }}@{{ .HostName }} "
         },
         {
           "type": "path",
diff --git a/themes/takuya.omp.json b/themes/takuya.omp.json
index 40d3ffda..5a71cf7f 100644
--- a/themes/takuya.omp.json
+++ b/themes/takuya.omp.json
@@ -65,7 +65,7 @@
           "properties": {
             "fetch_package_manager": true,
             "npm_icon": " <#cc3a3a>\ue5fa</> ",
-            "yarn_icon": " <#348cba>\uf61a</>"
+            "yarn_icon": " <#348cba>\udb80\udd1b</>"
           },
           "style": "diamond",
           "template": "\ue718 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}",
@@ -78,7 +78,7 @@
           "invert_powerline": true,
           "leading_diamond": " \ue0b6",
           "style": "diamond",
-          "template": " \uf64f {{ .CurrentDate | date .Format }} ",
+          "template": " \udb82\udd54 {{ .CurrentDate | date .Format }} ",
           "trailing_diamond": "\ue0b4",
           "type": "time"
         }
diff --git a/themes/thecyberden.omp.json b/themes/thecyberden.omp.json
index 85be9f72..166605fd 100644
--- a/themes/thecyberden.omp.json
+++ b/themes/thecyberden.omp.json
@@ -10,7 +10,7 @@
           "leading_diamond": "\ue0b6",
           "powerline_symbol": "\ue0b0",
           "style": "diamond",
-          "template": "\ufcbe {{ .HostName }} ",
+          "template": "\udb81\udfc0 {{ .HostName }} ",
           "type": "session"
         },
         {
@@ -40,7 +40,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
diff --git a/themes/tiwahu.omp.json b/themes/tiwahu.omp.json
index 4f85208d..29b9f7d0 100644
--- a/themes/tiwahu.omp.json
+++ b/themes/tiwahu.omp.json
@@ -33,14 +33,14 @@
           "background": "#222222",
           "foreground": "#666666",
           "style": "plain",
-          "template": " {{ if .WSL }}\uf68e {{ end }}{{.Icon}}",
+          "template": " {{ if .WSL }}\udb80\udd8f {{ end }}{{.Icon}}",
           "type": "os"
         },
         {
           "background": "#222222",
           "foreground": "#666666",
           "style": "plain",
-          "template": " {{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }}@{{ .HostName }} ",
+          "template": " {{ if .SSHSession }}\udb80\udf18 {{ end }}{{ .UserName }}@{{ .HostName }} ",
           "type": "session"
         },
         {
@@ -64,7 +64,7 @@
             "fetch_status": false,
             "fetch_upstream_icon": false,
             "merge_icon": "\ue727 ",
-            "no_commits_icon": "\uf594 ",
+            "no_commits_icon": "\udb80\udc95 ",
             "rebase_icon": "\ue728 ",
             "revert_icon": "\uf0e2 ",
             "tag_icon": "\uf412 "
@@ -90,7 +90,7 @@
             "fetch_version": false
           },
           "style": "plain",
-          "template": " \ufcd1 ",
+          "template": " \udb81\udfd3 ",
           "type": "go"
         },
         {
diff --git a/themes/tokyo.omp.json b/themes/tokyo.omp.json
index aac36a01..93276f43 100644
--- a/themes/tokyo.omp.json
+++ b/themes/tokyo.omp.json
@@ -7,7 +7,7 @@
         {
           "foreground": "#7eb8da",
           "style": "plain",
-          "template": "\u250f[<#ffffff>\uf508</> {{ .UserName }} from <#ffffff>\ufcbe</> {{ .HostName }}]",
+          "template": "\u250f[<#ffffff>\udb80\udc09</> {{ .UserName }} from <#ffffff>\udb81\udfc0</> {{ .HostName }}]",
           "type": "session"
         },
         {
@@ -31,7 +31,7 @@
         {
           "foreground": "#be9ddf",
           "style": "diamond",
-          "template": "[<#ffffff>\uf85a</> RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB]",
+          "template": "[<#ffffff>\udb80\udf5b</> RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1000000000.0) }}GB]",
           "type": "sysinfo"
         },
         {
@@ -40,7 +40,7 @@
             "time_format": "Monday at 3:04:05 PM"
           },
           "style": "diamond",
-          "template": "[<#ffffff>\uf5ef</> {{ .CurrentDate | date .Format }}]",
+          "template": "[<#ffffff>\udb80\udcf0</> {{ .CurrentDate | date .Format }}]",
           "type": "time"
         },
         {
@@ -51,7 +51,7 @@
             "fetch_upstream_icon": true
           },
           "style": "plain",
-          "template": "[<#ffffff>{{ .UpstreamIcon }}</>{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} <#ffffff>\uf044</> {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} <#ffffff>\uf046</> {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} <#ffffff>\uf692</> {{ .StashCount }}{{ end }}]",
+          "template": "[<#ffffff>{{ .UpstreamIcon }}</>{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} <#ffffff>\uf044</> {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} <#ffffff>\uf046</> {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} <#ffffff>\udb80\udd93</> {{ .StashCount }}{{ end }}]",
           "type": "git"
         },
         {
@@ -75,7 +75,7 @@
         {
           "foreground": "#ffa5d8",
           "style": "powerline",
-          "template": "[<#ffffff>\ufc8d</> Error, check your command]",
+          "template": "[<#ffffff>\udb81\udf8f</> Error, check your command]",
           "type": "exit"
         }
       ],
diff --git a/themes/tokyonight_storm.omp.json b/themes/tokyonight_storm.omp.json
index 6ada9048..8afc9e1e 100644
--- a/themes/tokyonight_storm.omp.json
+++ b/themes/tokyonight_storm.omp.json
@@ -72,7 +72,7 @@
           "type": "node",
           "style": "plain",
           "foreground": "p:pistachio-green",
-          "template": "\uf898 {{ .Full }} "
+          "template": "\udb80\udf99 {{ .Full }} "
         },
         {
           "type": "php",
diff --git a/themes/tonybaloney.omp.json b/themes/tonybaloney.omp.json
index e7e642ed..cf3952f3 100644
--- a/themes/tonybaloney.omp.json
+++ b/themes/tonybaloney.omp.json
@@ -25,7 +25,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
diff --git a/themes/uew.omp.json b/themes/uew.omp.json
index 8d125e8c..24a28ef6 100644
--- a/themes/uew.omp.json
+++ b/themes/uew.omp.json
@@ -31,7 +31,7 @@
           {
             "foreground": "#BFA8BF",
             "style": "powerline",
-            "template": " <#fff>\ufcb5</> {{ .Name }} ",
+            "template": " <#fff>\udb81\udfb7</> {{ .Name }} ",
             "type": "shell"
           }
         ],
@@ -52,7 +52,7 @@
               "threshold": 0
             },
             "style": "diamond",
-            "template": " <#BBC4B9>{{ .FormattedMs }}s</> <#fff>\uf6dc</>",
+            "template": " <#BBC4B9>{{ .FormattedMs }}s</> <#fff>\udb80\udddd</>",
             "type": "executiontime"
           },
           {
@@ -75,7 +75,7 @@
           {
             "foreground": "#BBC4B9",
             "style": "diamond",
-            "template": "<#fff>\uf6dc \ue718</> {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} ",
+            "template": "<#fff>\udb80\udddd \ue718</> {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} ",
             "type": "node"
           }
         ],
diff --git a/themes/unicorn.omp.json b/themes/unicorn.omp.json
index 8a0e3b31..ca3ba408 100644
--- a/themes/unicorn.omp.json
+++ b/themes/unicorn.omp.json
@@ -43,7 +43,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -51,7 +51,7 @@
           "foreground": "#fff",
           "powerline_symbol": "\ue0b0",
           "style": "powerline",
-          "template": "<#fff> \uf64f </>{{ .CurrentDate | date .Format }} ",
+          "template": "<#fff> \udb82\udd54 </>{{ .CurrentDate | date .Format }} ",
           "type": "time"
         },
         {
@@ -61,7 +61,7 @@
             "always_enabled": true
           },
           "style": "diamond",
-          "template": " \ufbab {{ .FormattedMs }}\u2800",
+          "template": " \udb81\udead {{ .FormattedMs }}\u2800",
           "trailing_diamond": "\ue0b4",
           "type": "executiontime"
         }
diff --git a/themes/velvet.omp.json b/themes/velvet.omp.json
index 137b8330..028e91c7 100644
--- a/themes/velvet.omp.json
+++ b/themes/velvet.omp.json
@@ -48,7 +48,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "type": "git"
         },
         {
@@ -72,7 +72,7 @@
             "always_enabled": true
           },
           "style": "diamond",
-          "template": " \uf7d4{{ if gt .Code 0 }} {{.Code}}{{ end }} ",
+          "template": " \udb86\udca0{{ if gt .Code 0 }} {{.Code}}{{ end }} ",
           "trailing_diamond": "\ue0b4",
           "type": "exit"
         }
@@ -102,7 +102,7 @@
             "fetch_version": false
           },
           "style": "diamond",
-          "template": "\ufcd1{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
+          "template": "\udb81\udfd3{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
           "trailing_diamond": "\ue0b4",
           "type": "go"
         },
diff --git a/themes/wholespace.omp.json b/themes/wholespace.omp.json
index 213b185d..d5394eb1 100644
--- a/themes/wholespace.omp.json
+++ b/themes/wholespace.omp.json
@@ -11,7 +11,7 @@
           "properties": {
             "macos": "\uf179 ",
             "ubuntu": "\uf31b ",
-            "windows": "\uf871 "
+            "windows": "\udb80\udf72 "
           },
           "style": "diamond",
           "template": " {{ if .WSL }}WSL at {{ end }}{{.Icon}}",
@@ -35,14 +35,14 @@
           "foreground": "#ffffff",
           "leading_diamond": "\ue0b2",
           "style": "diamond",
-          "template": "\uf85a CPU: {{ round .PhysicalPercentUsed .Precision }}% | ",
+          "template": "\udb80\udf5b CPU: {{ round .PhysicalPercentUsed .Precision }}% | ",
           "type": "sysinfo"
         },
         {
           "background": "#516BEB",
           "foreground": "#ffffff",
           "style": "diamond",
-          "template": "RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1068786176.0) }}GB \uf85a ",
+          "template": "RAM: {{ (div ((sub .PhysicalTotalMemory .PhysicalFreeMemory)|float64) 1000000000.0) }}/{{ (div .PhysicalTotalMemory 1068786176.0) }}GB \udb80\udf5b ",
           "trailing_diamond": "<transparent,#516BEB>\ue0b2</>",
           "type": "sysinfo"
         },
@@ -72,7 +72,7 @@
           "properties": {
             "fetch_package_manager": true,
             "npm_icon": " <#cc3a3a>\ue5fa</> ",
-            "yarn_icon": " <#348cba>\uf61a</>"
+            "yarn_icon": " <#348cba>\udb80\udd1b</>"
           },
           "style": "diamond",
           "template": "\ue718 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}",
@@ -91,7 +91,7 @@
             "fetch_worktree_count": true
           },
           "style": "diamond",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "trailing_diamond": "\ue0b0",
           "type": "git"
         }
@@ -120,7 +120,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": " \uf7d4 ",
+          "template": " \udb86\udca0 ",
           "type": "exit"
         }
       ],
diff --git a/website/docs/configuration/templates.mdx b/website/docs/configuration/templates.mdx
index 08ff1e0e..2d79c2f3 100644
--- a/website/docs/configuration/templates.mdx
+++ b/website/docs/configuration/templates.mdx
@@ -180,7 +180,7 @@ If you want to for example use the [git][git] segment's `.UpstreamGone` property
 do so like this:
 
 ```json
-"template": " {{ if .Segments.Git.UpstreamGone }}\uf7d3{{ else if gt .Code 0 }}\uf00d{{ else }}\uf00c{{ end }} "
+"template": " {{ if .Segments.Git.UpstreamGone }}\udb80\uded4{{ else if gt .Code 0 }}\uf00d{{ else }}\uf00c{{ end }} "
 ```
 
 :::caution
@@ -227,7 +227,7 @@ to distinct between both. For example:
 If you want to know if a specific segment is active, you can use the `.Segments.Contains` function, for example:
 
 ```json
-"template": "{{ if .Segments.Contains \"Git\" }}\uf7d3{{ else if gt .Code 0 }}\uf00d{{ else }}\uf00c{{ end }} "
+"template": "{{ if .Segments.Contains \"Git\" }}\udb80\uded4{{ else if gt .Code 0 }}\uf00d{{ else }}\uf00c{{ end }} "
 ```
 
 ## Text decoration
diff --git a/website/docs/faq.mdx b/website/docs/faq.mdx
index 878bbe5c..f76f9b45 100644
--- a/website/docs/faq.mdx
+++ b/website/docs/faq.mdx
@@ -89,12 +89,12 @@ A temporary workaround is to use an invisible character at the end (`\u2800`), o
 In case you didn't export the config yet (it's the default, or you're using the `--config` flag with a predefined theme), you can follow
 the steps [here][export] to export it to a local file so you can adjust the [segment's][segment] `template`.
 
-In the example below, it's assumed that the execution segment's icon `\ufbab` has an unexpected space after it in Windows Terminal.
+In the example below, it's assumed that the execution segment's icon `\udb81\udead` has an unexpected space after it in Windows Terminal.
 
 ```json
 {
   "type": "executiontime",
-  "template": "\ufbab" // unexpected space
+  "template": "\udb81\udead" // unexpected space
 }
 ```
 
@@ -103,7 +103,7 @@ Adjust it by adding `\u2800` immediately after the icon.
 ```json
 {
   "type": "executiontime",
-  "template": "\ufbab\u2800" // solved
+  "template": "\udb81\udead\u2800" // solved
 }
 ```
 
diff --git a/website/docs/segments/connection.mdx b/website/docs/segments/connection.mdx
index 98135da8..e24c3fd3 100644
--- a/website/docs/segments/connection.mdx
+++ b/website/docs/segments/connection.mdx
@@ -35,7 +35,7 @@ import Config from '@site/src/components/Config.js';
 :::note default template
 
 ```template
-{{ if eq .Type \"wifi\"}}\uf1eb{{ else if eq .Type \"ethernet\"}}\uf6ff{{ end }}
+{{ if eq .Type \"wifi\"}}\uf1eb{{ else if eq .Type \"ethernet\"}}\udb80\ude00{{ end }}
 ```
 
 :::
diff --git a/website/docs/segments/deno.mdx b/website/docs/segments/deno.mdx
index 0a185ae7..0d161955 100644
--- a/website/docs/segments/deno.mdx
+++ b/website/docs/segments/deno.mdx
@@ -16,7 +16,7 @@ import Config from '@site/src/components/Config.js';
   "type": "deno",
   "style": "plain",
   "foreground": "#3C82F6",
-  "template": " \ufbe4 {{ .Full }} "
+  "template": " \udb81\udee6 {{ .Full }} "
 }}/>
 
 ## Properties
diff --git a/website/docs/segments/executiontime.mdx b/website/docs/segments/executiontime.mdx
index dec9442b..b8593967 100644
--- a/website/docs/segments/executiontime.mdx
+++ b/website/docs/segments/executiontime.mdx
@@ -22,7 +22,7 @@ import Config from '@site/src/components/Config.js';
   "powerline_symbol": "\uE0B0",
   "foreground": "#ffffff",
   "background": "#8800dd",
-  "template": " <#fefefe>\ufbab</> {{ .FormattedMs }} ",
+  "template": " <#fefefe>\udb81\udead</> {{ .FormattedMs }} ",
   "properties": {
     "threshold": 500,
     "style": "austin"
diff --git a/website/docs/segments/fossil.mdx b/website/docs/segments/fossil.mdx
index 9b7b7a51..ab0f939b 100644
--- a/website/docs/segments/fossil.mdx
+++ b/website/docs/segments/fossil.mdx
@@ -31,7 +31,7 @@ import Config from '@site/src/components/Config.js';
 :::note default template
 
 ```template
- \ufb2b {{.Branch}} {{.Status.String}}
+ \udb81\ude2c {{.Branch}} {{.Status.String}}
 ```
 
 :::
diff --git a/website/docs/segments/kotlin.mdx b/website/docs/segments/kotlin.mdx
index 5fa5c649..e44bf425 100644
--- a/website/docs/segments/kotlin.mdx
+++ b/website/docs/segments/kotlin.mdx
@@ -18,7 +18,7 @@ import Config from '@site/src/components/Config.js';
   "powerline_symbol": "\uE0B0",
   "foreground": "#ffffff",
   "background": "#906cff",
-  "template": " \ufa05 {{ .Full }} "
+  "template": " \udb81\udd06 {{ .Full }} "
 }}/>
 
 ## Properties
diff --git a/website/docs/segments/session.mdx b/website/docs/segments/session.mdx
index 6b5296ff..589708cd 100644
--- a/website/docs/segments/session.mdx
+++ b/website/docs/segments/session.mdx
@@ -19,7 +19,7 @@ import Config from '@site/src/components/Config.js';
   "background": "#c386f1",
   "leading_diamond": "\uE0B6",
   "trailing_diamond": "\uE0B0",
-  "template": "{{ if .SSHSession }}\uF817 {{ end }}{{ .UserName }}"
+  "template": "{{ if .SSHSession }}\udb80\udf18 {{ end }}{{ .UserName }}"
 }}/>
 
 ## Template ([info][templates])
@@ -27,7 +27,7 @@ import Config from '@site/src/components/Config.js';
 :::note default template
 
 ```template
-{{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }}@{{ .HostName }}
+{{ if .SSHSession }}\udb80\udf18 {{ end }}{{ .UserName }}@{{ .HostName }}
 ```
 
 :::
diff --git a/website/docs/segments/strava.mdx b/website/docs/segments/strava.mdx
index 10327b82..d1b08988 100644
--- a/website/docs/segments/strava.mdx
+++ b/website/docs/segments/strava.mdx
@@ -63,8 +63,8 @@ import Config from '@site/src/components/Config.js';
 | `expires_in`          | `int`    | the default timeout of the token from the Strava login                                                          |
 | `http_timeout`        | `int`    | how long do you want to wait before you want to see your prompt more than your strava data? - defaults to 500ms |
 | `CacheTimeout`        | `int`    | in minutes - How long do you want your Strava data cached? - defaults to 5 min                                  |
-| `RideIcon`            | `string` | defaults to `\uf5a2`                                                                                            |
-| `RunIcon`             | `string` | defaults to `\ufc0c`                                                                                            |
+| `RideIcon`            | `string` | defaults to `\udb80\udca3`                                                                                            |
+| `RunIcon`             | `string` | defaults to `\udb81\udf0e`                                                                                            |
 | `SkiingIcon`          | `string` | defaults to `\ue213`                                                                                            |
 | `WorkOutIcon`         | `string` | defaults to `\ue213`                                                                                            |
 | `UnknownActivityIcon` | `string` | defaults to `\ue213`                                                                                            |
diff --git a/website/docs/segments/sysinfo.mdx b/website/docs/segments/sysinfo.mdx
index 122bda65..3a6ad224 100644
--- a/website/docs/segments/sysinfo.mdx
+++ b/website/docs/segments/sysinfo.mdx
@@ -17,7 +17,7 @@ import Config from '@site/src/components/Config.js';
   "powerline_symbol": "\ue0b0",
   "foreground": "#ffffff",
   "background": "#8f43f3",
-  "template":" \uf85a {{ round .PhysicalPercentUsed .Precision }}% ",
+  "template":" \udb80\udf5b {{ round .PhysicalPercentUsed .Precision }}% ",
   "properties": {
     "precision": 2
   },
diff --git a/website/docs/segments/ui5tooling.mdx b/website/docs/segments/ui5tooling.mdx
index 7240bc14..359369a1 100644
--- a/website/docs/segments/ui5tooling.mdx
+++ b/website/docs/segments/ui5tooling.mdx
@@ -17,7 +17,7 @@ import Config from '@site/src/components/Config.js';
   "background": "#f5a834",
   "foreground": "#100e23",
   "powerline_symbol": "\ue0b0",
-  "template": " \ufab6ui5 {{ .Full }} ",
+  "template": " \udb81\uddb7ui5 {{ .Full }} ",
   "style": "powerline",
   "type": "ui5tooling"
 }}/>


Test patch:
diff --git a/src/engine/migrate_test.go b/src/engine/migrate_test.go
index b8322c03..10bca90a 100644
--- a/src/engine/migrate_test.go
+++ b/src/engine/migrate_test.go
@@ -280,7 +280,7 @@ func TestSegmentTemplateMigration(t *testing.T) {
 		},
 		{
 			Case:     "SESSION no HOST",
-			Expected: " {{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }} ",
+			Expected: " {{ if .SSHSession }}\U000f0318 {{ end }}{{ .UserName }} ",
 			Type:     SESSION,
 			Props: properties.Map{
 				"display_host": false,
@@ -288,7 +288,7 @@ func TestSegmentTemplateMigration(t *testing.T) {
 		},
 		{
 			Case:     "SESSION no USER",
-			Expected: " {{ if .SSHSession }}\uf817 {{ end }}{{ .HostName }} ",
+			Expected: " {{ if .SSHSession }}\U000f0318 {{ end }}{{ .HostName }} ",
 			Type:     SESSION,
 			Props: properties.Map{
 				"display_user": false,
@@ -296,7 +296,7 @@ func TestSegmentTemplateMigration(t *testing.T) {
 		},
 		{
 			Case:     "SESSION no USER nor HOST",
-			Expected: " {{ if .SSHSession }}\uf817 {{ end }} ",
+			Expected: " {{ if .SSHSession }}\U000f0318 {{ end }} ",
 			Type:     SESSION,
 			Props: properties.Map{
 				"display_user": false,
@@ -305,7 +305,7 @@ func TestSegmentTemplateMigration(t *testing.T) {
 		},
 		{
 			Case:     "SESSION - Color overrides",
-			Expected: " {{ if .SSHSession }}\uf817 {{ end }}<#123456>{{ .UserName }}</>@<#789012>{{ .HostName }}</> ",
+			Expected: " {{ if .SSHSession }}\U000f0318 {{ end }}<#123456>{{ .UserName }}</>@<#789012>{{ .HostName }}</> ",
 			Type:     SESSION,
 			Props: properties.Map{
 				"user_color": "#123456",
diff --git a/src/segments/connection_test.go b/src/segments/connection_test.go
index 2ee67c7f..bb8835ae 100644
--- a/src/segments/connection_test.go
+++ b/src/segments/connection_test.go
@@ -52,7 +52,7 @@ func TestConnection(t *testing.T) {
 		{
 			Case:            "WiFi and Ethernet, enabled",
 			ConnectionType:  "wifi|ethernet",
-			ExpectedString:  "\uf6ff",
+			ExpectedString:  "\U000f0200",
 			ExpectedEnabled: true,
 			Connections: []*connectionResponse{
 				{
diff --git a/src/segments/git_test.go b/src/segments/git_test.go
index 23327e95..5c6daa6e 100644
--- a/src/segments/git_test.go
+++ b/src/segments/git_test.go
@@ -781,8 +781,8 @@ func TestGitTemplateString(t *testing.T) {
 		},
 		{
 			Case:     "Working and staging area changes with separator and stash count",
-			Expected: "main \uF046 +5 ~1 | \uF044 +2 ~3 \uf692 3",
-			Template: "{{ .HEAD }}{{ if .Staging.Changed }} \uF046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uF044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \uF692 {{ .StashCount }}{{ end }}", //nolint:lll
+			Expected: "main \uF046 +5 ~1 | \uF044 +2 ~3 \U000f0193 3",
+			Template: "{{ .HEAD }}{{ if .Staging.Changed }} \uF046 {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }} \uF044 {{ .Working.String }}{{ end }}{{ if gt .StashCount 0 }} \U000f0193 {{ .StashCount }}{{ end }}", //nolint:lll
 			Git: &Git{
 				HEAD: branchName,
 				Working: &GitStatus{
diff --git a/src/segments/owm_test.go b/src/segments/owm_test.go
index 35bfae62..2d2f73cb 100644
--- a/src/segments/owm_test.go
+++ b/src/segments/owm_test.go
@@ -27,20 +27,20 @@ func TestOWMSegmentSingle(t *testing.T) {
 		{
 			Case:            "Sunny Display",
 			JSONResponse:    `{"weather":[{"icon":"01d"}],"main":{"temp":20}}`,
-			ExpectedString:  "\ufa98 (20°C)",
+			ExpectedString:  "\U000f0599 (20°C)",
 			ExpectedEnabled: true,
 		},
 		{
 			Case:            "Sunny Display",
 			JSONResponse:    `{"weather":[{"icon":"01d"}],"main":{"temp":20}}`,
-			ExpectedString:  "\ufa98 (20°C)",
+			ExpectedString:  "\U000f0599 (20°C)",
 			ExpectedEnabled: true,
 			Template:        "{{.Weather}} ({{.Temperature}}{{.UnitIcon}})",
 		},
 		{
 			Case:            "Sunny Display",
 			JSONResponse:    `{"weather":[{"icon":"01d"}],"main":{"temp":20}}`,
-			ExpectedString:  "\ufa98",
+			ExpectedString:  "\U000f0599",
 			ExpectedEnabled: true,
 			Template:        "{{.Weather}} ",
 		},
@@ -90,7 +90,7 @@ func TestOWMSegmentIcons(t *testing.T) {
 		{
 			Case:               "Sunny Display day",
 			IconID:             "01d",
-			ExpectedIconString: "\ufa98",
+			ExpectedIconString: "\U000f0599",
 		},
 		{
 			Case:               "Light clouds Display day",
@@ -110,7 +110,7 @@ func TestOWMSegmentIcons(t *testing.T) {
 		{
 			Case:               "Shower Rain Display day",
 			IconID:             "09d",
-			ExpectedIconString: "\ufa95",
+			ExpectedIconString: "\U000f0596",
 		},
 		{
 			Case:               "Rain Display day",
@@ -136,7 +136,7 @@ func TestOWMSegmentIcons(t *testing.T) {
 		{
 			Case:               "Sunny Display night",
 			IconID:             "01n",
-			ExpectedIconString: "\ufa98",
+			ExpectedIconString: "\U000f0599",
 		},
 		{
 			Case:               "Light clouds Display night",
@@ -156,7 +156,7 @@ func TestOWMSegmentIcons(t *testing.T) {
 		{
 			Case:               "Shower Rain Display night",
 			IconID:             "09n",
-			ExpectedIconString: "\ufa95",
+			ExpectedIconString: "\U000f0596",
 		},
 		{
 			Case:               "Rain Display night",
@@ -227,7 +227,7 @@ func TestOWMSegmentIcons(t *testing.T) {
 }
 func TestOWMSegmentFromCache(t *testing.T) {
 	response := fmt.Sprintf(`{"weather":[{"icon":"%s"}],"main":{"temp":20}}`, "01d")
-	expectedString := fmt.Sprintf("%s (20°C)", "\ufa98")
+	expectedString := fmt.Sprintf("%s (20°C)", "\U000f0599")
 
 	env := &mock.MockedEnvironment{}
 	cache := &mock.MockedCache{}
@@ -250,7 +250,7 @@ func TestOWMSegmentFromCache(t *testing.T) {
 
 func TestOWMSegmentFromCacheWithHyperlink(t *testing.T) {
 	response := fmt.Sprintf(`{"weather":[{"icon":"%s"}],"main":{"temp":20}}`, "01d")
-	expectedString := fmt.Sprintf("«%s (20°C)»(http://api.openweathermap.org/data/2.5/weather?q=AMSTERDAM,NL&units=metric&appid=key)", "\ufa98")
+	expectedString := fmt.Sprintf("«%s (20°C)»(http://api.openweathermap.org/data/2.5/weather?q=AMSTERDAM,NL&units=metric&appid=key)", "\U000f0599")
 
 	env := &mock.MockedEnvironment{}
 	cache := &mock.MockedCache{}
diff --git a/src/segments/project_test.go b/src/segments/project_test.go
index bdb452b5..2a144ca9 100644
--- a/src/segments/project_test.go
+++ b/src/segments/project_test.go
@@ -321,7 +321,7 @@ func TestDotnetProject(t *testing.T) {
 			HasFiles:        true,
 			ProjectContents: "...<TargetFramework>net7.0</TargetFramework>...",
 			ExpectedEnabled: true,
-			ExpectedString:  "Valid \uf9fd net7.0",
+			ExpectedString:  "Valid \U000f04fe net7.0",
 		},
 		{
 			Case:            "valid .fsproj file",
@@ -329,7 +329,7 @@ func TestDotnetProject(t *testing.T) {
 			HasFiles:        true,
 			ProjectContents: "...<TargetFramework>net6.0</TargetFramework>...",
 			ExpectedEnabled: true,
-			ExpectedString:  "Valid \uf9fd net6.0",
+			ExpectedString:  "Valid \U000f04fe net6.0",
 		},
 		{
 			Case:            "valid .vbproj file",
@@ -337,7 +337,7 @@ func TestDotnetProject(t *testing.T) {
 			HasFiles:        true,
 			ProjectContents: "...<TargetFramework>net5.0</TargetFramework>...",
 			ExpectedEnabled: true,
-			ExpectedString:  "Valid \uf9fd net5.0",
+			ExpectedString:  "Valid \U000f04fe net5.0",
 		},
 		{
 			Case:            "invalid or empty contents",
diff --git a/src/segments/strava_test.go b/src/segments/strava_test.go
index 5032b1b0..f8d6d689 100644
--- a/src/segments/strava_test.go
+++ b/src/segments/strava_test.go
@@ -46,7 +46,7 @@ func TestStravaSegment(t *testing.T) {
 				},
 			},
 			Template:        "{{.Ago}} {{.Icon}}",
-			ExpectedString:  "6h \uf5a2",
+			ExpectedString:  "6h \U000f00a3",
 			ExpectedEnabled: true,
 		},
 		{
@@ -60,7 +60,7 @@ func TestStravaSegment(t *testing.T) {
 				},
 			},
 			Template:        "{{.Ago}} {{.Icon}}",
-			ExpectedString:  "4d \ufc0c",
+			ExpectedString:  "4d \U000f070e",
 			ExpectedEnabled: true,
 		},
 		{
diff --git a/src/test/jandedobbeleer-palette.omp.json b/src/test/jandedobbeleer-palette.omp.json
index 518766ee..c19cdf54 100644
--- a/src/test/jandedobbeleer-palette.omp.json
+++ b/src/test/jandedobbeleer-palette.omp.json
@@ -23,7 +23,7 @@
             "style": "folder"
           },
           "style": "powerline",
-          "template": " \uf74a  {{ .Path }} ",
+          "template": " \udb80\ude4b  {{ .Path }} ",
           "type": "path"
         },
         {
@@ -44,7 +44,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "trailing_diamond": "\ue0b4",
           "type": "git"
         },
@@ -56,7 +56,7 @@
             "fetch_version": true
           },
           "style": "powerline",
-          "template": " \uf898 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} ",
+          "template": " \udb80\udf99 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} ",
           "type": "node"
         },
         {
@@ -146,7 +146,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": "<transparent>\ue0b0</> \ufbab{{ .FormattedMs }}\u2800",
+          "template": "<transparent>\ue0b0</> \udb81\udead{{ .FormattedMs }}\u2800",
           "type": "executiontime"
         },
         {
diff --git a/src/test/jandedobbeleer.omp.json b/src/test/jandedobbeleer.omp.json
index f8277b19..48606dda 100644
--- a/src/test/jandedobbeleer.omp.json
+++ b/src/test/jandedobbeleer.omp.json
@@ -23,7 +23,7 @@
             "style": "folder"
           },
           "style": "powerline",
-          "template": " \uf74a  {{ .Path }} ",
+          "template": " \udb80\ude4b  {{ .Path }} ",
           "type": "path"
         },
         {
@@ -44,7 +44,7 @@
             "fetch_upstream_icon": true
           },
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} ",
           "trailing_diamond": "\ue0b4",
           "type": "git"
         },
@@ -56,7 +56,7 @@
             "fetch_version": true
           },
           "style": "powerline",
-          "template": " \uf898 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} ",
+          "template": " \udb80\udf99 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} ",
           "type": "node"
         },
         {
@@ -146,7 +146,7 @@
             "always_enabled": true
           },
           "style": "plain",
-          "template": "<transparent>\ue0b0</> \ufbab{{ .FormattedMs }}\u2800",
+          "template": "<transparent>\ue0b0</> \udb81\udead{{ .FormattedMs }}\u2800",
           "type": "executiontime"
         },
         {