diff --git a/netbox/project-static/netbox.scss b/netbox/project-static/netbox.scss
index 22f6349c2..75c3ab7f3 100644
--- a/netbox/project-static/netbox.scss
+++ b/netbox/project-static/netbox.scss
@@ -245,7 +245,7 @@ span.color-label {
 }
 
 textarea#id_local_context_data,
-textarea#id_comments {
+textarea.markdown {
   font-family: $font-family-monospace;
 }
 
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
index 943abf733..fc89956b2 100644
--- a/netbox/utilities/forms/fields.py
+++ b/netbox/utilities/forms/fields.py
@@ -216,10 +216,10 @@ class CommentField(forms.CharField):
     """
     A textarea with support for Markdown rendering. Exists mostly just to add a standard help_text.
     """
-    widget = forms.Textarea
+    widget = forms.Textarea(attrs={"class": "markdown"})
     default_label = ''
     # TODO: Port Markdown cheat sheet to internal documentation
-    default_helptext = '<i class="bi bi-info-circle"></i> '\
+    default_helptext = '<i class="bi bi-markdown"></i> '\
                        '<a href="https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet" target="_blank">'\
                        'Markdown</a> syntax is supported'