diff --git a/core/client/app/assets/lib/uploader.js b/core/client/app/assets/lib/uploader.js
index 141281531a..21c90f3cbe 100644
--- a/core/client/app/assets/lib/uploader.js
+++ b/core/client/app/assets/lib/uploader.js
@@ -130,8 +130,8 @@ UploadUi = function ($dropzone, settings) {
             if (!$dropzone.find('button.js-fail')[0]) {
                 $dropzone.append('<button class="js-fail btn btn-green" style="display: none">Try Again</button>');
             }
-            if (!$dropzone.find('a.icon-link')[0]) {
-                $dropzone.append('<a class="icon-link" title="Add image from URL"><span class="hidden">URL</span></a>');
+            if (!$dropzone.find('a.image-url')[0]) {
+                $dropzone.append('<a class="image-url" title="Add image from URL"><i class="icon-link"><span class="hidden">URL</span></i></a>');
             }
             // if (!$dropzone.find('a.image-webcam')[0]) {
             //     $dropzone.append('<a class="image-webcam" title="Add image from webcam"><span class="hidden">Webcam</span></a>');
diff --git a/core/client/app/styles/components/settings-menu.css b/core/client/app/styles/components/settings-menu.css
index db800a05ee..d260481fa5 100644
--- a/core/client/app/styles/components/settings-menu.css
+++ b/core/client/app/styles/components/settings-menu.css
@@ -59,6 +59,8 @@ body.settings-menu-expanded .settings-menu-container {
 
 .settings-menu-header {
     position: relative;
+    display: flex;
+    justify-content: space-between;
     padding: 19px 24px;
 }
 
@@ -70,11 +72,8 @@ body.settings-menu-expanded .settings-menu-container {
 }
 
 .settings-menu-header .close {
-    right: 0;
-}
-
-.settings-menu-header .close:before {
     right: 22px;
+    font-size: 12px;
 }
 
 .settings-menu-header.subview h4 {
@@ -89,25 +88,7 @@ body.settings-menu-expanded .settings-menu-container {
     left: 19px;
 }
 
-.settings-menu-header-action {
-    position: absolute;
-    top: 0;
-    bottom: 7px;
-    padding: 0;
-    width: 45px;
-}
 
-.settings-menu-header-action:before {
-    position: absolute;
-    top: 50%;
-    color: var(--midbrown);
-    font-size: 2rem;
-    transform: translateY(-50%);
-}
-
-.settings-menu-header-action:hover:before {
-    color: var(--midgrey);
-}
 
 
 /* Content
@@ -119,8 +100,6 @@ body.settings-menu-expanded .settings-menu-container {
 
 .settings-menu-content .image-uploader {
     margin: 0 0 1.6rem 0;
-    padding-top: 35px;
-    padding-bottom: 35px;
 }
 
 .settings-menu-content .image-uploader.image-uploader-url {
diff --git a/core/client/app/styles/components/splitbuttons.css b/core/client/app/styles/components/splitbuttons.css
index 437fd6a073..272adea42f 100644
--- a/core/client/app/styles/components/splitbuttons.css
+++ b/core/client/app/styles/components/splitbuttons.css
@@ -14,7 +14,7 @@
     float: left;
     /* Prevent double border between buttons */
     /* Make sure the hovered element is always on
-                // top so overlap from .btn + btn. invisible */
+    // top so overlap from .btn + btn. invisible */
 }
 
 .splitbtn .btn + .btn {
diff --git a/core/client/app/styles/components/uploader.css b/core/client/app/styles/components/uploader.css
index c01faa587a..c7a2d497d0 100644
--- a/core/client/app/styles/components/uploader.css
+++ b/core/client/app/styles/components/uploader.css
@@ -8,9 +8,10 @@
     padding: 55px 60px;
     width: 100%;
     height: auto;
-    border: #e1e1e1 3px dashed;
-    background: #f9f8f5;
-    color: var(--brown);
+    border: #e1e1e1 2px dashed;
+    background: #f6f6f6;
+    border-radius: 4px;
+    color: #828282;
     text-align: center;
 }
 
@@ -23,11 +24,8 @@
     color: var(--darkgrey);
 }
 
-.image-uploader .description {
-    margin-top: 10px;
-}
-
-.image-uploader .image-upload {
+.image-uploader .image-upload,
+.image-uploader .image-url {
     position: absolute;
     bottom: 0;
     left: 0;
@@ -38,7 +36,8 @@
     line-height: 12px;
 }
 
-.image-uploader .image-upload:hover {
+.image-uploader .image-upload:hover,
+.image-uploader .image-url:hover {
     cursor: pointer;
 }
 
@@ -161,13 +160,15 @@
     top: 10px;
     right: 10px;
     z-index: 300;
+    display: block;
     padding: 8px;
     background: rgba(0, 0, 0, 0.6);
     border-radius: var(--border-radius);
     box-shadow: rgba(255, 255, 255, 0.2) 0 0 0 1px;
     color: #fff;
     text-decoration: none;
-    line-height: 0;
+    font-size: 13px;
+    line-height: 10px;
 }
 
 .pre-image-uploader .image-cancel:hover {
diff --git a/core/client/app/templates/components/gh-modal-dialog.hbs b/core/client/app/templates/components/gh-modal-dialog.hbs
index 30526e4e81..2255cf3bac 100644
--- a/core/client/app/templates/components/gh-modal-dialog.hbs
+++ b/core/client/app/templates/components/gh-modal-dialog.hbs
@@ -8,7 +8,7 @@
             </section>
             {{#if confirm}}
             <footer class="modal-footer">
-                <button type="button" class="{{rejectButtonClass}} js-button-reject" {{action "confirm" "reject"}}>
+                <button type="button" class="{{rejectButtonClass}} btn-minor js-button-reject" {{action "confirm" "reject"}}>
                     {{confirm.reject.text}}
                 </button><!--
                 Required to strip the white-space between buttons
diff --git a/core/client/app/templates/components/gh-uploader.hbs b/core/client/app/templates/components/gh-uploader.hbs
index b4ff58a91e..7a16855a7b 100644
--- a/core/client/app/templates/components/gh-uploader.hbs
+++ b/core/client/app/templates/components/gh-uploader.hbs
@@ -1,6 +1,3 @@
-<span class="icon-photos">
-    <span class="hidden">Image Upload</span>
-</span>
 <img class="js-upload-target" src="{{imageSource}}" />
 <div class="description">{{description}}<strong></strong></div>
 <input data-url="upload" class="gh-input js-fileupload main fileupload" type="file" name="uploadimage">
diff --git a/core/client/app/templates/post-settings-menu.hbs b/core/client/app/templates/post-settings-menu.hbs
index 9c6fa86d0a..dad612202d 100644
--- a/core/client/app/templates/post-settings-menu.hbs
+++ b/core/client/app/templates/post-settings-menu.hbs
@@ -83,8 +83,9 @@
     {{#gh-tab-pane}}
         {{#if isViewingSubview}}
         <div class="settings-menu-header subview">
-            <button {{action "closeSubview"}} class="back icon-chevron-left settings-menu-header-action"><span class="hidden">Back</span></button>
+            <button {{action "closeSubview"}} class="back icon-arrow-left settings-menu-header-action"><span class="hidden">Back</span></button>
             <h4>Meta Data</h4>
+            <div style="width:23px;">{{!flexbox space-between}}</div>
         </div>
 
         <div class="settings-menu-content">
diff --git a/core/client/app/templates/settings/tags/settings-menu.hbs b/core/client/app/templates/settings/tags/settings-menu.hbs
index 0b40c7c222..70c6506dbc 100644
--- a/core/client/app/templates/settings/tags/settings-menu.hbs
+++ b/core/client/app/templates/settings/tags/settings-menu.hbs
@@ -47,6 +47,7 @@
             <div class="settings-menu-header subview">
                 <button {{action "closeSubview"}} class="back icon-chevron-left settings-menu-header-action"><span class="hidden">Back</span></button>
                 <h4>Meta Data</h4>
+                <div style="width:23px;">{{!flexbox space-between}}</div>
             </div>
 
             <div class="settings-menu-content">
diff --git a/core/client/app/templates/settings/users/user.hbs b/core/client/app/templates/settings/users/user.hbs
index c2bd80d422..cc3537eb7c 100644
--- a/core/client/app/templates/settings/users/user.hbs
+++ b/core/client/app/templates/settings/users/user.hbs
@@ -1,5 +1,5 @@
 <header class="view-header">
-    <h2 class="view-title">{{#link-to "settings.users"}}Team{{/link-to}} <i class="icon-chevron"></i> {{user.name}}</h2>
+    <h2 class="view-title">{{#link-to "settings.users"}}Team{{/link-to}} <i class="icon-arrow-right"></i> {{user.name}}</h2>
     <section class="view-actions">
         {{#if view.userActionsAreVisible}}
             <span class="dropdown">