diff --git a/pkg/gui/presentation/icons/file_icons.go b/pkg/gui/presentation/icons/file_icons.go
index 6e647038ba3..ea4dfff09a7 100644
--- a/pkg/gui/presentation/icons/file_icons.go
+++ b/pkg/gui/presentation/icons/file_icons.go
@@ -89,13 +89,13 @@ var extIconMap = map[string]string{
 	".cp":             "\ue61d", // 
 	".cpio":           "\uf410", // 
 	".cpp":            "\ue61d", // 
-	".cs":             "\uf81a", // 
+	".cs":             "\U000f031b", // 󰌛
 	".csh":            "\uf489", // 
 	".cshtml":         "\uf1fa", // 
-	".csproj":         "\uf81a", // 
+	".csproj":         "\U000f031b", // 󰌛
 	".css":            "\ue749", // 
 	".csv":            "\uf1c3", // 
-	".csx":            "\uf81a", // 
+	".csx":            "\U000f031b", // 󰌛
 	".cxx":            "\ue61d", // 
 	".d":              "\ue7af", // 
 	".dart":           "\ue798", // 
@@ -184,7 +184,7 @@ var extIconMap = map[string]string{
 	".latex":          "\uf034", // 
 	".less":           "\ue758", // 
 	".lhs":            "\ue777", // 
-	".license":        "\uf718", // 
+	".license":        "\U000f0219", // 󰈙
 	".localized":      "\uf179", // 
 	".lock":           "\uf023", // 
 	".log":            "\uf18d", // 
@@ -210,7 +210,7 @@ var extIconMap = map[string]string{
 	".msi":            "\ue70f", // 
 	".mustache":       "\ue60f", // 
 	".nix":            "\uf313", // 
-	".node":           "\uf898", // 
+	".node":           "\U000f0399", // 󰎙
 	".npmignore":      "\ue71e", // 
 	".odp":            "\uf1c4", // 
 	".ods":            "\uf1c3", // 
@@ -251,7 +251,7 @@ var extIconMap = map[string]string{
 	".rspec_parallel": "\ue21e", // 
 	".rspec_status":   "\ue21e", // 
 	".rss":            "\uf09e", // 
-	".rtf":            "\uf718", // 
+	".rtf":            "\U000f0219", // 󰈙
 	".ru":             "\ue21e", // 
 	".rubydoc":        "\ue73b", // 
 	".sass":           "\ue603", // 
@@ -290,7 +290,7 @@ var extIconMap = map[string]string{
 	".tzo":            "\uf410", // 
 	".video":          "\uf03d", // 
 	".vim":            "\ue62b", // 
-	".vue":            "\ufd42", // ﵂
+	".vue":            "\U000f0844", // 󰡄
 	".war":            "\ue256", // 
 	".wav":            "\uf001", // 
 	".webm":           "\uf03d", // 
diff --git a/pkg/gui/presentation/icons/git_icons.go b/pkg/gui/presentation/icons/git_icons.go
index a66149b556c..b10aa8cafd1 100644
--- a/pkg/gui/presentation/icons/git_icons.go
+++ b/pkg/gui/presentation/icons/git_icons.go
@@ -7,12 +7,12 @@ import (
 )
 
 const (
-	BRANCH_ICON         = "\ufb2b" // שׂ
+	BRANCH_ICON         = "\U000f062c" // 󰘬
 	DETACHED_HEAD_ICON  = "\ue729" // 
 	TAG_ICON            = "\uf02b" // 
-	COMMIT_ICON         = "\ufc16" // ﰖ
-	MERGE_COMMIT_ICON   = "\ufb2c" // שּׁ
-	DEFAULT_REMOTE_ICON = "\uf7a1" // 
+	COMMIT_ICON         = "\U000f0718" // 󰜘
+	MERGE_COMMIT_ICON   = "\U000f062d" // 󰘭
+	DEFAULT_REMOTE_ICON = "\U000f02a2" // 󰊢
 	STASH_ICON          = "\uf01c" // 
 )
 
@@ -25,7 +25,7 @@ var remoteIcons = []remoteIcon{
 	{domain: "github.com", icon: "\ue709"},    // 
 	{domain: "bitbucket.org", icon: "\ue703"}, // 
 	{domain: "gitlab.com", icon: "\uf296"},    // 
-	{domain: "dev.azure.com", icon: "\ufd03"}, // ﴃ
+	{domain: "dev.azure.com", icon: "\U000f0805"}, // 󰠅
 }
 
 func IconForBranch(branch *models.Branch) string {