diff --git a/core/scratch_bubble.js b/core/scratch_bubble.js
index 0500750c..94ade7c0 100644
--- a/core/scratch_bubble.js
+++ b/core/scratch_bubble.js
@@ -138,19 +138,19 @@ Blockly.ScratchBubble.TOP_BAR_HEIGHT = 32;
* The size of the minimize arrow icon in the comment top bar.
* @private
*/
-Blockly.ScratchBubble.MINIMIZE_ICON_SIZE = 16;
+Blockly.ScratchBubble.MINIMIZE_ICON_SIZE = 32;
/**
* The size of the delete icon in the comment top bar.
* @private
*/
-Blockly.ScratchBubble.DELETE_ICON_SIZE = 12;
+Blockly.ScratchBubble.DELETE_ICON_SIZE = 32;
/**
* The inset for the top bar icons.
* @private
*/
-Blockly.ScratchBubble.TOP_BAR_ICON_INSET = 6;
+Blockly.ScratchBubble.TOP_BAR_ICON_INSET = 0;
/**
* Create the bubble's DOM.
diff --git a/core/workspace_comment_render_svg.js b/core/workspace_comment_render_svg.js
index 05945558..789d95a3 100644
--- a/core/workspace_comment_render_svg.js
+++ b/core/workspace_comment_render_svg.js
@@ -62,19 +62,19 @@ Blockly.WorkspaceCommentSvg.TOP_BAR_HEIGHT = 32;
* The size of the minimize arrow icon in the comment top bar.
* @private
*/
-Blockly.WorkspaceCommentSvg.MINIMIZE_ICON_SIZE = 16;
+Blockly.WorkspaceCommentSvg.MINIMIZE_ICON_SIZE = 32;
/**
* The size of the delete icon in the comment top bar.
* @private
*/
-Blockly.WorkspaceCommentSvg.DELETE_ICON_SIZE = 12;
+Blockly.WorkspaceCommentSvg.DELETE_ICON_SIZE = 32;
/**
* The inset for the top bar icons.
* @private
*/
-Blockly.WorkspaceCommentSvg.TOP_BAR_ICON_INSET = 6;
+Blockly.WorkspaceCommentSvg.TOP_BAR_ICON_INSET = 0;
/**
* Width that a minimized comment should have.
diff --git a/media/comment-arrow-down.svg b/media/comment-arrow-down.svg
index 8954f552..31dfa1db 100644
--- a/media/comment-arrow-down.svg
+++ b/media/comment-arrow-down.svg
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="32px" height="32px" viewBox="-4.5 -6 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
<title>dropdown-caret-up</title>
<desc>Created with Sketch.</desc>
@@ -7,4 +7,4 @@
<g id="dropdown-caret-up" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6,9 C5.72520708,9 5.45163006,8.89695045 5.24127973,8.68965311 L2.31461357,5.80666227 C1.89512881,5.39326583 1.89512881,4.72464202 2.31461357,4.31004733 C2.73288244,3.89665089 9.26711756,3.89665089 9.68538643,4.31004733 C10.1048712,4.72344377 10.1048712,5.39326583 9.68538643,5.80666227 L6.75993617,8.68965311 C6.54958583,8.89695045 6.27600882,9 6,9" id="dropdown-caret" fill="#575E75"></path>
</g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/media/comment-arrow-up.svg b/media/comment-arrow-up.svg
index ef5ed53a..a951282c 100644
--- a/media/comment-arrow-up.svg
+++ b/media/comment-arrow-up.svg
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="32px" height="32px" viewBox="-4.5 -6 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
<title>dropdown-caret-down</title>
<desc>Created with Sketch.</desc>
@@ -7,4 +7,4 @@
<g id="dropdown-caret-down" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6,9 C5.72520708,9 5.45163006,8.89695045 5.24127973,8.68965311 L2.31461357,5.80666227 C1.89512881,5.39326583 1.89512881,4.72464202 2.31461357,4.31004733 C2.73288244,3.89665089 9.26711756,3.89665089 9.68538643,4.31004733 C10.1048712,4.72344377 10.1048712,5.39326583 9.68538643,5.80666227 L6.75993617,8.68965311 C6.54958583,8.89695045 6.27600882,9 6,9" id="dropdown-caret" fill="#575E75" transform="translate(6.000000, 6.500000) scale(1, -1) translate(-6.000000, -6.500000) "></path>
</g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/media/delete-x.svg b/media/delete-x.svg
index 0deb8ac2..ed1f71ed 100644
--- a/media/delete-x.svg
+++ b/media/delete-x.svg
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="32px" height="32px" viewBox="-14 -10 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
<title>delete-x</title>
<desc>Created with Sketch.</desc>
@@ -7,4 +7,4 @@
<g id="delete-x" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M10.8761123,10.87825 C10.2421123,11.52125 9.20511231,11.52125 8.56211231,10.87825 L5.92911231,8.24525 L3.29511231,10.87825 C2.65611231,11.51725 1.62011231,11.51725 0.981112306,10.87825 C0.662112306,10.55925 0.500112306,10.13725 0.500112306,9.72125 C0.500112306,9.30425 0.662112306,8.88325 0.981112306,8.56425 L3.61411231,5.93125 L0.977112306,3.29325 C0.657112306,2.97325 0.495112306,2.55225 0.500112306,2.13125 C0.500112306,1.71425 0.657112306,1.29825 0.977112306,0.97925 C1.61511231,0.34025 2.65111231,0.34025 3.29111231,0.97925 L5.92911231,3.61625 L8.56611231,0.97925 C9.20511231,0.34025 10.2421123,0.34025 10.8811123,0.97925 C11.5201123,1.61725 11.5201123,2.65425 10.8811123,3.29325 L8.24211231,5.93125 L10.8811123,8.56825 C11.5201123,9.20725 11.5201123,10.23425 10.8761123,10.87825" id="Fill-1" fill="#575E75"></path>
</g>
-</svg>
\ No newline at end of file
+</svg>