diff --git a/web/styles/zulip.css b/web/styles/zulip.css
index 4601e8c338..ccbbc89db5 100644
--- a/web/styles/zulip.css
+++ b/web/styles/zulip.css
@@ -597,10 +597,18 @@ li,
 }
 
 .copy_message {
+    float: right;
     position: relative;
-    top: 27px;
-    left: -10px;
-    margin-top: -24px;
+    cursor: pointer;
+    top: 30px;
+    /* To make sure the svg doesn't occupy any vertical space. */
+    margin-top: -30px;
+    right: 2px;
+    padding-top: 2px;
+
+    #clipboard_image {
+        margin: 0;
+    }
 }
 
 #copy_generated_invite_link {
diff --git a/web/templates/copy_message_button.hbs b/web/templates/copy_message_button.hbs
index f04aa44b89..66682e9bae 100644
--- a/web/templates/copy_message_button.hbs
+++ b/web/templates/copy_message_button.hbs
@@ -1,3 +1,3 @@
-<button class="btn pull-right copy_button_base copy_message tippy-zulip-tooltip" data-tippy-content="{{t 'Copy and close' }}" aria-label="{{t 'Copy and close' }}" >
+<div class="copy_button_base copy_message tippy-zulip-tooltip" data-tippy-content="{{t 'Copy and close' }}" aria-label="{{t 'Copy and close' }}" role="button">
     {{> copy_to_clipboard_svg }}
-</button>
+</div>