13 files changed, 30 insertions, 43 deletions

diff --git a/css/font-awesome-ie7.css b/css/font-awesome-ie7.css
index 0c9b619cd..e44d0aea4 100644
--- a/css/font-awesome-ie7.css
+++ b/css/font-awesome-ie7.css
@@ -1036,14 +1036,14 @@ a [class*=" icon-"] {
 .icon-jpy {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-yen {
+.icon-cny {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-cny {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
+.icon-rmb {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-renminbi {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
+.icon-yen {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
 .icon-krw {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
diff --git a/css/font-awesome-ie7.min.css b/css/font-awesome-ie7.min.css
index 389e317f7..78abeeacf 100644
--- a/css/font-awesome-ie7.min.css
+++ b/css/font-awesome-ie7.min.css
@@ -327,9 +327,9 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer}
 .icon-inr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-rupee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-jpy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-cny{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-rmb{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-yen{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-cny{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-renminbi{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-krw{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-won{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-btc{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
diff --git a/css/font-awesome.css b/css/font-awesome.css
index 003f36b16..d829d0daf 100644
--- a/css/font-awesome.css
+++ b/css/font-awesome.css
@@ -42,6 +42,7 @@
   font-style: normal;
   font-weight: normal;
   text-decoration: inherit;
+  text-rendering: auto;
   -moz-osx-font-smoothing: grayscale;
 }
 [class^="icon-"]:before,
@@ -1323,14 +1324,12 @@ a .icon-flip-vertical:before {
 .icon-inr:before {
   content: "\f156";
 }
+.icon-cny:before,
+.icon-rmb:before,
 .icon-yen:before,
 .icon-jpy:before {
   content: "\f157";
 }
-.icon-renminbi:before,
-.icon-cny:before {
-  content: "\f158";
-}
 .icon-won:before,
 .icon-krw:before {
   content: "\f159";
diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css
index 2cd55ed6c..abdacffc5 100644
--- a/css/font-awesome.min.css
+++ b/css/font-awesome.min.css
@@ -1,4 +1,4 @@
-@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.1');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../font/fontawesome-webfont.svg?v=3.2.1#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{*margin-right:.3em;font-family:FontAwesome;-webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;text-decoration:inherit;-moz-osx-font-smoothing:grayscale}
+@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.1');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../font/fontawesome-webfont.svg?v=3.2.1#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{*margin-right:.3em;font-family:FontAwesome;-webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;text-decoration:inherit;text-rendering:auto;-moz-osx-font-smoothing:grayscale}
 [class^="icon-"]:before,[class*=" icon-"]:before{display:inline-block;text-decoration:inherit;speak:none}
 .icon-large:before{font-size:1.3333333333333333em;vertical-align:-10%}
 a [class^="icon-"],a [class*=" icon-"]{display:inline}
@@ -351,8 +351,7 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
 .icon-gbp:before{content:"\f154"}
 .icon-dollar:before,.icon-usd:before{content:"\f155"}
 .icon-rupee:before,.icon-inr:before{content:"\f156"}
-.icon-yen:before,.icon-jpy:before{content:"\f157"}
-.icon-renminbi:before,.icon-cny:before{content:"\f158"}
+.icon-cny:before,.icon-rmb:before,.icon-yen:before,.icon-jpy:before{content:"\f157"}
 .icon-won:before,.icon-krw:before{content:"\f159"}
 .icon-bitcoin:before,.icon-btc:before{content:"\f15a"}
 .icon-file:before{content:"\f15b"}
diff --git a/less/font-awesome-ie7.less b/less/font-awesome-ie7.less
index 4cfeb0ae9..e0b47a124 100644
--- a/less/font-awesome-ie7.less
+++ b/less/font-awesome-ie7.less
@@ -1681,17 +1681,16 @@ a [class*=" icon-"] {
   .ie7icon('');
 }
 
-.icon-yen {
+.icon-cny {
   .ie7icon('');
 }
 
-
-.icon-cny {
-  .ie7icon('');
+.icon-rmb {
+  .ie7icon('');
 }
 
-.icon-renminbi {
-  .ie7icon('');
+.icon-yen {
+  .ie7icon('');
 }
 
 
diff --git a/less/icons.less b/less/icons.less
index 809e0608c..48f92a3de 100644
--- a/less/icons.less
+++ b/less/icons.less
@@ -323,10 +323,10 @@
 .icon-usd:before { content: @usd; }
 .icon-rupee:before,
 .icon-inr:before { content: @inr; }
+.icon-cny:before,
+.icon-rmb:before,
 .icon-yen:before,
 .icon-jpy:before { content: @jpy; }
-.icon-renminbi:before,
-.icon-cny:before { content: @cny; }
 .icon-won:before,
 .icon-krw:before { content: @krw; }
 .icon-bitcoin:before,
diff --git a/less/mixins.less b/less/mixins.less
index 976f0f185..fd023f104 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -13,6 +13,7 @@
   font-style: normal;
   font-weight: normal;
   text-decoration: inherit;
+  text-rendering: auto;
   -moz-osx-font-smoothing: grayscale;
 }
 
diff --git a/less/variables.less b/less/variables.less
index 8690fffb3..800887d8e 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -635,8 +635,6 @@
 
   @jpy: "\f157";
 
-  @cny: "\f158";
-
   @krw: "\f159";
 
   @btc: "\f15a";
diff --git a/scss/_icons.scss b/scss/_icons.scss
index 3a53919d5..8fab6c7fe 100644
--- a/scss/_icons.scss
+++ b/scss/_icons.scss
@@ -323,10 +323,10 @@
 .icon-usd:before { content: $usd; }
 .icon-rupee:before,
 .icon-inr:before { content: $inr; }
+.icon-cny:before,
+.icon-rmb:before,
 .icon-yen:before,
 .icon-jpy:before { content: $jpy; }
-.icon-renminbi:before,
-.icon-cny:before { content: $cny; }
 .icon-won:before,
 .icon-krw:before { content: $krw; }
 .icon-bitcoin:before,
diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index 27e1b2872..7c7db2db3 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -13,6 +13,7 @@
   font-style: normal;
   font-weight: normal;
   text-decoration: inherit;
+  text-rendering: auto;
   -moz-osx-font-smoothing: grayscale;
 }
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
index a7e91da1a..db3b5fa0f 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -634,8 +634,6 @@ $inr: "\f156";
 
 $jpy: "\f157";
 
-$cny: "\f158";
-
 $krw: "\f159";
 
 $btc: "\f15a";
diff --git a/scss/font-awesome-ie7.scss b/scss/font-awesome-ie7.scss
index 9faf52229..787ff9d3f 100644
--- a/scss/font-awesome-ie7.scss
+++ b/scss/font-awesome-ie7.scss
@@ -1681,17 +1681,16 @@ a [class*=" icon-"] {
   @include ie7icon('');
 }
 
-.icon-yen {
+.icon-cny {
   @include ie7icon('');
 }
 
-
-.icon-cny {
-  @include ie7icon('');
+.icon-rmb {
+  @include ie7icon('');
 }
 
-.icon-renminbi {
-  @include ie7icon('');
+.icon-yen {
+  @include ie7icon('');
 }
 
 
diff --git a/src/icons.yml b/src/icons.yml
index 006c5d473..1fbc59e92 100644
--- a/src/icons.yml
+++ b/src/icons.yml
@@ -2227,19 +2227,12 @@ icons:
     unicode:    f157
     created:    3.2
     aliases:
+      - cny
+      - rmb
       - yen
     categories:
       - Currency Icons
 
-  - name:       Renminbi (CNY)
-    id:         cny
-    unicode:    f158
-    created:    3.2
-    aliases:
-      - renminbi
-    categories:
-      - Currency Icons
-
   - name:       Korean Won (KRW)
     id:         krw
     unicode:    f159