diff --git a/src/skins/vector/css/organisms/LeftPanel.css b/src/skins/vector/css/organisms/LeftPanel.css
index 3639464ff8..0e7e077e4b 100644
--- a/src/skins/vector/css/organisms/LeftPanel.css
+++ b/src/skins/vector/css/organisms/LeftPanel.css
@@ -28,8 +28,9 @@ limitations under the License.
 
 .mx_LeftPanel_hideButton {
     position: absolute;
-    top: 18px;
-    right: 8px;
+    top: 10px;
+    right: 0px;
+    padding: 8px;
     cursor: pointer;
 }
 
diff --git a/src/skins/vector/css/organisms/RoomView.css b/src/skins/vector/css/organisms/RoomView.css
index 1bd827bc71..2aab203a4c 100644
--- a/src/skins/vector/css/organisms/RoomView.css
+++ b/src/skins/vector/css/organisms/RoomView.css
@@ -212,7 +212,7 @@ limitations under the License.
 
 .mx_RoomView_uploadProgressOuter {
     width: 100%;
-    background-color: #a9dbf4;
+    background-color: rgba(169, 219, 244, 0.5);
     height: 4px;
 }
 
@@ -226,11 +226,23 @@ limitations under the License.
     margin-left: 56px;
 }
 
+.mx_RoomView_uploadIcon {
+    float: left;
+    margin-top: 6px;
+    margin-left: 5px;
+}
+
+.mx_RoomView_uploadCancel {
+    float: right;
+    margin-top: 6px;
+    margin-right: 10px;
+}
+
 .mx_RoomView_uploadBytes {
     float: right;    
     opacity: 0.5;
     margin-top: 15px;
-    margin-right: 70px;
+    margin-right: 10px;
 }
 
 .mx_RoomView_ongoingConfCallNotification {
diff --git a/src/skins/vector/img/cancel.png b/src/skins/vector/img/cancel.png
new file mode 100644
index 0000000000..c963a4b7b3
Binary files /dev/null and b/src/skins/vector/img/cancel.png differ
diff --git a/src/skins/vector/img/fileicon.png b/src/skins/vector/img/fileicon.png
new file mode 100644
index 0000000000..be277a1c8a
Binary files /dev/null and b/src/skins/vector/img/fileicon.png differ
diff --git a/src/skins/vector/views/organisms/RoomView.js b/src/skins/vector/views/organisms/RoomView.js
index f45ed59617..d1556b6586 100644
--- a/src/skins/vector/views/organisms/RoomView.js
+++ b/src/skins/vector/views/organisms/RoomView.js
@@ -154,8 +154,10 @@ module.exports = React.createClass({
                         <div className="mx_RoomView_uploadProgressOuter">
                             <div className="mx_RoomView_uploadProgressInner" style={innerProgressStyle}></div>
                         </div>
+                        <img className="mx_RoomView_uploadIcon" src="img/fileicon.png" width="40" height="40"/>
+                        <img className="mx_RoomView_uploadCancel" src="img/cancel.png" width="40" height="40"/>
                         <div className="mx_RoomView_uploadBytes">
-                        {filesize(this.state.upload.uploadedBytes).replace(/ .*/, '')} / {filesize(this.state.upload.totalBytes)}
+                            {filesize(this.state.upload.uploadedBytes).replace(/ .*/, '')} / {filesize(this.state.upload.totalBytes)}
                         </div>
                         <div className="mx_RoomView_uploadFilename">Uploading {this.state.upload.fileName}</div>
                     </div>