diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.css b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.css
index d7b508b84e..4a628aad07 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.css
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.css
@@ -1,5 +1,6 @@
 .upload-widget {
-    width:100%
+    width:100%;
+    word-break: break-all;
 }
 
 .upload-widget__icon {
@@ -13,7 +14,7 @@
 
 .upload-widget__reset {
     float: left;
-    margin-top: 4px;
+    margin-top: -2px;
 }
 
 .upload-widget__invalid .upload-widget__label {
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html
index ce0580310c..855f76a252 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html
@@ -10,7 +10,10 @@
                [attr.id]="field.id"
                class="upload-widget__file"
                (change)="onFileChanged($event)">
-        <button *ngIf="hasFile" (click)="reset(file);" class="upload-widget__reset">X</button>
+        <button *ngIf="hasFile" (click)="reset(file);"
+                class="mdl-button mdl-js-button mdl-button--icon upload-widget__reset">
+            <i class="material-icons">highlight_off</i>
+        </button>
     </div>
     <span *ngIf="field.validationSummary" class="mdl-textfield__error">{{field.validationSummary}}</span>
 </div>