diff --git a/changelog.d/8171.bugfix b/changelog.d/8171.bugfix
new file mode 100644
index 00000000000..799fecabaf7
--- /dev/null
+++ b/changelog.d/8171.bugfix
@@ -0,0 +1 @@
+[Rich text editor] Fix code appearance
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_code_block.xml b/vector/src/main/res/drawable/bg_code_block.xml
new file mode 100644
index 00000000000..c492ce02c28
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_code_block.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 The Android Open Source Project
+  ~ Modifications Copyright 2022 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?vctr_system"/>
+    <stroke android:width="@dimen/code_block_border_width" android:color="?vctr_content_quinary"/>
+    <corners android:radius="@dimen/code_block_border_radius"/>
+</shape>
diff --git a/vector/src/main/res/drawable/bg_inline_code_multi_line_left.xml b/vector/src/main/res/drawable/bg_inline_code_multi_line_left.xml
new file mode 100644
index 00000000000..fa5b0525625
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_inline_code_multi_line_left.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 The Android Open Source Project
+  ~ Modifications Copyright 2022 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?vctr_system"/>
+    <stroke android:width="@dimen/inline_code_border_width" android:color="?vctr_content_quinary"/>
+    <corners android:topLeftRadius="@dimen/inline_code_border_radius"
+        android:bottomLeftRadius="@dimen/inline_code_border_radius"/>
+</shape>
diff --git a/vector/src/main/res/drawable/bg_inline_code_multi_line_mid.xml b/vector/src/main/res/drawable/bg_inline_code_multi_line_mid.xml
new file mode 100644
index 00000000000..0f55cbbbbb5
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_inline_code_multi_line_mid.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 The Android Open Source Project
+  ~ Modifications Copyright 2022 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?vctr_system"/>
+    <stroke android:width="@dimen/inline_code_border_width" android:color="?vctr_content_quinary"/>
+</shape>
diff --git a/vector/src/main/res/drawable/bg_inline_code_multi_line_right.xml b/vector/src/main/res/drawable/bg_inline_code_multi_line_right.xml
new file mode 100644
index 00000000000..0f0d004869a
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_inline_code_multi_line_right.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 The Android Open Source Project
+  ~ Modifications Copyright 2022 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?vctr_system"/>
+    <stroke android:width="@dimen/inline_code_border_width" android:color="?vctr_content_quinary"/>
+    <corners android:topRightRadius="@dimen/inline_code_border_radius"
+        android:bottomRightRadius="@dimen/inline_code_border_radius"/>
+</shape>
diff --git a/vector/src/main/res/drawable/bg_inline_code_single_line.xml b/vector/src/main/res/drawable/bg_inline_code_single_line.xml
new file mode 100644
index 00000000000..e70625152af
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_inline_code_single_line.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 The Android Open Source Project
+  ~ Modifications Copyright 2022 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?vctr_system"/>
+    <stroke android:width="@dimen/inline_code_border_width" android:color="?vctr_content_quinary"/>
+    <corners android:radius="@dimen/inline_code_border_radius"/>
+</shape>
diff --git a/vector/src/main/res/layout/composer_rich_text_layout.xml b/vector/src/main/res/layout/composer_rich_text_layout.xml
index 8992b632c0e..f5ad5c51db4 100644
--- a/vector/src/main/res/layout/composer_rich_text_layout.xml
+++ b/vector/src/main/res/layout/composer_rich_text_layout.xml
@@ -126,6 +126,11 @@
             app:layout_constraintTop_toBottomOf="@id/composerModeBarrier"
             app:bulletRadius="4sp"
             app:bulletGap="8sp"
+            app:codeBlockBackgroundDrawable="@drawable/bg_code_block"
+            app:inlineCodeSingleLineBg="@drawable/bg_inline_code_single_line"
+            app:inlineCodeMultiLineBgLeft="@drawable/bg_inline_code_multi_line_left"
+            app:inlineCodeMultiLineBgMid="@drawable/bg_inline_code_multi_line_mid"
+            app:inlineCodeMultiLineBgRight="@drawable/bg_inline_code_multi_line_right"
             tools:text="@tools:sample/lorem/random" />
 
         <com.google.android.material.textfield.TextInputEditText
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml
index bedff8bd4aa..9878f1e7b4e 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml
@@ -8,4 +8,10 @@
     android:layout_height="wrap_content"
     android:textAlignment="viewStart"
     android:textColor="?vctr_content_primary"
+    app:codeBlockBackgroundDrawable="@drawable/bg_code_block"
+    app:inlineCodeSingleLineBg="@drawable/bg_inline_code_single_line"
+    app:inlineCodeMultiLineBgLeft="@drawable/bg_inline_code_multi_line_left"
+    app:inlineCodeMultiLineBgMid="@drawable/bg_inline_code_multi_line_mid"
+    app:inlineCodeMultiLineBgRight="@drawable/bg_inline_code_multi_line_right"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:text="@sample/messages.json/data/message" />