diff --git a/public/scss/global.scss b/public/scss/global.scss
index 7fb8234708..394eec646e 100644
--- a/public/scss/global.scss
+++ b/public/scss/global.scss
@@ -6,3 +6,17 @@
 	==========
 */
 
+// rtl fixes for text-break and code blocks
+/*rtl:begin:ignore*/
+html[data-dir="rtl"] {
+	.text-break {
+		word-wrap: break-word!important;
+		word-break: break-word!important;
+	}
+
+	[component="post/content"] code {
+		direction: ltr;
+		text-align: left;
+	}
+}
+/*rtl:end:ignore*/
diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index da5ecae1b0..3206bb4466 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -241,7 +241,7 @@ define('forum/topic', [
 			let codeBlocks = $('[component="topic"] [component="post/content"] code:not([data-button-added])');
 			codeBlocks = codeBlocks.filter((i, el) => $(el).text().includes('\n'));
 			const container = $('<div class="hover-parent position-relative"></div>');
-			const buttonDiv = $('<button component="copy/code/btn" class="hover-visible position-absolute end-0 top-0 btn btn-sm btn-outline-secondary mt-2 me-4"><i class="fa fa-fw fa-copy"></i></button>');
+			const buttonDiv = $('<button component="copy/code/btn" class="hover-visible position-absolute top-0 btn btn-sm btn-outline-secondary" style="right: 0px; margin: 1rem 1rem 0 0;"><i class="fa fa-fw fa-copy"></i></button>');
 			codeBlocks.parent().wrap(container).parent().append(buttonDiv);
 			codeBlocks.parent().parent().find('[component="copy/code/btn"]').translateAttr('title', '[[topic:copy-code]]');
 			codeBlocks.attr('data-button-added', 1);