diff --git a/docs/demos/views/icon.vue b/docs/demos/views/icon.vue
index 4e1ee68fb..ae289f111 100644
--- a/docs/demos/views/icon.vue
+++ b/docs/demos/views/icon.vue
@@ -38,6 +38,7 @@ export default {
     height: 100px;
     float: none;
     display: inline-block;
+    vertical-align: middle;
   }
 
   .van-icon {
diff --git a/docs/markdown/en-US/cell.md b/docs/markdown/en-US/cell.md
index 28e3c7fbc..daa16c6ae 100644
--- a/docs/markdown/en-US/cell.md
+++ b/docs/markdown/en-US/cell.md
@@ -14,8 +14,8 @@ Vue.use(CellGroup);
 
 ```html
 <van-cell-group>
-  <van-cell title="Cell title" value="Content"></van-cell>
-  <van-cell title="Cell title" value="Content" label="Description"></van-cell>
+  <van-cell title="Cell title" value="Content" />
+  <van-cell title="Cell title" value="Content" label="Description" />
 </van-cell-group>
 ```
 
@@ -23,7 +23,7 @@ Vue.use(CellGroup);
 
 ```html
 <van-cell-group>
-  <van-cell value="Content"></van-cell>
+  <van-cell value="Content" />
 </van-cell-group>
 ```
 
@@ -31,7 +31,7 @@ Vue.use(CellGroup);
 
 ```html
 <van-cell-group>
-  <van-cell title="Cell title" icon="location"></van-cell>
+  <van-cell title="Cell title" icon="location" />
 </van-cell-group>
 ```
 
@@ -39,8 +39,8 @@ Vue.use(CellGroup);
 
 ```html
 <van-cell-group>
-  <van-cell title="Cell title" is-link></van-cell>
-  <van-cell title="Cell title" is-link value="Content"></van-cell>
+  <van-cell title="Cell title" isLink />
+  <van-cell title="Cell title" isLink value="Content" />
 </van-cell-group>
 ```
 
@@ -48,16 +48,16 @@ Vue.use(CellGroup);
 
 ```html
 <van-cell-group>
-  <van-cell value="Content" icon="shop" is-link>
+  <van-cell value="Content" icon="shop" isLink>
     <template slot="title">
       <span class="van-cell-text">Cell title</span>
       <van-tag type="danger">Tag</van-tag>
     </template>
   </van-cell>
-  <van-cell title="Cell title" icon="location" is-link></van-cell>
+  <van-cell title="Cell title" icon="location" isLink />
   <van-cell title="Cell title">
     <template slot="right-icon">
-      <van-icon name="search" class="van-cell__right-icon"></van-icon>
+      <van-icon name="search" class="van-cell__right-icon" />
     </template>
   </van-cell>
 </van-cell-group>
diff --git a/docs/markdown/zh-CN/badge.md b/docs/markdown/zh-CN/badge.md
index 25e1842aa..a14588d49 100644
--- a/docs/markdown/zh-CN/badge.md
+++ b/docs/markdown/zh-CN/badge.md
@@ -11,10 +11,10 @@ Vue.use(Badge);
 
 #### 基础用法
 
-通过在`van-badge-group`上设置`active-key`属性来控制选中的`badge`
+通过在`van-badge-group`上设置`activeKey`属性来控制选中的`badge`
 
 ```html
-<van-badge-group :active-key="activeKey">
+<van-badge-group :activeKey="activeKey">
   <van-badge title="热销榜" @click="onClick"></van-badge>
   <van-badge title="花式寿司" @click="onClick" info="8"></van-badge>
   <van-badge title="火炽寿司" @click="onClick" info="99"></van-badge>
@@ -41,7 +41,7 @@ export default {
 
 | 参数 | 说明 | 类型 | 默认值 | 可选值 |
 |-----------|-----------|-----------|-------------|-------------|
-| active-key | 选中`badge`的索引 | `String | Number` | `0` | - |
+| activeKey | 选中`badge`的索引 | `String | Number` | `0` | - |
 
 ### Badge API
 | 参数 | 说明 | 类型 | 默认值 | 可选值 |
diff --git a/docs/markdown/zh-CN/cell.md b/docs/markdown/zh-CN/cell.md
index 611c682f0..f8ffae670 100644
--- a/docs/markdown/zh-CN/cell.md
+++ b/docs/markdown/zh-CN/cell.md
@@ -16,8 +16,8 @@ Vue.use(CellGroup);
 
 ```html
 <van-cell-group>
-  <van-cell title="单元格" value="内容"></van-cell>
-  <van-cell title="单元格" value="内容" label="描述信息"></van-cell>
+  <van-cell title="单元格" value="内容" />
+  <van-cell title="单元格" value="内容" label="描述信息" />
 </van-cell-group>
 ```
 
@@ -26,7 +26,7 @@ Vue.use(CellGroup);
 
 ```html
 <van-cell-group>
-  <van-cell value="内容"></van-cell>
+  <van-cell value="内容" />
 </van-cell-group>
 ```
 
@@ -35,7 +35,7 @@ Vue.use(CellGroup);
 
 ```html
 <van-cell-group>
-  <van-cell title="单元格" icon="location"></van-cell>
+  <van-cell title="单元格" icon="location" />
 </van-cell-group>
 ```
 
@@ -45,8 +45,8 @@ Vue.use(CellGroup);
 
 ```html
 <van-cell-group>
-  <van-cell title="单元格" is-link></van-cell>
-  <van-cell title="单元格" is-link value="内容"></van-cell>
+  <van-cell title="单元格" isLink />
+  <van-cell title="单元格" isLink value="内容" />
 </van-cell-group>
 ```
 
@@ -55,16 +55,16 @@ Vue.use(CellGroup);
 
 ```html
 <van-cell-group>
-  <van-cell value="内容" icon="shop" is-link>
+  <van-cell value="内容" icon="shop" isLink>
     <template slot="title">
       <span class="van-cell-text">单元格</span>
       <van-tag type="danger">标签</van-tag>
     </template>
   </van-cell>
-  <van-cell title="单元格" icon="location" is-link></van-cell>
+  <van-cell title="单元格" icon="location" isLink />
   <van-cell title="单元格">
     <template slot="right-icon">
-      <van-icon name="search" class="van-cell__right-icon"></van-icon>
+      <van-icon name="search" class="van-cell__right-icon" />
     </template>
   </van-cell>
 </van-cell-group>
diff --git a/packages/button/index.vue b/packages/button/index.vue
index 193054f0d..fb2d1fdc7 100644
--- a/packages/button/index.vue
+++ b/packages/button/index.vue
@@ -1,4 +1,3 @@
-
 <template>
   <component
     :is="tag"