diff --git a/tests/ui/test_ui_tools.py b/tests/ui/test_ui_tools.py
index fef74708dd..7da769215e 100644
--- a/tests/ui/test_ui_tools.py
+++ b/tests/ui/test_ui_tools.py
@@ -1324,7 +1324,7 @@ def test_private_message_to_self(self, mocker):
                 [("msg_mention", "@A Group")],
                 id="group-mention",
             ),
-            case("<code>some code", [("msg_code", "some code")], id="code"),
+            case("<code>some code", [("pygments:w", "some code")], id="inline-code"),
             case(
                 '<div class="codehilite" data-code-language="python">'
                 "<pre><span></span>"
diff --git a/zulipterminal/config/themes.py b/zulipterminal/config/themes.py
index 3cdb0c4ac7..a8f5052065 100644
--- a/zulipterminal/config/themes.py
+++ b/zulipterminal/config/themes.py
@@ -44,7 +44,6 @@
     'msg_link'        : '',
     'msg_link_index'  : 'bold',
     'msg_quote'       : 'underline',
-    'msg_code'        : 'bold',
     'msg_bold'        : 'bold',
     'msg_time'        : 'bold',
     'footer'          : 'standout',
diff --git a/zulipterminal/themes/gruvbox.py b/zulipterminal/themes/gruvbox.py
index 13e33ee002..442947c257 100644
--- a/zulipterminal/themes/gruvbox.py
+++ b/zulipterminal/themes/gruvbox.py
@@ -67,7 +67,6 @@ class GruvBoxColor(Enum):
     'msg_link'         : (Color.BRIGHT_BLUE,           Color.DARK0_HARD),
     'msg_link_index'   : (Color.BRIGHT_BLUE__BOLD,     Color.DARK0_HARD),
     'msg_quote'        : (Color.FADED_YELLOW,          Color.DARK0_HARD),
-    'msg_code'         : (Color.DARK0_HARD,            Color.LIGHT2),
     'msg_bold'         : (Color.LIGHT2__BOLD,          Color.DARK0_HARD),
     'msg_time'         : (Color.DARK0_HARD,            Color.LIGHT2),
     'footer'           : (Color.DARK0_HARD,            Color.LIGHT4),
diff --git a/zulipterminal/themes/zt_blue.py b/zulipterminal/themes/zt_blue.py
index d2f1f87408..eefd0b2eb1 100644
--- a/zulipterminal/themes/zt_blue.py
+++ b/zulipterminal/themes/zt_blue.py
@@ -37,7 +37,6 @@
     'msg_link'        : (Color.DARK_BLUE,           Color.LIGHT_GRAY),
     'msg_link_index'  : (Color.DARK_BLUE__BOLD,     Color.LIGHT_GRAY),
     'msg_quote'       : (Color.BROWN,               Color.DARK_BLUE),
-    'msg_code'        : (Color.DARK_BLUE,           Color.WHITE),
     'msg_bold'        : (Color.WHITE__BOLD,         Color.DARK_BLUE),
     'msg_time'        : (Color.DARK_BLUE,           Color.WHITE),
     'footer'          : (Color.WHITE,               Color.DARK_GRAY),
diff --git a/zulipterminal/themes/zt_dark.py b/zulipterminal/themes/zt_dark.py
index 726061856c..21bec78173 100644
--- a/zulipterminal/themes/zt_dark.py
+++ b/zulipterminal/themes/zt_dark.py
@@ -37,7 +37,6 @@
     'msg_link'        : (Color.LIGHT_BLUE,          Color.BLACK),
     'msg_link_index'  : (Color.LIGHT_BLUE__BOLD,    Color.BLACK),
     'msg_quote'       : (Color.BROWN,               Color.BLACK),
-    'msg_code'        : (Color.BLACK,               Color.WHITE),
     'msg_bold'        : (Color.WHITE__BOLD,         Color.BLACK),
     'msg_time'        : (Color.BLACK,               Color.WHITE),
     'footer'          : (Color.BLACK,               Color.LIGHT_GRAY),
diff --git a/zulipterminal/themes/zt_light.py b/zulipterminal/themes/zt_light.py
index d344104a1f..3447db84e9 100644
--- a/zulipterminal/themes/zt_light.py
+++ b/zulipterminal/themes/zt_light.py
@@ -37,7 +37,6 @@
     'msg_link'        : (Color.DARK_BLUE,           Color.WHITE),
     'msg_link_index'  : (Color.DARK_BLUE__BOLD,     Color.WHITE),
     'msg_quote'       : (Color.BLACK,               Color.BROWN),
-    'msg_code'        : (Color.BLACK,               Color.LIGHT_GRAY),
     'msg_bold'        : (Color.WHITE__BOLD,         Color.DARK_GRAY),
     'msg_time'        : (Color.WHITE,               Color.DARK_GRAY),
     'footer'          : (Color.WHITE,               Color.DARK_GRAY),
diff --git a/zulipterminal/ui_tools/boxes.py b/zulipterminal/ui_tools/boxes.py
index 6e3e05380d..f8318a7860 100644
--- a/zulipterminal/ui_tools/boxes.py
+++ b/zulipterminal/ui_tools/boxes.py
@@ -1212,8 +1212,13 @@ def soup2markup(
                 # BLOCKQUOTE TEXT
                 markup.append(("msg_quote", cls.soup2markup(element, metadata)[0]))
             elif tag == "code":
-                # CODE (INLINE?)
-                markup.append(("msg_code", tag_text))
+                """
+                CODE INLINE
+                -----------
+                Uses the same style as plain text codeblocks
+                which is the `whitespace` token of pygments.
+                """
+                markup.append(("pygments:w", tag_text))
             elif tag == "div" and "codehilite" in tag_classes:
                 """
                 CODE BLOCK