diff --git a/static/images/clippy.svg b/static/images/clippy.svg
deleted file mode 100644
index f1aac40321..0000000000
--- a/static/images/clippy.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg height="1024" width="896" xmlns="http://www.w3.org/2000/svg">
-  <path fill="#777" d="M128 768h256v64H128v-64z m320-384H128v64h320v-64z m128 192V448L384 640l192 192V704h320V576H576z m-288-64H128v64h160v-64zM128 704h160v-64H128v64z m576 64h64v128c-1 18-7 33-19 45s-27 18-45 19H64c-35 0-64-29-64-64V192c0-35 29-64 64-64h192C256 57 313 0 384 0s128 57 128 128h192c35 0 64 29 64 64v320h-64V320H64v576h640V768zM128 256h512c0-35-29-64-64-64h-64c-35 0-64-29-64-64s-29-64-64-64-64 29-64 64-29 64-64 64h-64c-35 0-64 29-64 64z" />
-</svg>
diff --git a/static/images/clippy_hover.svg b/static/images/clippy_hover.svg
deleted file mode 100644
index e1b1703590..0000000000
--- a/static/images/clippy_hover.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg height="1024" width="896" xmlns="http://www.w3.org/2000/svg">
-  <path d="M128 768h256v64H128v-64z m320-384H128v64h320v-64z m128 192V448L384 640l192 192V704h320V576H576z m-288-64H128v64h160v-64zM128 704h160v-64H128v64z m576 64h64v128c-1 18-7 33-19 45s-27 18-45 19H64c-35 0-64-29-64-64V192c0-35 29-64 64-64h192C256 57 313 0 384 0s128 57 128 128h192c35 0 64 29 64 64v320h-64V320H64v576h640V768zM128 256h512c0-35-29-64-64-64h-64c-35 0-64-29-64-64s-29-64-64-64-64 29-64 64-29 64-64 64h-64c-35 0-64 29-64 64z" />
-</svg>
diff --git a/static/js/ui_init.js b/static/js/ui_init.js
index b7cccf80d2..5d7a2afd69 100644
--- a/static/js/ui_init.js
+++ b/static/js/ui_init.js
@@ -223,13 +223,11 @@ $(function () {
     });
 
     $("body").on("mouseenter", ".copy_message", function () {
-        $(this).find('img#clipboard_image').attr("src", "/static/images/clippy_hover.svg");
         $(this).show();
         $(this).tooltip('show');
     });
 
     $("body").on("mouseleave", ".copy_message", function () {
-        $(this).find('img#clipboard_image').attr("src", "/static/images/clippy.svg");
         $(this).tooltip('hide');
     });
 
diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index 34a403c732..e62f2a138d 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -295,11 +295,12 @@ li,
 }
 
 #clipboard_image {
-    height: inherit;
-    width: inherit;
-    max-width: inherit;
-    margin-top: inherit;
-    margin-left: -7px;
+    margin-top: -5px;
+    margin-left: -8px;
+}
+
+.copy_message:hover svg path {
+    fill: black;
 }
 
 .btn-large {
diff --git a/static/templates/message_edit_form.handlebars b/static/templates/message_edit_form.handlebars
index 3d7fbe67f5..6b1a7aa03f 100644
--- a/static/templates/message_edit_form.handlebars
+++ b/static/templates/message_edit_form.handlebars
@@ -17,7 +17,9 @@
     <div class="control-group no-margin">
         <div class="controls edit-controls">
             <button class="btn pull-right copy_message" data-toggle="tooltip" title="{{t "Copy and close" }}" data-clipboard-target="#message_edit_content">
-                <img src="/static/images/clippy.svg" id="clipboard_image" />
+                <svg height="20" width="18" viewBox="0 0 1000 1000" xmlns="http://www.w3.org/2000/svg" id="clipboard_image">
+                  <path fill="#777" d="M128 768h256v64H128v-64z m320-384H128v64h320v-64z m128 192V448L384 640l192 192V704h320V576H576z m-288-64H128v64h160v-64zM128 704h160v-64H128v64z m576 64h64v128c-1 18-7 33-19 45s-27 18-45 19H64c-35 0-64-29-64-64V192c0-35 29-64 64-64h192C256 57 313 0 384 0s128 57 128 128h192c35 0 64 29 64 64v320h-64V320H64v576h640V768zM128 256h512c0-35-29-64-64-64h-64c-35 0-64-29-64-64s-29-64-64-64-64 29-64 64-29 64-64 64h-64c-35 0-64 29-64 64z" />
+                </svg>
             </button>
             <label class="edit-control-label" for="message_edit_topic">{{t "Content" }}</label>
             <textarea class="message_edit_content" id="message_edit_content">{{content}}</textarea>