diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
index 52f9ba72..7f2bb261 100644
--- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
+++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
@@ -132,6 +132,7 @@ let FileDragAndDrop = React.createClass({
                 evt.initMouseEvent('click', true, true, window, 0, 0, 0, 80, 20, false, false, false, false, 0, null);
             }
 
+            evt.stopPropagation();
             this.refs.fileSelector.getDOMNode().dispatchEvent(evt);
         }
     },
diff --git a/sass/ascribe_property.scss b/sass/ascribe_property.scss
index 7a225042..bcbb509e 100644
--- a/sass/ascribe_property.scss
+++ b/sass/ascribe_property.scss
@@ -117,11 +117,6 @@ $ascribe-red-error: rgb(169, 68, 66);
         margin-top: 0 !important;
     }
 
-    > .upload-button-wrapper {
-        margin-top: 1em;
-        margin-bottom: 1em;
-    }
-
     > input,
     > pre,
     > textarea,
diff --git a/sass/whitelabel/wallet/cc/cc_custom_style.scss b/sass/whitelabel/wallet/cc/cc_custom_style.scss
index f72ef677..64b3f036 100644
--- a/sass/whitelabel/wallet/cc/cc_custom_style.scss
+++ b/sass/whitelabel/wallet/cc/cc_custom_style.scss
@@ -211,7 +211,3 @@ $cc--button-color: $cc--nav-fg-prim-color;
                  1px 0 $cc--button-color,
                  0 -1px $cc--button-color;
 }
-
-.client--cc  .upload-button-wrapper > span {
-    color: $cc--button-color;
-}
diff --git a/sass/whitelabel/wallet/cyland/cyland_custom_style.scss b/sass/whitelabel/wallet/cyland/cyland_custom_style.scss
index 6322ef5b..31346d79 100644
--- a/sass/whitelabel/wallet/cyland/cyland_custom_style.scss
+++ b/sass/whitelabel/wallet/cyland/cyland_custom_style.scss
@@ -230,7 +230,3 @@ $cyland--button-sec-color: #515151;
                  1px 0 $cyland--nav-fg-prim-color,
                  0 -1px $cyland--nav-fg-prim-color;
 }
-
-.client--cyland  .upload-button-wrapper > span {
-    color: $cyland--button-color;
-}
diff --git a/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss b/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss
index 9d5dc143..9ca4275f 100644
--- a/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss
+++ b/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss
@@ -549,7 +549,3 @@ $ikono--font: 'Helvetica Neue', 'Helvetica', sans-serif !important;
                  1px 0 $ikono--button-color,
                  0 -1px $ikono--button-color;
 }
-
-.client--ikonotv  .upload-button-wrapper > span {
-    color: $ikono--button-color;
-}