changing name of icon back to fa-search, changin fa-thumbs-up-o to be in line with new conventions

2 files changed, 10 insertions, 11 deletions

diff --git a/less/icons.less b/less/icons.less
index 3e3a97e37..f525c42ff 100644
--- a/less/icons.less
+++ b/less/icons.less
@@ -3,8 +3,7 @@
 
 .@{fa-css-prefix}-glass:before { content: @fa-var-glass; }
 .@{fa-css-prefix}-music:before { content: @fa-var-music; }
-.@{fa-css-prefix}-search:before,
-.@{fa-css-prefix}-magnifying-glass:before { content: @fa-var-magnifying-glass; }
+.@{fa-css-prefix}-search:before { content: @fa-var-search; }
 .@{fa-css-prefix}-envelope-o:before { content: @fa-var-envelope-o; }
 .@{fa-css-prefix}-heart:before { content: @fa-var-heart; }
 .@{fa-css-prefix}-star:before { content: @fa-var-star; }
@@ -16,8 +15,8 @@
 .@{fa-css-prefix}-th-list:before { content: @fa-var-th-list; }
 .@{fa-css-prefix}-check:before { content: @fa-var-check; }
 .@{fa-css-prefix}-times:before { content: @fa-var-times; }
-.@{fa-css-prefix}-magnifying-glass-plus:before { content: @fa-var-magnifying-glass-plus; }
-.@{fa-css-prefix}-magnifying-glass-minus:before { content: @fa-var-magnifying-glass-minus; }
+.@{fa-css-prefix}-search-plus:before { content: @fa-var-search-plus; }
+.@{fa-css-prefix}-search-minus:before { content: @fa-var-search-minus; }
 .@{fa-css-prefix}-power-off:before { content: @fa-var-power-off; }
 .@{fa-css-prefix}-signal:before { content: @fa-var-signal; }
 .@{fa-css-prefix}-gear:before,
@@ -136,8 +135,8 @@
 .@{fa-css-prefix}-gears:before,
 .@{fa-css-prefix}-cogs:before { content: @fa-var-cogs; }
 .@{fa-css-prefix}-comments:before { content: @fa-var-comments; }
-.@{fa-css-prefix}-thumbs-up-o:before { content: @fa-var-thumbs-up-o; }
-.@{fa-css-prefix}-thumbs-down-o:before { content: @fa-var-thumbs-down-o; }
+.@{fa-css-prefix}-thumbs-o-up:before { content: @fa-var-thumbs-o-up; }
+.@{fa-css-prefix}-thumbs-o-down:before { content: @fa-var-thumbs-o-down; }
 .@{fa-css-prefix}-star-half:before { content: @fa-var-star-half; }
 .@{fa-css-prefix}-heart-o:before { content: @fa-var-heart-o; }
 .@{fa-css-prefix}-sign-out:before { content: @fa-var-sign-out; }
diff --git a/less/variables.less b/less/variables.less
index c91e34994..c3967c8ac 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -13,7 +13,7 @@
 
 @fa-var-glass: "\f000";
 @fa-var-music: "\f001";
-@fa-var-magnifying-glass: "\f002";
+@fa-var-search: "\f002";
 @fa-var-envelope-o: "\f003";
 @fa-var-heart: "\f004";
 @fa-var-star: "\f005";
@@ -25,8 +25,8 @@
 @fa-var-th-list: "\f00b";
 @fa-var-check: "\f00c";
 @fa-var-times: "\f00d";
-@fa-var-magnifying-glass-plus: "\f00e";
-@fa-var-magnifying-glass-minus: "\f010";
+@fa-var-search-plus: "\f00e";
+@fa-var-search-minus: "\f010";
 @fa-var-power-off: "\f011";
 @fa-var-signal: "\f012";
 @fa-var-cog: "\f013";
@@ -138,8 +138,8 @@
 @fa-var-key: "\f084";
 @fa-var-cogs: "\f085";
 @fa-var-comments: "\f086";
-@fa-var-thumbs-up-o: "\f087";
-@fa-var-thumbs-down-o: "\f088";
+@fa-var-thumbs-o-up: "\f087";
+@fa-var-thumbs-o-down: "\f088";
 @fa-var-star-half: "\f089";
 @fa-var-heart-o: "\f08a";
 @fa-var-sign-out: "\f08b";