icons

src/skins/vector/css/organisms/LeftPanel.css

@@ -28,8 +28,9 @@ limitations under the License.
 
 .mx_LeftPanel_hideButton {
     position: absolute;
-    top: 18px;
+    top: 10px;
-    right: 8px;
+    right: 0px;
+    padding: 8px;
     cursor: pointer;
 }
 

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 {

src/skins/vector/views/organisms/RoomView.js

@@ -154,6 +154,8 @@ 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)}
                         </div>