diff --git a/lua/astrocommunity/editing-support/neogen/init.lua b/lua/astrocommunity/editing-support/neogen/init.lua
index 7c168d2c4..c22204288 100644
--- a/lua/astrocommunity/editing-support/neogen/init.lua
+++ b/lua/astrocommunity/editing-support/neogen/init.lua
@@ -1,4 +1,8 @@
 local prefix = "<leader>a"
+local maps = { n = {} }
+local icon = vim.g.icons_enabled and "󰷉 " or ""
+maps.n[prefix] = { desc = icon .. "Annotation" }
+require("astronvim.utils").set_mappings(maps)
 return {
   "danymat/neogen",
   cmd = "Neogen",
@@ -11,7 +15,6 @@ return {
     },
   },
   keys = {
-    { prefix, desc = "Annotation" },
     { prefix .. "<cr>", function() require("neogen").generate { type = "current" } end, desc = "Current" },
     { prefix .. "c", function() require("neogen").generate { type = "class" } end, desc = "Class" },
     { prefix .. "f", function() require("neogen").generate { type = "func" } end, desc = "Function" },
diff --git a/lua/astrocommunity/git/neogit/init.lua b/lua/astrocommunity/git/neogit/init.lua
index 505f439eb..18ebddffc 100644
--- a/lua/astrocommunity/git/neogit/init.lua
+++ b/lua/astrocommunity/git/neogit/init.lua
@@ -1,3 +1,8 @@
+local prefix = "<leader>g"
+local maps = { n = {} }
+local icon = vim.g.icons_enabled and "󰰔 " or ""
+maps.n[prefix] = { desc = icon .. "Neogit" }
+require("astronvim.utils").set_mappings(maps)
 return {
   {
     "NeogitOrg/neogit",
@@ -6,11 +11,10 @@ return {
     },
     event = "User AstroGitFile",
     keys = {
-      { "<leader>gn", desc = "Neogit", mode = { "n" } },
-      { "<leader>gnt", "<cmd>Neogit<CR>", desc = "Open Neogit Tab Page" },
-      { "<leader>gnc", "<cmd>Neogit commit<CR>", desc = "Open Neogit Commit Page" },
-      { "<leader>gnd", ":Neogit cwd=", desc = "Open Neogit Override CWD" },
-      { "<leader>gnk", ":Neogit kind=", desc = "Open Neogit Override Kind" },
+      { prefix .. "nt", "<cmd>Neogit<CR>", desc = "Open Neogit Tab Page" },
+      { prefix .. "nc", "<cmd>Neogit commit<CR>", desc = "Open Neogit Commit Page" },
+      { prefix .. "nd", ":Neogit cwd=", desc = "Open Neogit Override CWD" },
+      { prefix .. "nk", ":Neogit kind=", desc = "Open Neogit Override Kind" },
     },
   },
 }
diff --git a/lua/astrocommunity/motion/mini-surround/init.lua b/lua/astrocommunity/motion/mini-surround/init.lua
index e5d65932d..9d490b7a7 100644
--- a/lua/astrocommunity/motion/mini-surround/init.lua
+++ b/lua/astrocommunity/motion/mini-surround/init.lua
@@ -1,11 +1,12 @@
 local prefix = "gz"
+local maps = { n = {} }
+local icon = vim.g.icons_enabled and "󰑤 " or ""
+maps.n[prefix] = { desc = icon .. "Surround" }
+require("astronvim.utils").set_mappings(maps)
 return {
   { "machakann/vim-sandwich", enabled = false },
   {
     "echasnovski/mini.surround",
-    keys = {
-      { prefix, desc = "Surround" },
-    },
     opts = {
       mappings = {
         add = prefix .. "a", -- Add surrounding in Normal and Visual modes