diff --git a/after/syntax/gitlab.vim b/after/syntax/gitlab.vim
index ef241470..d7ffb450 100644
--- a/after/syntax/gitlab.vim
+++ b/after/syntax/gitlab.vim
@@ -2,22 +2,25 @@ if filereadable($VIMRUNTIME . '/syntax/markdown.vim')
   source $VIMRUNTIME/syntax/markdown.vim
 endif
 
-syntax match Username "\%([]\)\@<= @\S*"
-syntax match Mention "\%([] \)\@<!@\S*"
 syntax match Date "\v\d+\s+\w+\s+ago"
-syntax match ChevronDown ""
-syntax match ChevronRight ""
-syntax match Resolved /\s✓\s\?/
-syntax match Unresolved /\s-\s\?/
-syntax match Pencil //
-
-highlight link Username GitlabUsername
-highlight link Mention GitlabMention
 highlight link Date GitlabDate
-highlight link ChevronDown GitlabChevron
-highlight link ChevronRight GitlabChevron
-highlight link Resolved GitlabResolved
+
+execute 'syntax match Unresolved /\s' . g:gitlab_discussion_tree_unresolved . '\s\?/'
 highlight link Unresolved GitlabUnresolved
-highlight link Pencil GitlabDraft
+
+execute 'syntax match Resolved /\s' . g:gitlab_discussion_tree_resolved . '\s\?/'
+highlight link Resolved GitlabResolved
+
+execute 'syntax match GitlabDiscussionOpen /^' . g:gitlab_discussion_tree_expander_open . '/'
+highlight link GitlabDiscussionOpen GitlabExpander
+
+execute 'syntax match GitlabDiscussionClosed /^' . g:gitlab_discussion_tree_expander_closed . '/'
+highlight link GitlabDiscussionClosed GitlabExpander
+
+execute 'syntax match Draft /' . g:gitlab_discussion_tree_draft . '/'
+highlight link Draft GitlabDraft
+
+execute 'syntax match Username "@\w\+"'
+highlight link Username GitlabUsername
 
 let b:current_syntax = "gitlab"
diff --git a/doc/gitlab.nvim.txt b/doc/gitlab.nvim.txt
index 1a5cde20..9bb69c9b 100644
--- a/doc/gitlab.nvim.txt
+++ b/doc/gitlab.nvim.txt
@@ -187,6 +187,11 @@ you call this function with no values the defaults will be used:
         temp_registers = {}, -- List of registers for backing up popup content (see `:h gitlab.nvim.temp-registers`)
       },
       discussion_tree = { -- The discussion tree that holds all comments
+        expanders = { -- Discussion tree icons
+          expanded = " ", -- Icon for expanded discussion thread
+          collapsed = " ",  -- Icon for collapsed discussion thread
+          indentation = "  ", -- Indentation Icon
+        },
         auto_open = true, -- Automatically open when the reviewer is opened
         switch_view = "S", -- Toggles between the notes and discussions views
         default_view = "discussions" -- Show "discussions" or "notes" by default
@@ -285,7 +290,7 @@ you call this function with no values the defaults will be used:
           username = "Keyword",
           mention = "WarningMsg",
           date = "Comment",
-          chevron = "DiffviewNonText",
+          expander = "DiffviewNonText",
           directory = "Directory",
           directory_icon = "DiffviewFolderSign",
           file_name = "Normal",
diff --git a/lua/gitlab/actions/discussions/tree.lua b/lua/gitlab/actions/discussions/tree.lua
index a8954e9a..0b704ce9 100644
--- a/lua/gitlab/actions/discussions/tree.lua
+++ b/lua/gitlab/actions/discussions/tree.lua
@@ -325,16 +325,17 @@ M.nui_tree_prepare_node = function(node)
 
   for i, text in ipairs(texts) do
     local line = NuiLine()
+    local expanders = state.settings.discussion_tree.expanders
 
-    line:append(string.rep("  ", node._depth - 1))
+    line:append(string.rep(expanders.indentation, node._depth - 1))
 
     if i == 1 and node:has_children() then
-      line:append(node:is_expanded() and " " or " ")
+      line:append(node:is_expanded() and expanders.expanded or expanders.collapsed)
       if node.icon then
         line:append(node.icon .. " ", node.icon_hl)
       end
     else
-      line:append("  ")
+      line:append(expanders.indentation)
     end
 
     line:append(text, node.text_hl)
diff --git a/lua/gitlab/colors.lua b/lua/gitlab/colors.lua
index 4b479bfb..36b0b00a 100644
--- a/lua/gitlab/colors.lua
+++ b/lua/gitlab/colors.lua
@@ -2,12 +2,20 @@ local state = require("gitlab.state")
 local u = require("gitlab.utils")
 
 local colors = state.settings.colors
-local discussion = colors.discussion_tree
 
+-- Set icons into global vim variables for syntax matching
+local expanders = state.settings.discussion_tree.expanders
+vim.g.gitlab_discussion_tree_expander_open = expanders.expanded
+vim.g.gitlab_discussion_tree_expander_closed = expanders.collapsed
+vim.g.gitlab_discussion_tree_draft = ""
+vim.g.gitlab_discussion_tree_resolved = "✓"
+vim.g.gitlab_discussion_tree_unresolved = "-"
+
+local discussion = colors.discussion_tree
 vim.api.nvim_set_hl(0, "GitlabUsername", u.get_colors_for_group(discussion.username))
 vim.api.nvim_set_hl(0, "GitlabMention", u.get_colors_for_group(discussion.mention))
 vim.api.nvim_set_hl(0, "GitlabDate", u.get_colors_for_group(discussion.date))
-vim.api.nvim_set_hl(0, "GitlabChevron", u.get_colors_for_group(discussion.chevron))
+vim.api.nvim_set_hl(0, "GitlabExpander", u.get_colors_for_group(discussion.expander))
 vim.api.nvim_set_hl(0, "GitlabDirectory", u.get_colors_for_group(discussion.directory))
 vim.api.nvim_set_hl(0, "GitlabDirectoryIcon", u.get_colors_for_group(discussion.directory_icon))
 vim.api.nvim_set_hl(0, "GitlabFileName", u.get_colors_for_group(discussion.file_name))
diff --git a/lua/gitlab/state.lua b/lua/gitlab/state.lua
index 964aaa04..35dfeb5f 100644
--- a/lua/gitlab/state.lua
+++ b/lua/gitlab/state.lua
@@ -82,6 +82,11 @@ M.settings = {
     temp_registers = {},
   },
   discussion_tree = {
+    expanders = {
+      expanded = " ",
+      collapsed = " ",
+      indentation = "  ",
+    },
     auto_open = true,
     switch_view = "S",
     default_view = "discussions",
@@ -181,7 +186,7 @@ M.settings = {
       username = "Keyword",
       mention = "WarningMsg",
       date = "Comment",
-      chevron = "DiffviewNonText",
+      expander = "DiffviewNonText",
       directory = "Directory",
       directory_icon = "DiffviewFolderSign",
       file_name = "Normal",