diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 423682496..7c26fd710 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -54,7 +54,7 @@
   (#set! "priority" 90))
 
 (fenced_code_block
-  (fenced_code_block_delimiter) @conceal
+  (fenced_code_block_delimiter) @markup.raw.delimiter
   (#set! conceal ""))
 
 (fenced_code_block
diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index 6c114b402..e9b41c31d 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -16,10 +16,10 @@
 ] @string.escape
 
 ; Conceal codeblock and text style markers
-((code_span_delimiter) @markup.raw
+((code_span_delimiter) @markup.raw.delimiter
   (#set! conceal ""))
 
-((emphasis_delimiter) @markup.strong
+((emphasis_delimiter) @conceal
   (#set! conceal ""))
 
 ; Conceal inline links
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index 255bdfa66..ed8e84a90 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -24,7 +24,7 @@
   text: (_) @markup.link)
 
 (codespan
-  "`" @markup.raw
+  "`" @markup.raw.delimiter
   (#set! conceal "")
   text: (_) @markup.raw)
 
@@ -35,11 +35,11 @@
   [
     ">"
     (language)
-  ] @markup.raw.block
+  ] @markup.raw.delimiter
   (#set! conceal ""))
 
 (block
-  "<" @markup.raw.block
+  "<" @markup.raw.delimiter
   (#set! conceal ""))
 
 (argument) @variable.parameter