more naming consistency fixes, adding in new naming conventions doc

2 files changed, 75 insertions, 64 deletions

diff --git a/less/icons.less b/less/icons.less
index e22e09fcb..04ae76d4d 100644
--- a/less/icons.less
+++ b/less/icons.less
@@ -3,7 +3,8 @@
 
 .fa-icon-glass:before { content: @fa-icon-glass; }
 .fa-icon-music:before { content: @fa-icon-music; }
-.fa-icon-search:before { content: @fa-icon-search; }
+.fa-icon-search:before,
+.fa-icon-magnifying-glass:before { content: @fa-icon-magnifying-glass; }
 .fa-icon-envelope-alt:before { content: @fa-icon-envelope-alt; }
 .fa-icon-heart:before { content: @fa-icon-heart; }
 .fa-icon-star:before { content: @fa-icon-star; }
@@ -15,16 +16,16 @@
 .fa-icon-th-list:before { content: @fa-icon-th-list; }
 .fa-icon-check:before { content: @fa-icon-check; }
 .fa-icon-times:before { content: @fa-icon-times; }
-.fa-icon-zoom-in:before { content: @fa-icon-zoom-in; }
-.fa-icon-zoom-out:before { content: @fa-icon-zoom-out; }
+.fa-icon-magnifying-glass-plus:before { content: @fa-icon-magnifying-glass-plus; }
+.fa-icon-magnifying-glass-minus:before { content: @fa-icon-magnifying-glass-minus; }
 .fa-icon-power-off:before { content: @fa-icon-power-off; }
 .fa-icon-signal:before { content: @fa-icon-signal; }
 .fa-icon-gear:before,
 .fa-icon-cog:before { content: @fa-icon-cog; }
-.fa-icon-trash:before { content: @fa-icon-trash; }
+.fa-icon-trash-alt:before { content: @fa-icon-trash-alt; }
 .fa-icon-home:before { content: @fa-icon-home; }
 .fa-icon-file-alt:before { content: @fa-icon-file-alt; }
-.fa-icon-time:before { content: @fa-icon-time; }
+.fa-icon-clock-alt:before { content: @fa-icon-clock-alt; }
 .fa-icon-road:before { content: @fa-icon-road; }
 .fa-icon-download:before { content: @fa-icon-download; }
 .fa-icon-arrow-circle-alt-down:before { content: @fa-icon-arrow-circle-alt-down; }
@@ -63,7 +64,7 @@
 .fa-icon-outdent:before { content: @fa-icon-outdent; }
 .fa-icon-indent:before { content: @fa-icon-indent; }
 .fa-icon-video-camera:before { content: @fa-icon-video-camera; }
-.fa-icon-picture:before { content: @fa-icon-picture; }
+.fa-icon-picture-alt:before { content: @fa-icon-picture-alt; }
 .fa-icon-pencil:before { content: @fa-icon-pencil; }
 .fa-icon-map-marker:before { content: @fa-icon-map-marker; }
 .fa-icon-adjust:before { content: @fa-icon-adjust; }
@@ -91,7 +92,7 @@
 .fa-icon-check-circle:before { content: @fa-icon-check-circle; }
 .fa-icon-question-circle:before { content: @fa-icon-question-circle; }
 .fa-icon-info-circle:before { content: @fa-icon-info-circle; }
-.fa-icon-screenshot:before { content: @fa-icon-screenshot; }
+.fa-icon-crosshairs:before { content: @fa-icon-crosshairs; }
 .fa-icon-times-circle-alt:before { content: @fa-icon-times-circle-alt; }
 .fa-icon-check-circle-alt:before { content: @fa-icon-check-circle-alt; }
 .fa-icon-ban:before { content: @fa-icon-ban; }
@@ -111,7 +112,7 @@
 .fa-icon-leaf:before { content: @fa-icon-leaf; }
 .fa-icon-fire:before { content: @fa-icon-fire; }
 .fa-icon-eye:before { content: @fa-icon-eye; }
-.fa-icon-eye-closed:before { content: @fa-icon-eye-closed; }
+.fa-icon-eye-slash:before { content: @fa-icon-eye-slash; }
 .fa-icon-warning:before,
 .fa-icon-exclamation-triangle:before { content: @fa-icon-exclamation-triangle; }
 .fa-icon-plane:before { content: @fa-icon-plane; }
@@ -127,7 +128,7 @@
 .fa-icon-folder-open:before { content: @fa-icon-folder-open; }
 .fa-icon-resize-vertical:before { content: @fa-icon-resize-vertical; }
 .fa-icon-resize-horizontal:before { content: @fa-icon-resize-horizontal; }
-.fa-icon-bar-chart:before { content: @fa-icon-bar-chart; }
+.fa-icon-bar-chart-alt:before { content: @fa-icon-bar-chart-alt; }
 .fa-icon-twitter-square:before { content: @fa-icon-twitter-square; }
 .fa-icon-facebook-square:before { content: @fa-icon-facebook-square; }
 .fa-icon-camera-retro:before { content: @fa-icon-camera-retro; }
@@ -163,10 +164,10 @@
 .fa-icon-bullhorn:before { content: @fa-icon-bullhorn; }
 .fa-icon-bell:before { content: @fa-icon-bell; }
 .fa-icon-certificate:before { content: @fa-icon-certificate; }
-.fa-icon-hand-right:before { content: @fa-icon-hand-right; }
-.fa-icon-hand-left:before { content: @fa-icon-hand-left; }
-.fa-icon-hand-up:before { content: @fa-icon-hand-up; }
-.fa-icon-hand-down:before { content: @fa-icon-hand-down; }
+.fa-icon-hand-alt-right:before { content: @fa-icon-hand-alt-right; }
+.fa-icon-hand-alt-left:before { content: @fa-icon-hand-alt-left; }
+.fa-icon-hand-alt-up:before { content: @fa-icon-hand-alt-up; }
+.fa-icon-hand-alt-down:before { content: @fa-icon-hand-alt-down; }
 .fa-icon-arrow-circle-left:before { content: @fa-icon-arrow-circle-left; }
 .fa-icon-arrow-circle-right:before { content: @fa-icon-arrow-circle-right; }
 .fa-icon-arrow-circle-up:before { content: @fa-icon-arrow-circle-up; }
@@ -185,10 +186,10 @@
 .fa-icon-cut:before,
 .fa-icon-scissors:before { content: @fa-icon-scissors; }
 .fa-icon-copy:before,
-.fa-icon-files:before { content: @fa-icon-files; }
+.fa-icon-files-alt:before { content: @fa-icon-files-alt; }
 .fa-icon-paperclip:before { content: @fa-icon-paperclip; }
 .fa-icon-save:before,
-.fa-icon-floppy:before { content: @fa-icon-floppy; }
+.fa-icon-floppy-alt:before { content: @fa-icon-floppy-alt; }
 .fa-icon-square:before { content: @fa-icon-square; }
 .fa-icon-reorder:before { content: @fa-icon-reorder; }
 .fa-icon-list-ul:before { content: @fa-icon-list-ul; }
@@ -230,7 +231,7 @@
 .fa-icon-umbrella:before { content: @fa-icon-umbrella; }
 .fa-icon-paste:before,
 .fa-icon-clipboard:before { content: @fa-icon-clipboard; }
-.fa-icon-lightbulb:before { content: @fa-icon-lightbulb; }
+.fa-icon-lightbulb-alt:before { content: @fa-icon-lightbulb-alt; }
 .fa-icon-exchange:before { content: @fa-icon-exchange; }
 .fa-icon-cloud-download:before { content: @fa-icon-cloud-download; }
 .fa-icon-cloud-upload:before { content: @fa-icon-cloud-upload; }
@@ -249,10 +250,10 @@
 .fa-icon-beer:before { content: @fa-icon-beer; }
 .fa-icon-h-square:before { content: @fa-icon-h-square; }
 .fa-icon-plus-square:before { content: @fa-icon-plus-square; }
-.fa-icon-double-angle-left:before { content: @fa-icon-double-angle-left; }
-.fa-icon-double-angle-right:before { content: @fa-icon-double-angle-right; }
-.fa-icon-double-angle-up:before { content: @fa-icon-double-angle-up; }
-.fa-icon-double-angle-down:before { content: @fa-icon-double-angle-down; }
+.fa-icon-angle-double-left:before { content: @fa-icon-angle-double-left; }
+.fa-icon-angle-double-right:before { content: @fa-icon-angle-double-right; }
+.fa-icon-angle-double-up:before { content: @fa-icon-angle-double-up; }
+.fa-icon-angle-double-down:before { content: @fa-icon-angle-double-down; }
 .fa-icon-angle-left:before { content: @fa-icon-angle-left; }
 .fa-icon-angle-right:before { content: @fa-icon-angle-right; }
 .fa-icon-angle-up:before { content: @fa-icon-angle-up; }
@@ -274,11 +275,11 @@
 .fa-icon-folder-open-alt:before { content: @fa-icon-folder-open-alt; }
 .fa-icon-expand-alt:before { content: @fa-icon-expand-alt; }
 .fa-icon-collapse-alt:before { content: @fa-icon-collapse-alt; }
-.fa-icon-smile:before { content: @fa-icon-smile; }
-.fa-icon-frown:before { content: @fa-icon-frown; }
-.fa-icon-meh:before { content: @fa-icon-meh; }
+.fa-icon-smile-alt:before { content: @fa-icon-smile-alt; }
+.fa-icon-frown-alt:before { content: @fa-icon-frown-alt; }
+.fa-icon-meh-alt:before { content: @fa-icon-meh-alt; }
 .fa-icon-gamepad:before { content: @fa-icon-gamepad; }
-.fa-icon-keyboard:before { content: @fa-icon-keyboard; }
+.fa-icon-keyboard-alt:before { content: @fa-icon-keyboard-alt; }
 .fa-icon-flag-alt:before { content: @fa-icon-flag-alt; }
 .fa-icon-flag-checkered:before { content: @fa-icon-flag-checkered; }
 .fa-icon-terminal:before { content: @fa-icon-terminal; }
@@ -301,7 +302,7 @@
 .fa-icon-eraser:before { content: @fa-icon-eraser; }
 .fa-icon-puzzle-piece:before { content: @fa-icon-puzzle-piece; }
 .fa-icon-microphone:before { content: @fa-icon-microphone; }
-.fa-icon-microphone-off:before { content: @fa-icon-microphone-off; }
+.fa-icon-microphone-slash:before { content: @fa-icon-microphone-slash; }
 .fa-icon-shield:before { content: @fa-icon-shield; }
 .fa-icon-calendar-alt:before { content: @fa-icon-calendar-alt; }
 .fa-icon-fire-extinguisher:before { content: @fa-icon-fire-extinguisher; }
@@ -330,9 +331,12 @@
 .fa-icon-external-link-square:before { content: @fa-icon-external-link-square; }
 .fa-icon-share-square:before { content: @fa-icon-share-square; }
 .fa-icon-compass:before { content: @fa-icon-compass; }
-.fa-icon-collapse-down:before { content: @fa-icon-collapse-down; }
-.fa-icon-collapse-up:before { content: @fa-icon-collapse-up; }
-.fa-icon-expand:before { content: @fa-icon-expand; }
+.fa-icon-toggle-down:before,
+.fa-icon-caret-square-alt-down:before { content: @fa-icon-caret-square-alt-down; }
+.fa-icon-toggle-up:before,
+.fa-icon-caret-square-alt-up:before { content: @fa-icon-caret-square-alt-up; }
+.fa-icon-toggle-right:before,
+.fa-icon-caret-square-alt-right:before { content: @fa-icon-caret-square-alt-right; }
 .fa-icon-euro:before,
 .fa-icon-eur:before { content: @fa-icon-eur; }
 .fa-icon-gbp:before { content: @fa-icon-gbp; }
@@ -361,10 +365,10 @@
 .fa-icon-sort-numeric-desc:before { content: @fa-icon-sort-numeric-desc; }
 .fa-icon-thumbs-up:before { content: @fa-icon-thumbs-up; }
 .fa-icon-thumbs-down:before { content: @fa-icon-thumbs-down; }
-.fa-icon-youtube-sign:before { content: @fa-icon-youtube-sign; }
+.fa-icon-youtube-square:before { content: @fa-icon-youtube-square; }
 .fa-icon-youtube:before { content: @fa-icon-youtube; }
 .fa-icon-xing:before { content: @fa-icon-xing; }
-.fa-icon-xing-sign:before { content: @fa-icon-xing-sign; }
+.fa-icon-xing-square:before { content: @fa-icon-xing-square; }
 .fa-icon-youtube-play:before { content: @fa-icon-youtube-play; }
 .fa-icon-dropbox:before { content: @fa-icon-dropbox; }
 .fa-icon-stack-overflow:before { content: @fa-icon-stack-overflow; }
@@ -390,8 +394,8 @@
 .fa-icon-female:before { content: @fa-icon-female; }
 .fa-icon-male:before { content: @fa-icon-male; }
 .fa-icon-gittip:before { content: @fa-icon-gittip; }
-.fa-icon-sun:before { content: @fa-icon-sun; }
-.fa-icon-moon:before { content: @fa-icon-moon; }
+.fa-icon-sun-alt:before { content: @fa-icon-sun-alt; }
+.fa-icon-moon-alt:before { content: @fa-icon-moon-alt; }
 .fa-icon-archive:before { content: @fa-icon-archive; }
 .fa-icon-bug:before { content: @fa-icon-bug; }
 .fa-icon-vk:before { content: @fa-icon-vk; }
@@ -399,3 +403,7 @@
 .fa-icon-renren:before { content: @fa-icon-renren; }
 .fa-icon-pagelines:before { content: @fa-icon-pagelines; }
 .fa-icon-stack-exchange:before { content: @fa-icon-stack-exchange; }
+.fa-icon-arrow-circle-alt-right:before { content: @fa-icon-arrow-circle-alt-right; }
+.fa-icon-arrow-circle-alt-left:before { content: @fa-icon-arrow-circle-alt-left; }
+.fa-icon-toggle-left:before,
+.fa-icon-caret-square-alt-left:before { content: @fa-icon-caret-square-alt-left; }
diff --git a/less/variables.less b/less/variables.less
index cd7c1a791..47a407647 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -12,7 +12,7 @@
 
 @fa-icon-glass: "\f000";
 @fa-icon-music: "\f001";
-@fa-icon-search: "\f002";
+@fa-icon-magnifying-glass: "\f002";
 @fa-icon-envelope-alt: "\f003";
 @fa-icon-heart: "\f004";
 @fa-icon-star: "\f005";
@@ -24,15 +24,15 @@
 @fa-icon-th-list: "\f00b";
 @fa-icon-check: "\f00c";
 @fa-icon-times: "\f00d";
-@fa-icon-zoom-in: "\f00e";
-@fa-icon-zoom-out: "\f010";
+@fa-icon-magnifying-glass-plus: "\f00e";
+@fa-icon-magnifying-glass-minus: "\f010";
 @fa-icon-power-off: "\f011";
 @fa-icon-signal: "\f012";
 @fa-icon-cog: "\f013";
-@fa-icon-trash: "\f014";
+@fa-icon-trash-alt: "\f014";
 @fa-icon-home: "\f015";
 @fa-icon-file-alt: "\f016";
-@fa-icon-time: "\f017";
+@fa-icon-clock-alt: "\f017";
 @fa-icon-road: "\f018";
 @fa-icon-download: "\f019";
 @fa-icon-arrow-circle-alt-down: "\f01a";
@@ -69,7 +69,7 @@
 @fa-icon-outdent: "\f03b";
 @fa-icon-indent: "\f03c";
 @fa-icon-video-camera: "\f03d";
-@fa-icon-picture: "\f03e";
+@fa-icon-picture-alt: "\f03e";
 @fa-icon-pencil: "\f040";
 @fa-icon-map-marker: "\f041";
 @fa-icon-adjust: "\f042";
@@ -96,7 +96,7 @@
 @fa-icon-check-circle: "\f058";
 @fa-icon-question-circle: "\f059";
 @fa-icon-info-circle: "\f05a";
-@fa-icon-screenshot: "\f05b";
+@fa-icon-crosshairs: "\f05b";
 @fa-icon-times-circle-alt: "\f05c";
 @fa-icon-check-circle-alt: "\f05d";
 @fa-icon-ban: "\f05e";
@@ -115,7 +115,7 @@
 @fa-icon-leaf: "\f06c";
 @fa-icon-fire: "\f06d";
 @fa-icon-eye: "\f06e";
-@fa-icon-eye-closed: "\f070";
+@fa-icon-eye-slash: "\f070";
 @fa-icon-exclamation-triangle: "\f071";
 @fa-icon-plane: "\f072";
 @fa-icon-calendar: "\f073";
@@ -130,7 +130,7 @@
 @fa-icon-folder-open: "\f07c";
 @fa-icon-resize-vertical: "\f07d";
 @fa-icon-resize-horizontal: "\f07e";
-@fa-icon-bar-chart: "\f080";
+@fa-icon-bar-chart-alt: "\f080";
 @fa-icon-twitter-square: "\f081";
 @fa-icon-facebook-square: "\f082";
 @fa-icon-camera-retro: "\f083";
@@ -164,10 +164,10 @@
 @fa-icon-bullhorn: "\f0a1";
 @fa-icon-bell: "\f0f3";
 @fa-icon-certificate: "\f0a3";
-@fa-icon-hand-right: "\f0a4";
-@fa-icon-hand-left: "\f0a5";
-@fa-icon-hand-up: "\f0a6";
-@fa-icon-hand-down: "\f0a7";
+@fa-icon-hand-alt-right: "\f0a4";
+@fa-icon-hand-alt-left: "\f0a5";
+@fa-icon-hand-alt-up: "\f0a6";
+@fa-icon-hand-alt-down: "\f0a7";
 @fa-icon-arrow-circle-left: "\f0a8";
 @fa-icon-arrow-circle-right: "\f0a9";
 @fa-icon-arrow-circle-up: "\f0aa";
@@ -183,9 +183,9 @@
 @fa-icon-cloud: "\f0c2";
 @fa-icon-flask: "\f0c3";
 @fa-icon-scissors: "\f0c4";
-@fa-icon-files: "\f0c5";
+@fa-icon-files-alt: "\f0c5";
 @fa-icon-paperclip: "\f0c6";
-@fa-icon-floppy: "\f0c7";
+@fa-icon-floppy-alt: "\f0c7";
 @fa-icon-square: "\f0c8";
 @fa-icon-reorder: "\f0c9";
 @fa-icon-list-ul: "\f0ca";
@@ -219,7 +219,7 @@
 @fa-icon-sitemap: "\f0e8";
 @fa-icon-umbrella: "\f0e9";
 @fa-icon-clipboard: "\f0ea";
-@fa-icon-lightbulb: "\f0eb";
+@fa-icon-lightbulb-alt: "\f0eb";
 @fa-icon-exchange: "\f0ec";
 @fa-icon-cloud-download: "\f0ed";
 @fa-icon-cloud-upload: "\f0ee";
@@ -238,10 +238,10 @@
 @fa-icon-beer: "\f0fc";
 @fa-icon-h-square: "\f0fd";
 @fa-icon-plus-square: "\f0fe";
-@fa-icon-double-angle-left: "\f100";
-@fa-icon-double-angle-right: "\f101";
-@fa-icon-double-angle-up: "\f102";
-@fa-icon-double-angle-down: "\f103";
+@fa-icon-angle-double-left: "\f100";
+@fa-icon-angle-double-right: "\f101";
+@fa-icon-angle-double-up: "\f102";
+@fa-icon-angle-double-down: "\f103";
 @fa-icon-angle-left: "\f104";
 @fa-icon-angle-right: "\f105";
 @fa-icon-angle-up: "\f106";
@@ -261,11 +261,11 @@
 @fa-icon-folder-open-alt: "\f115";
 @fa-icon-expand-alt: "\f116";
 @fa-icon-collapse-alt: "\f117";
-@fa-icon-smile: "\f118";
-@fa-icon-frown: "\f119";
-@fa-icon-meh: "\f11a";
+@fa-icon-smile-alt: "\f118";
+@fa-icon-frown-alt: "\f119";
+@fa-icon-meh-alt: "\f11a";
 @fa-icon-gamepad: "\f11b";
-@fa-icon-keyboard: "\f11c";
+@fa-icon-keyboard-alt: "\f11c";
 @fa-icon-flag-alt: "\f11d";
 @fa-icon-flag-checkered: "\f11e";
 @fa-icon-terminal: "\f120";
@@ -285,7 +285,7 @@
 @fa-icon-eraser: "\f12d";
 @fa-icon-puzzle-piece: "\f12e";
 @fa-icon-microphone: "\f130";
-@fa-icon-microphone-off: "\f131";
+@fa-icon-microphone-slash: "\f131";
 @fa-icon-shield: "\f132";
 @fa-icon-calendar-alt: "\f133";
 @fa-icon-fire-extinguisher: "\f134";
@@ -314,9 +314,9 @@
 @fa-icon-external-link-square: "\f14c";
 @fa-icon-share-square: "\f14d";
 @fa-icon-compass: "\f14e";
-@fa-icon-collapse-down: "\f150";
-@fa-icon-collapse-up: "\f151";
-@fa-icon-expand: "\f152";
+@fa-icon-caret-square-alt-down: "\f150";
+@fa-icon-caret-square-alt-up: "\f151";
+@fa-icon-caret-square-alt-right: "\f152";
 @fa-icon-eur: "\f153";
 @fa-icon-gbp: "\f154";
 @fa-icon-usd: "\f155";
@@ -335,10 +335,10 @@
 @fa-icon-sort-numeric-desc: "\f163";
 @fa-icon-thumbs-up: "\f164";
 @fa-icon-thumbs-down: "\f165";
-@fa-icon-youtube-sign: "\f166";
+@fa-icon-youtube-square: "\f166";
 @fa-icon-youtube: "\f167";
 @fa-icon-xing: "\f168";
-@fa-icon-xing-sign: "\f169";
+@fa-icon-xing-square: "\f169";
 @fa-icon-youtube-play: "\f16a";
 @fa-icon-dropbox: "\f16b";
 @fa-icon-stack-overflow: "\f16c";
@@ -364,8 +364,8 @@
 @fa-icon-female: "\f182";
 @fa-icon-male: "\f183";
 @fa-icon-gittip: "\f184";
-@fa-icon-sun: "\f185";
-@fa-icon-moon: "\f186";
+@fa-icon-sun-alt: "\f185";
+@fa-icon-moon-alt: "\f186";
 @fa-icon-archive: "\f187";
 @fa-icon-bug: "\f188";
 @fa-icon-vk: "\f189";
@@ -373,4 +373,7 @@
 @fa-icon-renren: "\f18b";
 @fa-icon-pagelines: "\f18c";
 @fa-icon-stack-exchange: "\f18d";
+@fa-icon-arrow-circle-alt-right: "\f18e";
+@fa-icon-arrow-circle-alt-left: "\f190";
+@fa-icon-caret-square-alt-left: "\f191";