diff --git a/.config/nvim/lua/plugin/cmp.lua b/.config/nvim/lua/plugin/cmp.lua
index 4155b68..c12ce81 100644
--- a/.config/nvim/lua/plugin/cmp.lua
+++ b/.config/nvim/lua/plugin/cmp.lua
@@ -19,43 +19,33 @@ cmp.event:on( 'confirm_done', cmp_autopairs.on_confirm_done({  map_char = { tex
 
 -- Custom item icons
 local icons = {
-    Class           = "   ",
-    Color           = "   ",
-    Constant        = " µ  ",
-    Constructor     = "   ",
-    Enum            = "   ",
-    EnumMember      = "   ",
-    Event           = "   ",
-    Field           = "   ",
-    File            = "   ",
-    Folder          = "   ",
-    Function        = "   ",
-    Keyword         = "   ",
-    Interface       = "   ",
-    Method          = "   ",
-    Module          = "   ",
-    Operator        = "   ",
-    Property        = "   ",
-    Reference       = "   ",
-    Snippet         = "   ",
-    Struct          = "   ",
-    Text            = "   ",
-    TypeParameter   = "   ",
-    Unit            = "   ",
-    Value           = "   ",
-    Variable        = "   ",
+    Class           = "",
+    Color           = "",
+    Constant        = "µ",
+    Constructor     = "",
+    Enum            = "",
+    EnumMember      = "",
+    Event           = "",
+    Field           = "",
+    File            = "",
+    Folder          = "",
+    Function        = "",
+    Keyword         = "",
+    Interface       = "",
+    Method          = "",
+    Module          = "",
+    Operator        = "",
+    Property        = "",
+    Reference       = "",
+    Snippet         = "",
+    Struct          = "",
+    Text            = "",
+    TypeParameter   = "",
+    Unit            = "",
+    Value           = "",
+    Variable        = "",
 }
 
-
-local function icons_setup()
-    local kinds = vim.lsp.protocol.CompletionItemKind
-    for i, kind in ipairs(kinds) do
-        kinds[i] = icons[kind] or kind
-    end
-end
-
-
-
 cmp.setup {
     completion = {
         autocomplete = false
@@ -72,7 +62,8 @@ cmp.setup {
     },
     formatting = {
         format = function(entry, vim_item)
-            vim_item.kind = icons[vim_item.kind]
+            vim_item.kind = string.format("%s %s", icons[vim_item.kind],
+                vim_item.kind)
             vim_item.menu = ({
                 nvim_lsp        = "[lsp]",
                 nvim_lua        = "[nvim]",
@@ -119,5 +110,8 @@ cmp.setup {
                 fallback()
             end
         end, { "i", "s" }),
-    }
+    },
+    view = {
+        entries = {name = 'custom', selection_order = 'near_cursor' }
+    },
 }