diff --git a/docs/examples-dist/icon.vue b/docs/examples-dist/icon.vue
index a208f1a82..40620f0e0 100644
--- a/docs/examples-dist/icon.vue
+++ b/docs/examples-dist/icon.vue
@@ -1,4 +1,7 @@
 <template><section class="demo-icon"><h1 class="demo-title">Icon 图标</h1><example-block title="所有Icon">
+                <van-icon name="qr-invalid" style="text-align: center"></van-icon>
+
+              </example-block><example-block title="所有Icon">
                 <van-row>
   <van-col span="8">
     <van-icon name="qr-invalid"></van-icon>
@@ -64,10 +67,6 @@
     <van-icon name="photo"></van-icon>
     <span>photo</span>
   </van-col>
-  <van-col span="8">
-    <van-icon name="logistics"></van-icon>
-    <span>logistics</span>
-  </van-col>
   <van-col span="8">
     <van-icon name="edit"></van-icon>
     <span>edit</span>
@@ -156,12 +155,124 @@
     <van-icon name="other-pay"></van-icon>
     <span>other-pay</span>
   </van-col>
+  <van-col span="8">
+    <van-icon name="cart"></van-icon>
+    <span>cart</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="browsing-history"></van-icon>
+    <span>browsing-history</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="goods-collect"></van-icon>
+    <span>goods-collect</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="shop-collect"></van-icon>
+    <span>shop-collect</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="receive-gift"></van-icon>
+    <span>receive-gift</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="send-gift"></van-icon>
+    <span>send-gift</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="setting"></van-icon>
+    <span>setting</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="points"></van-icon>
+    <span>points</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="coupon"></van-icon>
+    <span>coupon</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="free-postage"></van-icon>
+    <span>free-postage</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="discount"></van-icon>
+    <span>discount</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="birthday-privilege"></van-icon>
+    <span>birthday-privilege</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="member-day-privilege"></van-icon>
+    <span>member-day-privilege</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="balance-details"></van-icon>
+    <span>balance-details</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="cash-back-record"></van-icon>
+    <span>cash-back-record</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="points-mall"></van-icon>
+    <span>points-mall</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="exchange-record"></van-icon>
+    <span>exchange-record</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="pending-payment"></van-icon>
+    <span>pending-payment</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="pending-orders"></van-icon>
+    <span>pending-orders</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="pending-deliver"></van-icon>
+    <span>pending-deliver</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="logistics"></van-icon>
+    <span>logistics</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="pending-evaluate"></van-icon>
+    <span>pending-evaluate</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="cash-on-deliver"></van-icon>
+    <span>cash-on-deliver</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="gift-card-pay"></van-icon>
+    <span>gift-card-pay</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="underway"></van-icon>
+    <span>underway</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="point-gift"></van-icon>
+    <span>point-gift</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="after-sale"></van-icon>
+    <span>after-sale</span>
+  </van-col>
 </van-row>
 
               </example-block></section></template>
 <style>
 @component-namespace demo {
   @b icon {
+    .examples {
+      max-height: none;
+    }
+
     .van-col {
       text-align: center;
       height: 120px;
diff --git a/docs/examples-docs/icon.md b/docs/examples-docs/icon.md
index 20b6296af..17dc41d98 100644
--- a/docs/examples-docs/icon.md
+++ b/docs/examples-docs/icon.md
@@ -56,7 +56,17 @@ export default {
 
 #### 基础用法
 
-设置`name`属性为对应的图标名称即可，以下目前有的所有图标：
+设置`name`属性为对应的图标名称即可：
+
+:::demo 所有Icon
+```html
+<van-icon name="qr-invalid" style="text-align: center"></van-icon>
+```
+:::
+
+#### 所有Icons
+
+以下目前有的所有图标及其名称：
 
 :::demo 所有Icon
 ```html
@@ -313,6 +323,14 @@ export default {
     <van-icon name="underway"></van-icon>
     <span>underway</span>
   </van-col>
+  <van-col span="8">
+    <van-icon name="point-gift"></van-icon>
+    <span>point-gift</span>
+  </van-col>
+  <van-col span="8">
+    <van-icon name="after-sale"></van-icon>
+    <span>after-sale</span>
+  </van-col>
 </van-row>
 ```
 :::
diff --git a/packages/dialog/src/dialog.vue b/packages/dialog/src/dialog.vue
index 235a1c054..47849b3eb 100644
--- a/packages/dialog/src/dialog.vue
+++ b/packages/dialog/src/dialog.vue
@@ -21,7 +21,7 @@
 import Popup from 'src/mixins/popup';
 
 const CANCEL_TEXT = '取消';
-const CONFIRM_TEXT = '确认';
+const CONFIRM_TEXT = '确定';
 
 export default {
   name: 'van-dialog',
diff --git a/packages/field/src/field.vue b/packages/field/src/field.vue
index ffb76e74b..cbc38a10b 100644
--- a/packages/field/src/field.vue
+++ b/packages/field/src/field.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-const VALID_TYPES = ['text', 'number', 'email', 'url', 'tel', 'date', 'datetime', 'password', 'textarea'];
+const VALID_TYPES = ['text', 'number', 'email', 'url', 'tel', 'date', 'time', 'datetime', 'password', 'textarea'];
 import vanCell from 'packages/cell';
 
 export default {
diff --git a/packages/vant-css/assets/icons.sketch b/packages/vant-css/assets/icons.sketch
index 0a76ccaf4..3a15fd865 100644
Binary files a/packages/vant-css/assets/icons.sketch and b/packages/vant-css/assets/icons.sketch differ
diff --git a/packages/vant-css/scripts/fount-config.js b/packages/vant-css/scripts/fount-config.js
index 4f1785304..7ae428b47 100644
--- a/packages/vant-css/scripts/fount-config.js
+++ b/packages/vant-css/scripts/fount-config.js
@@ -333,6 +333,16 @@ module.exports = {
       keywords: ['underway'],
       src: '进行中.svg',
       css: 'underway'
+    },
+    {
+      keywords: ['point', 'gift'],
+      src: '积分礼包.svg',
+      css: 'point-gift'
+    },
+    {
+      keywords: ['after', 'sale'],
+      src: '售后记录.svg',
+      css: 'after-sale'
     }
   ]
 };
diff --git a/packages/vant-css/src/icon.css b/packages/vant-css/src/icon.css
index d53bf4d07..8b11c608f 100644
--- a/packages/vant-css/src/icon.css
+++ b/packages/vant-css/src/icon.css
@@ -2,11 +2,11 @@
 
 @font-face {
   font-family: 'vant-icon';
-  src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-00a6bb93cd.eot');
-  src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-00a6bb93cd.eot?#iefix') format('embedded-opentype'),
-       url('https://b.yzcdn.cn/zanui/icon/vant-icon-00a6bb93cd.woff2') format('woff2'),
-       url('https://b.yzcdn.cn/zanui/icon/vant-icon-00a6bb93cd.woff') format('woff'),
-       url('https://b.yzcdn.cn/zanui/icon/vant-icon-00a6bb93cd.ttf') format('truetype')
+  src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.eot');
+  src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.eot?#iefix') format('embedded-opentype'),
+       url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.woff2') format('woff2'),
+       url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.woff') format('woff'),
+       url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.ttf') format('truetype')
 }
 
 .van-icon {
@@ -109,4 +109,6 @@
 .van-icon-pending-evaluate:before { content: '\e83b'; } /* '' */
 .van-icon-gift-card-pay:before { content: '\e83c'; } /* '' */
 .van-icon-cash-on-deliver:before { content: '\e83d'; } /* '' */
-.van-icon-underway:before { content: '\e83e'; } /* '' */
\ No newline at end of file
+.van-icon-underway:before { content: '\e83e'; } /* '' */
+.van-icon-point-gift:before { content: '\e83f'; } /* '' */
+.van-icon-after-sale:before { content: '\e840'; } /* '' */
\ No newline at end of file