diff --git a/packages/theme-default/src/upload.css b/packages/theme-default/src/upload.css
index 4435133b5..9e833350d 100644
--- a/packages/theme-default/src/upload.css
+++ b/packages/theme-default/src/upload.css
@@ -281,6 +281,8 @@
         border-radius: 6px;
         box-sizing: border-box;
         margin-top: 10px;
+        padding: 10px 10px 10px 90px;
+        height: 92px;
 
         &:hover {
           .el-upload-list__item-status-label {
@@ -294,17 +296,36 @@
             }
           }
         }
+        &.is-success {
+          .el-upload-list__item-name {
+            line-height: 70px;
+            margin-top: 0;
+
+            i {
+              display: none;
+            }
+          }
+        }
       }
       .el-upload-list__item-thumbnail {
         vertical-align: middle;
         display: inline-block;
         width: 70px;
         height: 70px;
-        margin: 10px;
+        float: left;
+        margin-left: -80px;
       }
       .el-upload-list__item-name {
-        display: inline-block;
-        vertical-align: middle;
+        display: block;
+        margin-top: 20px;
+
+        i {
+          font-size: 70px;
+          line-height: 1;
+          position: absolute;
+          left: 9px;
+          top: 10px;
+        }
       }
       .el-upload-list__item-status-label {
         position: absolute;
@@ -324,6 +345,9 @@
           color: #fff;
         }
       }
+      .el-progress {
+        position: static;
+      }
     }
   }
   @b upload-cover {
diff --git a/packages/upload/src/upload-list.vue b/packages/upload/src/upload-list.vue
index 7fd786c94..c9a63160a 100644
--- a/packages/upload/src/upload-list.vue
+++ b/packages/upload/src/upload-list.vue
@@ -9,7 +9,11 @@
       :class="['el-upload-list__item', 'is-' + file.status]"
       :key="file"
     >
-      <img class="el-upload-list__item-thumbnail" v-if="['picture-card', 'picture'].indexOf(listType) > -1" :src="file.url" alt="">
+      <img
+        class="el-upload-list__item-thumbnail"
+        v-if="['picture-card', 'picture'].indexOf(listType) > -1 && file.status === 'success'"
+        :src="file.url" alt=""
+      >
       <a class="el-upload-list__item-name" @click="handleClick(file)">
         <i class="el-icon-document"></i>{{file.name}}
       </a>