Upgrade font-awesome to version 4

app/assets/fonts/fontawesome-webfont.svg

@@ -280,8 +280,8 @@
 <glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
 <glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
 <glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="&#xf116;" horiz-adv-x="1792" />
-<glyph unicode="&#xf117;" horiz-adv-x="1152" d="M928 1152q93 0 158.5 -65.5t65.5 -158.5v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68z M864 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576z" />
+<glyph unicode="&#xf117;" horiz-adv-x="1792" />
 <glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
@@ -310,7 +310,7 @@
 <glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
 <glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
 <glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1708 881l-188 -881h-304l181 849q4 21 1 43q-4 20 -16 35q-10 14 -28 24q-18 9 -40 9h-197l-205 -960h-303l204 960h-304l-205 -960h-304l272 1280h1139q157 0 245 -118q86 -116 52 -281z" />
+<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
 <glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
@@ -342,7 +342,7 @@
 <glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
 <glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
 <glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="&#xf158;" horiz-adv-x="1664" d="M1664 352v-32q0 -132 -94 -226t-226 -94h-128q-132 0 -226 94t-94 226v480h-224q-2 -102 -14.5 -190.5t-30.5 -156t-48.5 -126.5t-57 -99.5t-67.5 -77.5t-69.5 -58.5t-74 -44t-69 -32t-65.5 -25.5q-4 -2 -32 -13q-8 -2 -12 -2q-22 0 -30 20l-71 178q-5 13 0 25t17 17 q7 3 20 7.5t18 6.5q31 12 46.5 18.5t44.5 20t45.5 26t42 32.5t40.5 42.5t34.5 53.5t30.5 68.5t22.5 83.5t17 103t6.5 123h-256q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h1216q14 0 23 -9t9 -23v-160q0 -14 -9 -23t-23 -9h-224v-512q0 -26 19 -45t45 -19h128q26 0 45 19t19 45 v64q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1280 1376v-160q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h960q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf158;" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
 <glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
 <glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
 <glyph unicode="&#xf15b;" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
@@ -390,10 +390,25 @@
 <glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
 <glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
 <glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="&#xf18b;" horiz-adv-x="1920" d="M805 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM453 1176v-344q0 -179 -89.5 -326t-234.5 -217q-129 152 -129 351q0 200 129.5 352t323.5 184zM958 991q-128 -152 -128 -351q0 -201 128 -351q-145 70 -234.5 218t-89.5 328 v341q196 -33 324 -185zM1638 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM1286 1176v-344q0 -179 -91 -326t-237 -217v0q133 154 133 351q0 195 -133 351q129 151 328 185zM1920 640q0 -201 -129 -351q-145 70 -234.5 218 t-89.5 328v341q194 -32 323.5 -184t129.5 -352z" />
+<glyph unicode="&#xf18b;" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-<glyph unicode="&#xf18c;" horiz-adv-x="1792" />
+<glyph unicode="&#xf18c;" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
-<glyph unicode="&#xf18d;" horiz-adv-x="1792" />
+<glyph unicode="&#xf18d;" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
-<glyph unicode="&#xf18e;" horiz-adv-x="1792" />
+<glyph unicode="&#xf18e;" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf190;" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf191;" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf192;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
+<glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf197;" horiz-adv-x="1792" />
+<glyph unicode="&#xf198;" horiz-adv-x="1792" />
+<glyph unicode="&#xf199;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19a;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19b;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19c;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19d;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19e;" horiz-adv-x="1792" />
 <glyph unicode="&#xf500;" horiz-adv-x="1792" />
 </font>
 </defs></svg> 

app/assets/javascripts/admin/models/admin_user.js

@@ -48,7 +48,7 @@ Discourse.AdminUser = Discourse.User.extend({
         user.set('can_delete_all_posts', true);
       }
     }, {
-      "label": '<i class="icon icon-warning-sign"></i> ' + I18n.t("admin.user.delete_all_posts"),
+      "label": '<i class="fa fa-exclamation-triangle"></i> ' + I18n.t("admin.user.delete_all_posts"),
       "class": "btn btn-danger",
       "callback": function() {
         Discourse.ajax("/admin/users/" + (user.get('id')) + "/delete_all_posts", {type: 'PUT'}).then(function(result){
@@ -283,13 +283,13 @@ Discourse.AdminUser = Discourse.User.extend({
       "class": "cancel",
       "link":  true
     }, {
-      "label": '<i class="icon icon-warning-sign"></i> ' + I18n.t('admin.user.delete_dont_block'),
+      "label": '<i class="fa fa-exclamation-triangle"></i> ' + I18n.t('admin.user.delete_dont_block'),
       "class": "btn",
       "callback": function(){
         performDestroy(false);
       }
     }, {
-      "label": '<i class="icon icon-warning-sign"></i> ' + I18n.t('admin.user.delete_and_block'),
+      "label": '<i class="fa fa-exclamation-triangle"></i> ' + I18n.t('admin.user.delete_and_block'),
       "class": "btn",
       "callback": function(){
         performDestroy(true);
@@ -307,7 +307,7 @@ Discourse.AdminUser = Discourse.User.extend({
       "class": "cancel",
       "link":  true
     }, {
-      "label": '<i class="icon icon-warning-sign"></i> ' + I18n.t("flagging.yes_delete_spammer"),
+      "label": '<i class="fa fa-exclamation-triangle"></i> ' + I18n.t("flagging.yes_delete_spammer"),
       "class": "btn btn-danger",
       "callback": function() {
         Discourse.ajax("/admin/users/" + user.get('id') + '.json', {

app/assets/javascripts/admin/models/report.js

@@ -92,9 +92,9 @@ Discourse.Report = Discourse.Model.extend({
   icon: function() {
     switch( this.get('type') ) {
     case 'flags':
-      return 'icon-flag';
+      return 'fa-flag';
     case 'likes':
-      return 'icon-heart';
+      return 'fa-heart';
     default:
       return null;
     }

app/assets/javascripts/admin/models/screened_ip_address.js

@@ -25,11 +25,11 @@ Discourse.ScreenedIpAddress = Discourse.Model.extend({
   }.property('action_name'),
 
   blockIcon: function() {
-    return 'icon-ban-circle';
+    return 'fa-ban';
   }.property(),
 
   doNothingIcon: function() {
-    return 'icon-ok';
+    return 'fa-check';
   }.property(),
 
   save: function() {

app/assets/javascripts/admin/templates/commits.js.handlebars

@@ -1,7 +1,7 @@
 <div class="commits-widget">
   <div class="header" {{action "goToGithub"}}>
     <h1>
-      <i class="icon icon-github"></i>
+      <i class="fa fa-github"></i>
       {{i18n admin.commits.latest_changes}}
     </h1>
   </div>

app/assets/javascripts/admin/templates/dashboard.js.handlebars

@@ -1,7 +1,7 @@
 <div class="dashboard-left">
   {{#if foundProblems}}
     <div class="dashboard-stats detected-problems">
-      <div class="look-here"><i class="icon icon-warning-sign"></i></div>
+      <div class="look-here"><i class="fa fa-exclamation-triangle"></i></div>
       <div class="problem-messages">
         <p {{bindAttr class="loadingProblems:invisible"}}>
           {{i18n admin.dashboard.problems_found}}
@@ -13,7 +13,7 @@
         </p>
         <p class="actions">
           <small>{{i18n admin.dashboard.last_checked}}: {{problemsTimestamp}}</small>
-          <button {{action refreshProblems}} class="btn btn-small"><i class="icon icon-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
+          <button {{action refreshProblems}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
         </p>
       </div>
       <div class="clearfix"></div>
@@ -25,7 +25,7 @@
         <div class="problem-messages">
           <p>
             {{i18n admin.dashboard.no_problems}}
-            <button {{action refreshProblems}} class="btn btn-small"><i class="icon icon-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
+            <button {{action refreshProblems}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
           </p>
         </div>
         <div class="clearfix"></div>
@@ -130,15 +130,15 @@
   <div class="dashboard-stats totals">
     <table>
       <tr>
-        <td class="title"><i class='icon icon-trophy'></i> {{i18n admin.dashboard.admins}}</td>
+        <td class="title"><i class='fa fa-trophy'></i> {{i18n admin.dashboard.admins}}</td>
         <td class="value">{{#link-to 'adminUsersList.admins'}}{{admins}}{{/link-to}}</td>
-        <td class="title"><i class='icon icon-ban-circle'></i> {{i18n admin.dashboard.suspended}}</td>
+        <td class="title"><i class='fa fa-ban'></i> {{i18n admin.dashboard.suspended}}</td>
         <td class="value">{{#link-to 'adminUsersList.suspended'}}{{suspended}}{{/link-to}}</td>
       </tr>
       <tr>
-        <td class="title"><i class='icon icon-magic'></i> {{i18n admin.dashboard.moderators}}</td>
+        <td class="title"><i class='fa fa-magic'></i> {{i18n admin.dashboard.moderators}}</td>
         <td class="value">{{#link-to 'adminUsersList.moderators'}}{{moderators}}{{/link-to}}</td>
-        <td class="title"><i class='icon icon-ban-circle'></i> {{i18n admin.dashboard.blocked}}</td>
+        <td class="title"><i class='fa fa-ban'></i> {{i18n admin.dashboard.blocked}}</td>
         <td class="value">{{#link-to 'adminUsersList.blocked'}}{{blocked}}{{/link-to}}</td>
       </tr>
     </table>
@@ -173,7 +173,7 @@
     <table class="table table-condensed table-hover">
       <thead>
         <tr>
-          <th class="title" title="{{i18n admin.dashboard.private_messages_title}}"><i class="icon icon-envelope"></i> {{i18n admin.dashboard.private_messages_short}}</th>
+          <th class="title" title="{{i18n admin.dashboard.private_messages_title}}"><i class="fa fa-envelope"></i> {{i18n admin.dashboard.private_messages_short}}</th>
           <th>{{i18n admin.dashboard.reports.today}}</th>
           <th>{{i18n admin.dashboard.reports.yesterday}}</th>
           <th>{{i18n admin.dashboard.reports.last_7_days}}</th>

app/assets/javascripts/admin/templates/flags.js.handlebars

@@ -28,7 +28,7 @@
 
             <td class='user'>{{#if flaggedPost.user}}{{#link-to 'adminUser' flaggedPost.user}}{{avatar flaggedPost.user imageSize="small"}}{{/link-to}}{{/if}}</td>
 
-            <td class='excerpt'>{{#if flaggedPost.topicHidden}}<i title='{{i18n topic_statuses.invisible.help}}' class='icon icon-eye-close'></i> {{/if}}<h3><a href='{{unbound flaggedPost.url}}'>{{flaggedPost.title}}</a></h3><br>{{{flaggedPost.excerpt}}}
+            <td class='excerpt'>{{#if flaggedPost.topicHidden}}<i title='{{i18n topic_statuses.invisible.help}}' class='fa fa-eye-slash'></i> {{/if}}<h3><a href='{{unbound flaggedPost.url}}'>{{flaggedPost.title}}</a></h3><br>{{{flaggedPost.excerpt}}}
             </td>
 
             <td class='flaggers'>
@@ -59,7 +59,7 @@
                     {{#unless bySystemUser}}
                       {{#link-to 'adminUser' user}}{{avatar user imageSize="small"}}{{/link-to}}
                       {{message}}
-                      <a href="{{unbound permalink}}"><button class='btn'><i class="icon-reply"></i> {{i18n admin.flags.view_message}}</button></a>
+                      <a href="{{unbound permalink}}"><button class='btn'><i class="fa fa-reply"></i> {{i18n admin.flags.view_message}}</button></a>
                     {{else}}
                       <b>{{i18n admin.flags.system}}</b>:
                       {{message}}
@@ -75,18 +75,18 @@
               <td colspan="4" class="action">
               {{#if adminActiveFlagsView}}
                 {{#if flaggedPost.postHidden}}
-                  <button title='{{i18n admin.flags.disagree_unhide_title}}' class='btn' {{action disagreeFlags flaggedPost}}><i class="icon-thumbs-down"></i>  {{i18n admin.flags.disagree_unhide}}</button>
+                  <button title='{{i18n admin.flags.disagree_unhide_title}}' class='btn' {{action disagreeFlags flaggedPost}}><i class="fa fa-thumbs-o-down"></i>  {{i18n admin.flags.disagree_unhide}}</button>
-                  <button title='{{i18n admin.flags.defer_title}}' class='btn' {{action deferFlags flaggedPost}}><i class="icon-external-link"></i> {{i18n admin.flags.defer}}</button>
+                  <button title='{{i18n admin.flags.defer_title}}' class='btn' {{action deferFlags flaggedPost}}><i class="fa fa-external-link"></i> {{i18n admin.flags.defer}}</button>
                 {{else}}
-                  <button title='{{i18n admin.flags.agree_hide_title}}' class='btn' {{action agreeFlags flaggedPost}}><i class="icon-thumbs-up"></i> {{i18n admin.flags.agree_hide}}</button>
+                  <button title='{{i18n admin.flags.agree_hide_title}}' class='btn' {{action agreeFlags flaggedPost}}><i class="fa fa-thumbs-o-up"></i> {{i18n admin.flags.agree_hide}}</button>
-                  <button title='{{i18n admin.flags.disagree_title}}' class='btn' {{action disagreeFlags flaggedPost}}><i class="icon-thumbs-down"></i> {{i18n admin.flags.disagree}}</button>
+                  <button title='{{i18n admin.flags.disagree_title}}' class='btn' {{action disagreeFlags flaggedPost}}><i class="fa fa-thumbs-o-down"></i> {{i18n admin.flags.disagree}}</button>
                 {{/if}}
 
                 {{#if flaggedPost.canDeleteAsSpammer}}
-                  <button title='{{i18n admin.flags.delete_spammer_title}}' class="btn" {{action deleteSpammer flaggedPost}}><i class="icon icon-warning-sign"></i> {{i18n flagging.delete_spammer}}</button>
+                  <button title='{{i18n admin.flags.delete_spammer_title}}' class="btn" {{action deleteSpammer flaggedPost}}><i class="fa fa-exclamation-triangle"></i> {{i18n flagging.delete_spammer}}</button>
                 {{/if}}
 
-                <button title='{{i18n admin.flags.delete_post_title}}' class='btn' {{action deletePost flaggedPost}}><i class="icon-trash"></i> {{i18n admin.flags.delete_post}}</button>
+                <button title='{{i18n admin.flags.delete_post_title}}' class='btn' {{action deletePost flaggedPost}}><i class="fa fa-trash-o"></i> {{i18n admin.flags.delete_post}}</button>
               {{/if}}
               </td>
           </tr>

app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.js.handlebars

@@ -6,7 +6,7 @@
   {{/if}}
 </div>
 <div class="col action">
-  <i {{bindAttr class=":icon actionIcon"}}></i>
+  <i {{bindAttr class=":fa actionIcon"}}></i>
   {{actionName}}
 </div>
 <div class="col match_count">{{match_count}}</div>
@@ -18,12 +18,12 @@
 <div class="col created_at">{{unboundAgeWithTooltip created_at}}</div>
 <div class="col actions">
   {{#unless editing}}
-    <button class="btn btn-danger" {{action destroy this}}><i class="icon icon-trash"></i> {{i18n admin.logs.delete}}</button>
+    <button class="btn btn-danger" {{action destroy this}}><i class="fa fa-trash-o"></i> {{i18n admin.logs.delete}}</button>
-    <button class="btn" {{action edit this}}><i class="icon icon-pencil"></i> {{i18n admin.logs.edit}}</button>
+    <button class="btn" {{action edit this}}><i class="fa fa-pencil"></i> {{i18n admin.logs.edit}}</button>
     {{#if isBlocked}}
-      <button class="btn" {{action allow this}}><i {{bindAttr class=":icon doNothingIcon"}}></i> {{i18n admin.logs.screened_ips.actions.do_nothing}}</button>
+      <button class="btn" {{action allow this}}><i {{bindAttr class=":fa doNothingIcon"}}></i> {{i18n admin.logs.screened_ips.actions.do_nothing}}</button>
     {{else}}
-      <button class="btn" {{action block this}}><i {{bindAttr class=":icon blockIcon"}}></i> {{i18n admin.logs.screened_ips.actions.block}}</button>
+      <button class="btn" {{action block this}}><i {{bindAttr class=":fa blockIcon"}}></i> {{i18n admin.logs.screened_ips.actions.block}}</button>
     {{/if}}
   {{else}}
     <button class="btn" {{action save this}}>{{i18n admin.logs.save}}</button>

app/assets/javascripts/admin/templates/logs/staff_action_logs.js.handlebars

@@ -5,25 +5,25 @@
   {{#if actionFilter}}
     <a {{action clearFilter "action_name"}} class="filter">
       <span class="label">{{i18n admin.logs.action}}</span>: {{actionFilter}}
-      <i class="icon icon-remove-sign"></i>
+      <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
   {{#if filters.acting_user}}
     <a {{action clearFilter "acting_user"}} class="filter">
       <span class="label">{{i18n admin.logs.staff_actions.staff_user}}</span>: {{filters.acting_user}}
-      <i class="icon icon-remove-sign"></i>
+      <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
   {{#if filters.target_user}}
     <a {{action clearFilter "target_user"}} class="filter">
       <span class="label">{{i18n admin.logs.staff_actions.target_user}}</span>: {{filters.target_user}}
-      <i class="icon icon-remove-sign"></i>
+      <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
   {{#if filters.subject}}
     <a {{action clearFilter "subject"}} class="filter">
       <span class="label">{{i18n admin.logs.staff_actions.subject}}</span>: {{filters.subject}}
-      <i class="icon icon-remove-sign"></i>
+      <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
 </div>

app/assets/javascripts/admin/templates/modal/admin_suspend_user.js.handlebars

@@ -10,6 +10,6 @@
   </form>
 </div>
 <div class="modal-footer">
-  <button class='btn btn-danger' {{action suspend}}><i class='icon icon-ban-circle'></i>{{i18n admin.user.suspend}}</button>
+  <button class='btn btn-danger' {{action suspend}}><i class='fa fa-ban'></i>{{i18n admin.user.suspend}}</button>
   <a {{action closeModal}}>{{i18n cancel}}</a>
 </div>

app/assets/javascripts/admin/templates/reports/summed_counts_report.js.handlebars

@@ -1,13 +1,13 @@
 <tr>
   <td class="title">
     {{#if icon}}
-      <i {{bindAttr class=":icon icon"}}></i>
+      <i {{bindAttr class=":fa icon"}}></i>
     {{/if}}
     <a {{bindAttr href="reportUrl"}}>{{title}}</a>
   </td>
   <td class="value">{{todayCount}}</td>
-  <td {{bindAttr class=":value yesterdayTrend"}} {{bindAttr title="yesterdayCountTitle"}}>{{yesterdayCount}} <i class="icon up icon-caret-up"></i><i class="icon down icon-caret-down"></i></td>
+  <td {{bindAttr class=":value yesterdayTrend"}} {{bindAttr title="yesterdayCountTitle"}}>{{yesterdayCount}} <i class="fa up fa-caret-up"></i><i class="fa down fa-caret-down"></i></td>
-  <td {{bindAttr class=":value sevenDayTrend"}} {{bindAttr title="sevenDayCountTitle"}}>{{lastSevenDaysCount}} <i class="icon up icon-caret-up"></i><i class="icon down icon-caret-down"></i></td>
+  <td {{bindAttr class=":value sevenDayTrend"}} {{bindAttr title="sevenDayCountTitle"}}>{{lastSevenDaysCount}} <i class="fa up fa-caret-up"></i><i class="fa down fa-caret-down"></i></td>
-  <td {{bindAttr class=":value thirtyDayTrend"}} {{bindAttr title="thirtyDayCountTitle"}}>{{lastThirtyDaysCount}} <i class="icon up icon-caret-up"></i><i class="icon down icon-caret-down"></i></td>
+  <td {{bindAttr class=":value thirtyDayTrend"}} {{bindAttr title="thirtyDayCountTitle"}}>{{lastThirtyDaysCount}} <i class="fa up fa-caret-up"></i><i class="fa down fa-caret-down"></i></td>
   <td class="value">{{total}}</td>
 </tr>

app/assets/javascripts/admin/templates/site_settings.js.handlebars

@@ -19,7 +19,7 @@
           {{#if filtered}}
             <span class="count">({{category.siteSettings.length}})</span>
           {{/if}}
-          <span class='icon-chevron-right'></span>
+          <span class='fa fa-chevron-right'></span>
         {{/link-to}}
       </li>
     {{/each}}

app/assets/javascripts/admin/templates/site_settings/setting_enum.js.handlebars

@@ -7,8 +7,8 @@
 </div>
 {{#if dirty}}
   <div class='setting-controls'>
-    <button class='btn ok' {{action save this}}><i class='icon-ok'></i></button>
+    <button class='btn ok' {{action save this}}><i class='fa fa-check'></i></button>
-    <button class='btn cancel' {{action cancel this}}><i class='icon-remove'></i></button>
+    <button class='btn cancel' {{action cancel this}}><i class='fa fa-times'></i></button>
   </div>
 {{else}}
   {{#if overridden}}

app/assets/javascripts/admin/templates/site_settings/setting_string.js.handlebars

@@ -7,8 +7,8 @@
 </div>
 {{#if dirty}}
   <div class='setting-controls'>
-    <button class='btn ok' {{action save this}}><i class='icon-ok'></i></button>
+    <button class='btn ok' {{action save this}}><i class='fa fa-check'></i></button>
-    <button class='btn cancel' {{action cancel this}}><i class='icon-remove'></i></button>
+    <button class='btn cancel' {{action cancel this}}><i class='fa fa-times'></i></button>
   </div>
 {{else}}
   {{#if overridden}}

app/assets/javascripts/admin/templates/user.js.handlebars

@@ -5,12 +5,12 @@
     <div class='value'>{{username}}</div>
     <div class='controls'>
       {{#link-to 'userActivity' model class="btn"}}
-        <i class='icon icon-user'></i>
+        <i class='fa fa-user'></i>
         {{i18n admin.user.show_public_profile}}
       {{/link-to}}
       {{#if can_impersonate}}
           <button class='btn' {{action impersonate target="content"}}>
-            <i class='icon icon-screenshot'></i>
+            <i class='fa fa-crosshairs'></i>
             {{i18n admin.user.impersonate}}
           </button>
       {{/if}}
@@ -84,7 +84,7 @@
         {{else}}
           {{#if can_approve}}
             <button class='btn' {{action approve target="content"}}>
-              <i class='icon icon-ok'></i>
+              <i class='fa fa-check'></i>
               {{i18n admin.user.approve}}
             </button>
           {{/if}}
@@ -111,13 +111,13 @@
       {{else}}
         {{#if can_send_activation_email}}
           <button class='btn' {{action sendActivationEmail target="content"}}>
-            <i class='icon icon-envelope'></i>
+            <i class='fa fa-envelope'></i>
             {{i18n admin.user.send_activation_email}}
           </button>
         {{/if}}
         {{#if can_activate}}
           <button class='btn' {{action activate target="content"}}>
-            <i class='icon icon-ok'></i>
+            <i class='fa fa-check'></i>
             {{i18n admin.user.activate}}
           </button>
         {{/if}}
@@ -150,13 +150,13 @@
     <div class='controls'>
       {{#if can_revoke_admin}}
         <button class='btn' {{action revokeAdmin target="content"}}>
-          <i class='icon icon-trophy'></i>
+          <i class='fa fa-trophy'></i>
           {{i18n admin.user.revoke_admin}}
         </button>
       {{/if}}
       {{#if can_grant_admin}}
         <button class='btn' {{action grantAdmin target="content"}}>
-          <i class='icon icon-trophy'></i>
+          <i class='fa fa-trophy'></i>
           {{i18n admin.user.grant_admin}}
         </button>
       {{/if}}
@@ -169,13 +169,13 @@
     <div class='controls'>
       {{#if can_revoke_moderation}}
         <button class='btn' {{action revokeModeration target="content"}}>
-          <i class='icon icon-magic'></i>
+          <i class='fa fa-magic'></i>
           {{i18n admin.user.revoke_moderation}}
         </button>
       {{/if}}
       {{#if can_grant_moderation}}
         <button class='btn' {{action grantModeration target="content"}}>
-          <i class='icon icon-magic'></i>
+          <i class='fa fa-magic'></i>
           {{i18n admin.user.grant_moderation}}
         </button>
       {{/if}}
@@ -191,8 +191,8 @@
     <div class="controls">
     {{#if dirty}}
       <div>
-      <button class='btn ok' {{action saveTrustLevel target="content"}}><i class='icon-ok'></i></button>
+      <button class='btn ok' {{action saveTrustLevel target="content"}}><i class='fa fa-check'></i></button>
-      <button class='btn cancel' {{action restoreTrustLevel target="content"}}><i class='icon-remove'></i></button>
+      <button class='btn cancel' {{action restoreTrustLevel target="content"}}><i class='fa fa-times'></i></button>
       </div>
     {{/if}}
     </div>
@@ -204,7 +204,7 @@
     <div class='controls'>
     {{#if isSuspended}}
       <button class='btn btn-danger' {{action unsuspend target="content"}}>
-        <i class='icon icon-ban-circle'></i>
+        <i class='fa fa-ban'></i>
         {{i18n admin.user.unsuspend}}
       </button>
       {{suspendDuration}}
@@ -212,7 +212,7 @@
     {{else}}
       {{#if canSuspend}}
         <button class='btn btn-danger' {{action showSuspendModal this}}>
-          <i class='icon icon-ban-circle'></i>
+          <i class='fa fa-ban'></i>
           {{i18n admin.user.suspend}}
         </button>
         {{i18n admin.user.suspended_explanation}}
@@ -241,7 +241,7 @@
     <div class='controls'>
       {{#if blocked}}
         <button class='btn' {{action unblock target="content"}}>
-          <i class='icon icon-thumbs-up'></i>
+          <i class='fa fa-thumbs-o-up'></i>
           {{i18n admin.user.unblock}}
         </button>
         {{i18n admin.user.block_explanation}}
@@ -279,7 +279,7 @@
     <div class='controls'>
       {{#if can_delete_all_posts}}
         <button class='btn btn-danger' {{action deleteAllPosts target="content"}}>
-          <i class='icon icon-trash'></i>
+          <i class='fa fa-trash-o'></i>
           {{i18n admin.user.delete_all_posts}}
         </button>
       {{/if}}
@@ -314,7 +314,7 @@
 <section>
   <hr/>
   <button class="btn btn-danger pull-right" {{action destroy target="content"}} {{bindAttr disabled="deleteForbidden"}} {{bindAttr title="deleteButtonTitle"}}>
-    <i class="icon icon-warning-sign"></i>
+    <i class="fa fa-exclamation-triangle"></i>
     {{i18n admin.user.delete}}
   </button>
 </section>

app/assets/javascripts/admin/templates/users_list.js.handlebars

@@ -83,8 +83,8 @@
             </td>
             {{/if}}
             <td>
-              {{#if admin}}<i class="icon-trophy" title="{{i18n admin.title}}"></i>{{/if}}
+              {{#if admin}}<i class="fa fa-trophy" title="{{i18n admin.title}}"></i>{{/if}}
-              {{#if moderator}}<i class="icon-magic" title="{{i18n admin.moderator}}"></i>{{/if}}
+              {{#if moderator}}<i class="fa fa-magic" title="{{i18n admin.moderator}}"></i>{{/if}}
             <td>
           </tr>
         {{/each}}

app/assets/javascripts/discourse/components/categorydrop_component.js

@@ -11,8 +11,8 @@ Discourse.CategoryDropComponent = Ember.Component.extend({
   tagName: 'li',
 
   iconClass: function() {
-    if (this.get('expanded')) { return "icon icon-caret-down"; }
+    if (this.get('expanded')) { return "fa fa-caret-down"; }
-    return "icon icon-caret-right";
+    return "fa fa-caret-right";
   }.property('expanded'),
 
   allCategoriesUrl: function() {

app/assets/javascripts/discourse/components/sortable_heading_component.js

@@ -19,7 +19,7 @@ Discourse.SortableHeadingComponent = Ember.Component.extend({
     var sortable = this.get('sortable');
 
     if (sortable && this.get('sortBy') === this.get('sortOrder.order')) {
-      return this.get('sortOrder.descending') ? 'icon-chevron-down' : 'icon-chevron-up';
+      return this.get('sortOrder.descending') ? 'fa fa-chevron-down' : 'fa fa-chevron-up';
     }
   }.property('sortable', 'sortOrder.order', 'sortOrder.descending'),
 

app/assets/javascripts/discourse/components/topic_map_component.js

@@ -23,7 +23,7 @@ Discourse.TopicMapComponent = Ember.Component.extend({
   },
 
   toggleMapClass: function() {
-    return this.get('mapCollapsed') ? 'icon-chevron-down' : 'icon-chevron-up';
+    return this.get('mapCollapsed') ? 'fa fa-chevron-down' : 'fa fa-chevron-up';
   }.property('mapCollapsed'),
 
   showAllLinksControls: function() {

app/assets/javascripts/discourse/components/topic_status_component.js

@@ -19,7 +19,7 @@ Discourse.TopicStatusComponent = Ember.Component.extend({
         renderIconIf = function(conditionProp, name, key) {
       if (!self.get(conditionProp)) { return; }
       var title = I18n.t("topic_statuses." + key + ".help");
-      buffer.push("<span title='" + title + "' class='topic-status'><i class='icon icon-" + name + "'></i></span>");
+      buffer.push("<span title='" + title + "' class='topic-status'><i class='fa fa-" + name + "'></i></span>");
     };
 
     // Allow a plugin to add a custom icon to a topic

app/assets/javascripts/discourse/lib/autocomplete.js

@@ -93,7 +93,7 @@ $.fn.autocomplete = function(options) {
       // dump what we have in single mode, just in case
       inputSelectedItems = [];
     }
-    var d = $("<div class='item'><span>" + (transformed || item) + "<a href='#'><i class='icon-remove'></i></a></span></div>");
+    var d = $("<div class='item'><span>" + (transformed || item) + "<a href='#'><i class='fa fa-times'></i></a></span></div>");
     var prev = me.parent().find('.item:last');
     if (prev.length === 0) {
       me.parent().prepend(d);

app/assets/javascripts/discourse/models/share_link.js

@@ -59,10 +59,10 @@ Discourse.ShareLink.reopenClass({
   },
 
   iconClasses: {
-    twitter: 'icon-twitter',
+    twitter: 'fa-twitter',
-    facebook: 'icon-facebook-sign',
+    facebook: 'fa-facebook-square',
-    'google+': 'icon-google-plus',
+    'google+': 'fa-google-plus',
-    email: 'icon-envelope'
+    email: 'fa-envelope'
   },
 
   popupHeights: {

app/assets/javascripts/discourse/models/user.js

@@ -66,11 +66,11 @@ Discourse.User = Discourse.Model.extend({
     var desc;
     if(this.get('admin')) {
       desc = I18n.t('user.admin', {user: this.get("name")});
-      return '<i class="icon icon-trophy" title="' + desc +  '" alt="' + desc + '"></i>';
+      return '<i class="fa fa-trophy" title="' + desc +  '" alt="' + desc + '"></i>';
     }
     if(this.get('moderator')){
       desc = I18n.t('user.moderator', {user: this.get("name")});
-      return '<i class="icon icon-magic" title="' + desc +  '" alt="' + desc + '"></i>';
+      return '<i class="fa fa-magic" title="' + desc +  '" alt="' + desc + '"></i>';
     }
     return null;
   }.property('admin','moderator'),

app/assets/javascripts/discourse/models/user_action.js

@@ -74,7 +74,7 @@ Discourse.UserAction = Discourse.Model.extend({
     var descriptionKey = this.get('descriptionKey');
     if (!descriptionKey) { return; }
 
-    var icon = this.get('isPM') ? '<i class="icon icon-envelope" title="{{i18n user.stream.private_message}}"></i>' : '';
+    var icon = this.get('isPM') ? '<i class="fa fa-envelope" title="{{i18n user.stream.private_message}}"></i>' : '';
 
     return new Handlebars.SafeString(icon + " " + I18n.t("user_action." + descriptionKey, {
       userUrl: this.get('userUrl'),
@@ -131,10 +131,10 @@ Discourse.UserAction = Discourse.Model.extend({
     var groups = this.get("childGroups");
     if (!groups) {
       groups = {
-        likes: Discourse.UserActionGroup.create({ icon: "icon-heart" }),
+        likes: Discourse.UserActionGroup.create({ icon: "fa-heart" }),
-        stars: Discourse.UserActionGroup.create({ icon: "icon-star" }),
+        stars: Discourse.UserActionGroup.create({ icon: "fa-star" }),
-        edits: Discourse.UserActionGroup.create({ icon: "icon-pencil" }),
+        edits: Discourse.UserActionGroup.create({ icon: "fa-pencil" }),
-        bookmarks: Discourse.UserActionGroup.create({ icon: "icon-bookmark" })
+        bookmarks: Discourse.UserActionGroup.create({ icon: "fa-bookmark" })
       };
     }
     this.set("childGroups", groups);

app/assets/javascripts/discourse/templates/components/auto-close-form.js.handlebars

@@ -1,6 +1,6 @@
 <div class="auto-close-fields">
   <div>
-    <i class="icon icon-time"></i>
+    <i class="fa fa-clock-o"></i>
     {{label}}
     {{textField value=autoCloseTime}}
     {{i18n composer.auto_close_units}}

app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars

@@ -34,7 +34,7 @@
               <a href="{{unbound topic.lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="new_posts"}}'>{{unbound topic.new_posts}}</a>
             {{/if}}
             {{#if topic.unseen}}
-              <a href="{{unbound topic.lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
+              <a href="{{unbound topic.lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='fa fa-asterisk'></i></a>
             {{/if}}
           </td>
           <td class="category">
@@ -44,7 +44,7 @@
 
           <td class='num likes'>
             {{#if topic.like_count}}
-              <a href='{{unbound topic.url}}{{#if topic.has_summary}}?filter=summary{{/if}}'>{{unbound topic.like_count}} <i class='icon-heart'></i></a>
+              <a href='{{unbound topic.url}}{{#if topic.has_summary}}?filter=summary{{/if}}'>{{unbound topic.like_count}} <i class='fa fa-heart'></i></a>
             {{/if}}
           </td>
 

app/assets/javascripts/discourse/templates/components/home-logo.js.handlebars

@@ -3,7 +3,7 @@
     {{#if smallLogoUrl}}
       <img class="logo-small" src="{{unbound smallLogoUrl}}" width="33" height="33">
     {{else}}
-      <i class="icon-home"></i>
+      <i class="fa fa-home"></i>
     {{/if}}
   {{else}}
     {{#if bigLogoUrl}}

app/assets/javascripts/discourse/templates/components/private-message-map.js.handlebars

@@ -1,4 +1,4 @@
-<h3><i class='icon icon-envelope'></i> {{i18n private_message_info.title}}</h3>
+<h3><i class='fa fa-envelope'></i> {{i18n private_message_info.title}}</h3>
 <div class='participants clearfix'>
   {{#groupedEach details.allowed_groups}}
     <div class='user group'>
@@ -14,7 +14,7 @@
         {{unbound username}}
       {{/link-to}}
       {{#if view.details.can_remove_allowed_users}}
-        <a class='remove-invited' {{action removeAllowedUser this}}><i class="icon-remove"></i></a>
+        <a class='remove-invited' {{action removeAllowedUser this}}><i class="fa fa-times"></i></a>
       {{/if}}
     </div>
   {{/groupedEach}}

app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars

@@ -1,6 +1,6 @@
 <nav class='buttons'>
   <button class='btn' {{action toggleMap}} title="{{i18n topic.toggle_information}}">
-    <i {{bindAttr class=":icon toggleMapClass"}}></i>
+    <i {{bindAttr class=":fa toggleMapClass"}}></i>
   </button>
 </nav>
 
@@ -35,7 +35,7 @@
     {{#if topic.like_count}}
       <li class='secondary'>
         <h4>{{i18n likes}}</h4>
-        <i class='icon icon-heart'></i> {{number topic.like_count}}
+        <i class='fa fa-heart'></i> {{number topic.like_count}}
       </li>
     {{/if}}
     {{#if details.links.length}}
@@ -63,7 +63,7 @@
               <span class='badge badge-notification clicks' title='{{i18n topic_map.clicks}}'>{{clicks}}</span>
               <a href="{{unbound url}}" target="_blank" class='topic-link track-link' data-user-id="{{unbound user_id}}" data-ignore-post-id="true" title="{{unbound url}}">
                 {{#if title}}{{title}}{{else}}{{shortenUrl url}}{{/if}}
-                {{#unless internal}}<i class='icon-external-link'></i>{{/unless}}
+                {{#unless internal}}<i class='fa fa-external-link'></i>{{/unless}}
               </a>
             </li>
           {{/groupedEach}}

app/assets/javascripts/discourse/templates/composer.js.handlebars

@@ -48,7 +48,7 @@
                 <button class='btn' {{action showOptions}}>{{i18n topic.options}}</button>
               {{/if}}
               {{#if model.showAdminOptions}}
-                <button {{action toggleAdminOptions target="view"}} class="btn no-text show-admin-options" title='{{i18n composer.admin_options_title}}'><i class="icon icon-wrench"></i></button>
+                <button {{action toggleAdminOptions target="view"}} class="btn no-text show-admin-options" title='{{i18n composer.admin_options_title}}'><i class="fa fa-wrench"></i></button>
               {{/if}}
             {{/unless}}
           </div>

app/assets/javascripts/discourse/templates/composer/education.js.handlebars

@@ -1,2 +1,2 @@
-<a href='#' {{action closeMessage this}} class='close'><i class='icon icon-remove-sign'></i></a>
+<a href='#' {{action closeMessage this}} class='close'><i class='fa fa-times-circle'></i></a>
 {{{body}}}

app/assets/javascripts/discourse/templates/composer/similar_topics.js.handlebars

@@ -1,4 +1,4 @@
-<a href='#' {{action closeMessage this}} class='close'><i class='icon icon-remove-sign'></i></a>
+<a href='#' {{action closeMessage this}} class='close'><i class='fa fa-times-circle'></i></a>
 <h3>{{i18n composer.similar_topics}}<h3>
 
 <ul class='topics'>

app/assets/javascripts/discourse/templates/embedded_post.js.handlebars

@@ -10,9 +10,9 @@
   <div class='span11 topic-body'>
     <div class="topic-meta-data-inside">
       <div class='post-info post-date'>{{unboundAgeWithTooltip created_at}}</div>
-      {{#if view.parentView.previousPost}}<a href='{{unbound url}}' class="post-info arrow" title="{{i18n topic.jump_reply_up}}"><i class='icon icon-arrow-up'></i></a>{{/if}}
+      {{#if view.parentView.previousPost}}<a href='{{unbound url}}' class="post-info arrow" title="{{i18n topic.jump_reply_up}}"><i class='fa fa-arrow-up'></i></a>{{/if}}
     </div>
     {{{unbound cooked}}}
-    {{#unless view.parentView.previousPost}}<a href='{{unbound url}}' class="arrow" title="{{i18n topic.jump_reply_down}}"><i class='icon icon-arrow-down'></i></a>{{/unless}}
+    {{#unless view.parentView.previousPost}}<a href='{{unbound url}}' class="arrow" title="{{i18n topic.jump_reply_down}}"><i class='fa fa-arrow-down'></i></a>{{/unless}}
   </div>
 </div>

app/assets/javascripts/discourse/templates/featured_topics.js.handlebars

@@ -35,7 +35,7 @@
             <a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="new_posts"}}'>{{unbound new_posts}}</a>
           {{/if}}
           {{#if unseen}}
-            <a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
+            <a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='fa fa-asterisk'></i></a>
           {{/if}}
 
           {{#if hasExcerpt}}

app/assets/javascripts/discourse/templates/header.js.handlebars

@@ -39,7 +39,7 @@
       <ul class='icons clearfix'>
         <li class='notifications'>
           {{#if currentUser}}
-            <a class='icon' href="#" {{action showNotifications target="view"}} data-notifications="notifications-dropdown" id='user-notifications' title='{{i18n notifications.title}}'><i class='icon-comment'></i></a>
+            <a class='icon' href="#" {{action showNotifications target="view"}} data-notifications="notifications-dropdown" id='user-notifications' title='{{i18n notifications.title}}'><i class='fa fa-comment'></i></a>
             {{#if currentUser.unread_notifications}}
               <a href='#' class='badge-notification unread-notifications'>{{currentUser.unread_notifications}}</a>
             {{/if}}
@@ -47,20 +47,20 @@
               <a href='#' class='badge-notification unread-private-messages'>{{currentUser.unread_private_messages}}</a>
             {{/if}}
           {{else}}
-            <a class='icon' href="#" {{action showLogin}} title='{{i18n notifications.title}}'><i class='icon-comment'></i></a>
+            <a class='icon' href="#" {{action showLogin}} title='{{i18n notifications.title}}'><i class='fa fa-comment'></i></a>
           {{/if}}
         </li>
         <li>
           {{#if Discourse.loginRequired}}
             <a class='icon expand' href='#' {{action showLogin}}>
-              <i class='icon-search'></i>
+              <i class='fa fa-search'></i>
             </a>
           {{else}}
             <a class='icon expand'
                href='#'
                data-dropdown="search-dropdown"
                title='{{i18n search.title}}'>
-               <i class='icon-search'></i>
+               <i class='fa fa-search'></i>
             </a>
           {{/if}}
         </li>
@@ -69,7 +69,7 @@
             <a class='icon'
                href="#"
                {{action showLogin}}>
-               <i class='icon-reorder'></i>
+               <i class='fa fa-bars'></i>
             </a>
           {{else}}
             <a class='icon'
@@ -78,7 +78,7 @@
                href="#"
                title='{{i18n site_map}}'
                id="site-map">
-               <i class='icon-reorder'></i>
+               <i class='fa fa-bars'></i>
             </a>
           {{/if}}
           {{#if currentUser.site_flagged_posts_count}}
@@ -89,7 +89,7 @@
           {{#if currentUser}}
             {{#titledLinkTo 'userActivity.index' currentUser titleKey="current_user" class="icon"}}{{boundAvatar currentUser imageSize="medium" }}{{/titledLinkTo}}
           {{else}}
-            <div class="icon not-logged-in-avatar" {{action showLogin}}><i class='icon-user'></i></div>
+            <div class="icon not-logged-in-avatar" {{action showLogin}}><i class='fa fa-user'></i></div>
           {{/if}}
         </li>
       </ul>

app/assets/javascripts/discourse/templates/list.js.handlebars

@@ -10,15 +10,15 @@
     </ul>
 
     {{#if canCreateTopic}}
-      <button class='btn btn-default' {{action createTopic}}><i class='icon icon-plus'></i>{{i18n topic.create}}</button>
+      <button class='btn btn-default' {{action createTopic}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
     {{/if}}
 
     {{#if canEditCategory}}
-      <button class='btn btn-default' {{action editCategory category}}><i class="icon icon-wrench"></i> {{i18n category.edit_long}}</button>
+      <button class='btn btn-default' {{action editCategory category}}><i class="fa fa-wrench"></i> {{i18n category.edit_long}}</button>
     {{/if}}
 
     {{#if canCreateCategory}}
-      <button class='btn btn-default' {{action createCategory}}><i class='icon icon-plus'></i>{{i18n category.create}}</button>
+      <button class='btn btn-default' {{action createCategory}}><i class='fa fa-plus'></i>{{i18n category.create}}</button>
     {{/if}}
 
   </div>

app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars

@@ -1,6 +1,6 @@
 {{#if controller.currentUser.id}}
   <td class='star'>
-    <a {{bindAttr class=":star :icon-star starred:starred"}} {{action toggleStar this}} href='#' {{bindAttr title="favoriteTooltip"}}></a>
+    <a {{bindAttr class=":star :fa :fa-star starred:starred"}} {{action toggleStar this}} href='#' {{bindAttr title="favoriteTooltip"}}></a>
   </td>
 {{/if}}
 
@@ -11,7 +11,7 @@
       <p>{{rank_details.hot_topic_type}}</p>
       <p>
         ({{float rank_details.random_bias}} * {{float rank_details.random_multiplier}}) + ({{float rank_details.days_ago_bias}} * {{float rank_details.days_ago_multiplier}}) = <b>{{float rank_details.ranking_score}}</b>
-        <i class='icon icon-beaker score' {{action showRankDetails this}} title='{{i18n rank_details.show}}'></i>
+        <i class='fa fa-flask score' {{action showRankDetails this}} title='{{i18n rank_details.show}}'></i>
       </p>
     </div>
   {{/if}}
@@ -25,7 +25,7 @@
     <a href="{{lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="displayNewPosts"}}'>{{displayNewPosts}}</a>
   {{/if}}
   {{#if unseen}}
-    <a href="{{lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
+    <a href="{{lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='fa fa-asterisk'></i></a>
   {{/if}}
 
   {{#if hasExcerpt}}
@@ -57,7 +57,7 @@
 
 <td class='num likes'>
   {{#if like_count}}
-    <a href='{{url}}{{#if has_summary}}?filter=summary{{/if}}' title='{{i18n topic.likes count="like_count"}}'>{{number like_count numberKey="likes_long"}} <i class='icon-heart'></i></a>
+    <a href='{{url}}{{#if has_summary}}?filter=summary{{/if}}' title='{{i18n topic.likes count="like_count"}}'>{{number like_count numberKey="likes_long"}} <i class='fa fa-heart'></i></a>
   {{/if}}
 </td>
 

app/assets/javascripts/discourse/templates/list/topics.js.handlebars

@@ -7,7 +7,7 @@
 
       {{#if canViewRankDetails}}
         <button class='btn' {{action toggleRankDetails}} style='margin-bottom: 10px'>
-          <i class='icon icon-beaker'></i>
+          <i class='fa fa-flask'></i>
           {{i18n rank_details.toggle}}
         </button>
       {{/if}}

app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars

@@ -8,7 +8,7 @@
       <th class='num posts'>{{i18n categories.posts}}</th>
       <th class='latest'>{{i18n categories.latest}}
         {{#if canEdit}}
-        <button title='{{i18n categories.toggle_ordering}}' class='btn toggle-admin no-text' {{action toggleOrdering}}><i class='icon icon-wrench'></i></button>
+        <button title='{{i18n categories.toggle_ordering}}' class='btn toggle-admin no-text' {{action toggleOrdering}}><i class='fa fa-wrench'></i></button>
         {{/if}}
       </th>
     </tr>
@@ -18,14 +18,14 @@
       <tr data-category_id='{{unbound id}}'>
         <td class='category'>
           {{#if controller.ordering}}
-            <i class="icon-reorder"></i>
+            <i class="fa fa-bars"></i>
           {{/if}}
           {{categoryLink this allowUncategorized=true}}
           {{#if unreadTopics}}
             <a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{unbound unreadTopics}}</a>
           {{/if}}
           {{#if newTopics}}
-            <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{unbound newTopics}} <i class='icon icon-asterisk'></i></a>
+            <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{unbound newTopics}} <i class='fa fa-asterisk'></i></a>
           {{/if}}
           <div class='featured-users'>
             {{#each featured_users}}
@@ -60,7 +60,7 @@
               <a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="new_posts"}}'>{{new_posts}}</a>
             {{/if}}
             {{#if unseen}}
-              <a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
+              <a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='fa fa-asterisk'></i></a>
             {{/if}}
             <div class='last-user-info'>
               {{i18n categories.latest_by}} <a href="{{{unbound lastPosterUrl}}}">{{unbound last_poster.username}}</a>

app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars

@@ -6,7 +6,7 @@
       <p>{{rank_details.hot_topic_type}}</p>
       <p>
         ({{float rank_details.random_bias}} * {{float rank_details.random_multiplier}}) + ({{float rank_details.days_ago_bias}} * {{float rank_details.days_ago_multiplier}}) = <b>{{float rank_details.ranking_score}}</b>
-        <i class='icon icon-beaker score' {{action showRankDetails this}} title='{{i18n rank_details.show}}'></i>
+        <i class='fa fa-flask score' {{action showRankDetails this}} title='{{i18n rank_details.show}}'></i>
       </p>
     </div>
   {{/if}}
@@ -20,7 +20,7 @@
     <a href="{{lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="displayNewPosts"}}'>{{displayNewPosts}}</a>
   {{/if}}
   {{#if unseen}}
-    <a href="{{lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
+    <a href="{{lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='fa fa-asterisk'></i></a>
   {{/if}}
 
   {{#if hasExcerpt}}
@@ -45,11 +45,11 @@
     <div class='num posts'><a href="{{lastUnreadUrl}}">{{number posts_count numberKey="posts_long"}}</a></div>
 
     {{#if like_count}}
-      <div class='num likes'><a href='{{url}}{{#if has_summary}}?filter=summary{{/if}}' title='{{i18n topic.likes count="like_count"}}'><i class='icon-heart'></i> {{number like_count numberKey="likes_long"}}</a></div>
+      <div class='num likes'><a href='{{url}}{{#if has_summary}}?filter=summary{{/if}}' title='{{i18n topic.likes count="like_count"}}'><i class='fa fa-heart'></i> {{number like_count numberKey="likes_long"}}</a></div>
     {{/if}}
 
     <div class='last-poster'>
-      <i class="icon icon-user"></i> {{last_poster_username}}
+      <i class="fa fa-user"></i> {{last_poster_username}}
     </div>
 
     {{#if bumped}}

app/assets/javascripts/discourse/templates/mobile/list/topics.js.handlebars

@@ -4,7 +4,7 @@
       {{#if view.showTable}}
         {{#if canViewRankDetails}}
           <button class='btn' {{action toggleRankDetails}} style='margin-bottom: 10px'>
-            <i class='icon icon-beaker'></i>
+            <i class='fa fa-flask'></i>
             {{i18n rank_details.toggle}}
           </button>
         {{/if}}

app/assets/javascripts/discourse/templates/mobile/modal/login.js.handlebars

@@ -51,7 +51,7 @@
     <button class='btn btn-large btn-primary'
       {{bindAttr disabled="loginDisabled"}}
       {{action login}}>
-        <i class="icon-unlock"></i>&nbsp;{{loginButtonText}}
+        <i class="fa fa-unlock"></i>&nbsp;{{loginButtonText}}
     </button>
 
     {{#unless Discourse.SiteSettings.invite_only}}

app/assets/javascripts/discourse/templates/modal/avatar_selector.js.handlebars

@@ -3,7 +3,7 @@
     <div>
       <input type="radio" id="avatar" name="avatar" value="gravatar" {{action useGravatar}}>
       <label class="radio" for="avatar">{{avatar controller imageSize="large" template="gravatar_template"}} {{{i18n user.change_avatar.gravatar}}} {{email}}</label>
-      <a href="//gravatar.com/emails" target="_blank" title="{{i18n user.change_avatar.gravatar_title}}" class="btn"><i class="icon-pencil"></i></a>
+      <a href="//gravatar.com/emails" target="_blank" title="{{i18n user.change_avatar.gravatar_title}}" class="btn no-text"><i class="fa fa-pencil"></i></a>
     </div>
     <div>
       <input type="radio" id="uploaded_avatar" name="avatar" value="uploaded_avatar" {{action useUploadedAvatar}}>
@@ -15,7 +15,7 @@
         {{/if}}
       </label>
       <button id="fake-avatar-input" class="btn" {{bindAttr disabled="view.uploading"}} title="{{i18n user.change_avatar.upload_title}}">
-        <i class="icon-picture"></i>&nbsp;{{view.uploadButtonText}}
+        <i class="fa fa-picture-o"></i>&nbsp;{{view.uploadButtonText}}
       </button>
       <input type="file" id="avatar-input" accept="image/*" style="display:none">
       {{#if view.uploading}}

app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars

@@ -72,7 +72,7 @@
                 {{{i18n "category.can"}}}
                 <span class="permission">{{permission.description}}</span>
                 {{#if controller.editingPermissions}}
-                  <a {{action removePermission this}}><i class="icon icon-remove-sign"></i></a>
+                  <a {{action removePermission this}}><i class="fa fa-times-circle"></i></a>
                 {{/if}}
               </li>
             {{/each}}
@@ -90,7 +90,7 @@
         <section class='field'>
           <div class="auto-close-fields">
             <div>
-              <i class="icon icon-time"></i>
+              <i class="fa fa-clock-o"></i>
               {{i18n category.auto_close_label}}
               {{textField value=auto_close_hours}}
               {{i18n category.auto_close_units}}
@@ -113,7 +113,7 @@
   <div class="modal-footer">
     <button class='btn btn-primary' {{bindAttr disabled="disabled"}} {{action saveCategory}}>{{buttonTitle}}</button>
     {{#if deleteVisible}}
-      <button class='btn btn-danger pull-right' {{bindAttr disabled="deleteDisabled"}} {{action deleteCategory}}><i class="icon icon-trash"></i>{{deleteButtonTitle}}</button>
+      <button class='btn btn-danger pull-right' {{bindAttr disabled="deleteDisabled"}} {{action deleteCategory}}><i class="fa fa-trash-o"></i>{{deleteButtonTitle}}</button>
     {{/if}}
   </div>
 </div>

app/assets/javascripts/discourse/templates/modal/flag.js.handlebars

@@ -28,7 +28,7 @@
   {{/if}}
 
   {{#if canDeleteSpammer}}
-    <button class="btn btn-danger" {{action deleteSpammer}} {{bindAttr disabled="submitDisabled"}}><i class="icon icon-warning-sign"></i> {{i18n flagging.delete_spammer}}</button>
+    <button class="btn btn-danger" {{action deleteSpammer}} {{bindAttr disabled="submitDisabled"}}><i class="fa fa-exclamation-triangle"></i> {{i18n flagging.delete_spammer}}</button>
   {{/if}}
 </div>
 

app/assets/javascripts/discourse/templates/modal/login.js.handlebars

@@ -48,7 +48,7 @@
     <button class='btn btn-large btn-primary'
       {{bindAttr disabled="loginDisabled"}}
       {{action login}}>
-        <i class="icon-unlock"></i>&nbsp;{{loginButtonText}}
+        <i class="fa fa-unlock"></i>&nbsp;{{loginButtonText}}
     </button>
 
     {{#unless Discourse.SiteSettings.invite_only}}

app/assets/javascripts/discourse/templates/modal/modal.js.handlebars

@@ -3,7 +3,7 @@
     <div class="modal-inner-container">
 
       <div class="modal-header">
-        <a class="close" {{action closeModal}}><i class='icon-remove icon'></i></a>
+        <a class="close" {{action closeModal}}><i class='fa fa-times'></i></a>
         <h3>{{title}}</h3>
       </div>
       <div id='modal-alert'></div>

app/assets/javascripts/discourse/templates/modal/upload_selector.js.handlebars

@@ -30,7 +30,7 @@
 
 <div class="modal-footer">
   <button class="btn btn-primary" {{action upload target="view"}}>
-    <span class='add-upload'><i {{bindAttr class="view.uploadIcon"}}></i><i class='icon-plus'></i></span>
+    <span class='add-upload'><i {{bindAttr class="view.uploadIcon"}}></i><i class='fa fa-plus'></i></span>
     {{i18n upload}}
   </button>
   <a {{action closeModal}}>{{i18n cancel}}</a>

app/assets/javascripts/discourse/templates/popup_input_tip.js.handlebars

@@ -1,2 +1,2 @@
-<span class="close"><i class="icon icon-remove-sign"></i></span>
+<span class="close"><i class="fa fa-times-circle"></i></span>
 {{view.validation.reason}}

app/assets/javascripts/discourse/templates/post.js.handlebars

@@ -32,7 +32,7 @@
         </div>
       {{else}}
         <div class="contents">
-          <i class="icon icon-trash deleted-user-avatar"></i>
+          <i class="fa fa-trash-o deleted-user-avatar"></i>
           <h3 class="deleted-username">{{i18n user.deleted}}</h3>
         </div>
       {{/unless}}
@@ -52,12 +52,12 @@
                 {{#if canViewEditHistory}}
                   <a href='#' class="{{unbound historyHeat}}" {{action showHistory this}} title="{{i18n post.last_edited_on}} {{unboundDate updated_at}}">
                     {{editCount}}
-                    <i class='icon-pencil'></i>
+                    <i class='fa fa-pencil'></i>
                   </a>
                 {{else}}
                   <span class="{{unbound historyHeat}}" title="{{i18n post.last_edited_on}} {{unboundDate updated_at}}">
                     {{editCount}}
-                    <i class='icon-pencil'></i>
+                    <i class='fa fa-pencil'></i>
                   </span>
                 {{/if}}
               </div>
@@ -78,7 +78,7 @@
     <div class='span5 gutter'>
       {{collection contentBinding="internalLinks" itemViewClass="Discourse.PostLinkView" tagName="ul" classNames="post-links"}}
       {{#if topic.details.can_reply_as_new_topic}}
-        <a href='#' class='reply-new' {{action replyAsNewTopic this}}><i class='icon icon-plus'></i>{{i18n post.reply_as_new_topic}}</a>
+        <a href='#' class='reply-new' {{action replyAsNewTopic this}}><i class='fa fa-plus'></i>{{i18n post.reply_as_new_topic}}</a>
       {{/if}}
     </div>
   </div>

app/assets/javascripts/discourse/templates/poster_expansion.handlebars

@@ -14,17 +14,17 @@
       {{#if user.bio_cooked}}<div class='bio'>{{{user.bio_cooked}}}</div>{{/if}}
 
       {{#if user.can_send_private_message_to_user}}
-        <button class='btn' {{action composePrivateMessage user}}><i class='icon icon-envelope'></i>{{i18n user.private_message}}</button>
+        <button class='btn' {{action composePrivateMessage user}}><i class='fa fa-envelope'></i>{{i18n user.private_message}}</button>
       {{/if}}
 
-      {{#link-to 'user' user class="btn"}}<i class='icon icon-user'></i>{{i18n user.show_profile}}{{/link-to}}
+      {{#link-to 'user' user class="btn"}}<i class='fa fa-user'></i>{{i18n user.show_profile}}{{/link-to}}
 
       {{#if showFilter}}
-        <button class='btn' {{action togglePosts user}}><i class='icon icon-filter'></i>{{i18n topic.filter_to username="username" post_count="participant.post_count"}}</button>
+        <button class='btn' {{action togglePosts user}}><i class='fa fa-filter'></i>{{i18n topic.filter_to username="username" post_count="participant.post_count"}}</button>
       {{/if}}
 
       {{#if hasUserFilters}}
-        <button class='btn' {{action cancelFilter}}><i class='icon icon-remove'></i>{{i18n topic.filters.cancel}}</button>
+        <button class='btn' {{action cancelFilter}}><i class='fa fa-times'></i>{{i18n topic.filters.cancel}}</button>
       {{/if}}
 
     </div>

app/assets/javascripts/discourse/templates/search.js.handlebars

@@ -9,7 +9,7 @@
             <a href='#' class='filter' {{action moreOfType resultType.type bubbles=false}}>{{i18n show_more}}</a>
           {{else}}
             {{#if showCancelFilter}}
-              <a href='#' class='filter' {{action cancelType bubbles=false}}><i class='icon icon-remove-sign'></i></a>
+              <a href='#' class='filter' {{action cancelType bubbles=false}}><i class='fa fa-times-circle'></i></a>
             {{/if}}
           {{/if}}
         </li>
@@ -22,5 +22,5 @@
     </div>
   {{/unless}}
 {{else}}
-<div class='searching'><i class='icon-spinner icon-spin'></i></div>
+<div class='searching'><i class='fa fa-spinner fa-spin'></i></div>
 {{/unless}}

app/assets/javascripts/discourse/templates/selected_posts.js.handlebars

@@ -9,14 +9,14 @@
 {{/if}}
 
 {{#if canDeleteSelected}}
-  <button class='btn' {{action deleteSelected}}><i class='icon icon-trash'></i> {{i18n topic.multi_select.delete}}</button>
+  <button class='btn' {{action deleteSelected}}><i class='fa fa-trash-o'></i> {{i18n topic.multi_select.delete}}</button>
 {{/if}}
 
 {{#if canSplitTopic}}
-  <button class='btn' {{action splitTopic}}><i class='icon icon-signout'></i> {{i18n topic.split_topic.action}}</button>
+  <button class='btn' {{action splitTopic}}><i class='fa fa-sign-out'></i> {{i18n topic.split_topic.action}}</button>
 {{/if}}
 {{#if canMergeTopic}}
-  <button class='btn' {{action mergeTopic}}><i class='icon icon-signout'></i> {{i18n topic.merge_topic.action}}</button>
+  <button class='btn' {{action mergeTopic}}><i class='fa fa-sign-out'></i> {{i18n topic.merge_topic.action}}</button>
 {{/if}}
 
 <p class='cancel'><a href='#' {{action toggleMultiSelect}}>{{i18n topic.multi_select.cancel}}</a></p>

app/assets/javascripts/discourse/templates/share.js.handlebars

@@ -6,5 +6,5 @@
 {{/each}}
 
 <div class='link'>
-  <a href='#' {{action close}} title='{{i18n share.close}}'><i class="icon icon-remove-sign"></i></a>
+  <a href='#' {{action close}} title='{{i18n share.close}}'><i class="fa fa-times-circle"></i></a>
 </div>

app/assets/javascripts/discourse/templates/share_link.js.handlebars

@@ -1,5 +1,5 @@
 {{#if openInPopup}}
-  <a href="#" {{action sharePopup target href}} {{bindAttr title="title"}}><i {{bindAttr class=":icon iconClass"}}></i></a>
+  <a href="#" {{action sharePopup target href}} {{bindAttr title="title"}}><i {{bindAttr class=":fa iconClass"}}></i></a>
 {{else}}
-  <a {{bindAttr href="href"}} {{bindAttr title="title"}} target="_blank"><i {{bindAttr class=":icon iconClass"}}></i></a>
+  <a {{bindAttr href="href"}} {{bindAttr title="title"}} target="_blank"><i {{bindAttr class=":fa iconClass"}}></i></a>
 {{/if}}

app/assets/javascripts/discourse/templates/site_map/_admin_link.js.handlebars

@@ -1 +1 @@
-<a href="/admin" class="admin-link"><i class='icon icon-wrench'></i>{{i18n admin_title}}</a>
+<a href="/admin" class="admin-link"><i class='fa fa-wrench'></i>{{i18n admin_title}}</a>

app/assets/javascripts/discourse/templates/site_map/_category.js.handlebars

@@ -4,7 +4,7 @@
     <a href={{unbound unreadUrl}} class='badge unread-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{unreadTopics}}</a>
   {{/if}}
   {{#if newTopics}}
-    <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{newTopics}} <i class='icon icon-asterisk'></i></a>
+    <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{newTopics}} <i class='fa fa-asterisk'></i></a>
   {{/if}}
 {{else}}
   <b class="topics-count">{{unbound topic_count}}</b>

app/assets/javascripts/discourse/templates/site_map/_flagged_posts_links.js.handlebars

@@ -1,4 +1,4 @@
-<a href="/admin/flags/active" class="flagged-posts-link"><i class='icon icon-flag'></i>{{i18n flags_title}}</a>
+<a href="/admin/flags/active" class="flagged-posts-link"><i class='fa fa-flag'></i>{{i18n flags_title}}</a>
 {{#if flaggedPostsCount}}
   <a href='/admin/flags/active' title='{{i18n notifications.total_flagged}}' class='badge-notification flagged-posts'>{{flaggedPostsCount}}</a>
 {{/if}}

app/assets/javascripts/discourse/templates/topic.js.handlebars

@@ -15,8 +15,8 @@
             {{categoryChooser valueAttribute="id" value=newCategoryId source=category_id}}
             {{textField id='edit-title' value=newTitle}}
 
-            <button class='btn btn-primary btn-small' {{action finishedEditingTopic}}><i class='icon-ok'></i></button>
+            <button class='btn btn-primary btn-small' {{action finishedEditingTopic}}><i class='fa fa-check'></i></button>
-            <button class='btn btn-small' {{action cancelEditingTopic}}><i class='icon-remove'></i></button>
+            <button class='btn btn-small' {{action cancelEditingTopic}}><i class='fa fa-times'></i></button>
           {{else}}
             <h1>
               {{boundCategoryLink category}}
@@ -33,7 +33,7 @@
 
 
               {{#if details.can_edit}}
-                <a href='#' {{action editTopic}} class='edit-topic' title='{{i18n edit}}'><i class="icon-pencil"></i></a>
+                <a href='#' {{action editTopic}} class='edit-topic' title='{{i18n edit}}'><i class="fa fa-pencil"></i></a>
               {{/if}}
             </h1>
           {{/if}}
@@ -50,11 +50,11 @@
         <div class='posts-wrapper'>
           <div id='topic-progress-wrapper' {{bindAttr class="dockedCounter:docked"}}>
             <nav id='topic-progress' title="{{i18n topic.progress.title}}" {{bindAttr class="hideProgress:hidden"}}>
-              <button id='jump-top' title="{{i18n topic.progress.jump_top}}" {{bindAttr disabled="jumpTopDisabled"}} {{action jumpTop}}><i class="icon-circle-arrow-up"></i></button>
+              <button id='jump-top' title="{{i18n topic.progress.jump_top}}" {{bindAttr disabled="jumpTopDisabled"}} {{action jumpTop}}><i class="fa fa-arrow-circle-up"></i></button>
               <div class='nums' {{bindAttr title="progressPositionTitle"}}>
                 <h4>{{progressPosition}}</h4><span {{bindAttr class="hugeNumberOfPosts:hidden"}}> <span>{{i18n of_value}}</span> <h4>{{postStream.filteredPostsCount}}</h4></span>
               </div>
-              <button id='jump-bottom' {{bindAttr title="jumpToBottomTitle"}} {{bindAttr disabled="jumpBottomDisabled"}} {{action jumpBottom}}><i class="icon-circle-arrow-down"></i></button>
+              <button id='jump-bottom' {{bindAttr title="jumpToBottomTitle"}} {{bindAttr disabled="jumpBottomDisabled"}} {{action jumpBottom}}><i class="fa fa-arrow-circle-down"></i></button>
               <div class='bg'>&nbsp;</div>
             </nav>
           </div>

app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars

@@ -4,65 +4,65 @@
 
     <ul>
         <li>
-          <button {{action toggleMultiSelect}} class='btn btn-admin'><i class='icon-tasks'></i> {{i18n topic.actions.multi_select}}</button>
+          <button {{action toggleMultiSelect}} class='btn btn-admin'><i class='fa fa-tasks'></i> {{i18n topic.actions.multi_select}}</button>
         </li>
 
       {{#if details.can_delete}}
         <li>
-          <button {{action deleteTopic}} class='btn btn-admin btn-danger'><i class='icon-trash'></i> {{i18n topic.actions.delete}}</button>
+          <button {{action deleteTopic}} class='btn btn-admin btn-danger'><i class='fa fa-trash-o'></i> {{i18n topic.actions.delete}}</button>
         </li>
       {{/if}}
 
       {{#if showRecover}}
         <li>
-          <button {{action recoverTopic}} class='btn btn-admin'><i class='icon-undo'></i> {{i18n topic.actions.recover}}</button>
+          <button {{action recoverTopic}} class='btn btn-admin'><i class='fa fa-undo'></i> {{i18n topic.actions.recover}}</button>
         </li>
       {{/if}}
 
       <li>
         {{#if closed}}
-          <button {{action toggleClosed}} class='btn btn-admin'><i class='icon-unlock'></i> {{i18n topic.actions.open}}</button>
+          <button {{action toggleClosed}} class='btn btn-admin'><i class='fa fa-unlock'></i> {{i18n topic.actions.open}}</button>
         {{else}}
-          <button {{action toggleClosed}} class='btn btn-admin'><i class='icon-lock'></i> {{i18n topic.actions.close}}</button>
+          <button {{action toggleClosed}} class='btn btn-admin'><i class='fa fa-lock'></i> {{i18n topic.actions.close}}</button>
-          <button {{action showAutoClose}} class='btn btn-admin'><i class='icon-time'></i> {{i18n topic.actions.auto_close}}</button>
+          <button {{action showAutoClose}} class='btn btn-admin'><i class='fa fa-clock-o'></i> {{i18n topic.actions.auto_close}}</button>
         {{/if}}
       </li>
 
       <li>
         {{#if pinned}}
-          <button {{action togglePinned}} class='btn btn-admin'><i class='icon-pushpin'></i> {{i18n topic.actions.unpin}}</button>
+          <button {{action togglePinned}} class='btn btn-admin'><i class='fa fa-thumb-tack'></i> {{i18n topic.actions.unpin}}</button>
         {{else}}
-          <button {{action togglePinned}} class='btn btn-admin'><i class='icon-pushpin'></i> {{i18n topic.actions.pin}}</button>
+          <button {{action togglePinned}} class='btn btn-admin'><i class='fa fa-thumb-tack'></i> {{i18n topic.actions.pin}}</button>
         {{/if}}
       </li>
 
       <li>
         {{#if archived}}
-          <button {{action toggleArchived}} class='btn btn-admin'><i class='icon-folder-close'></i> {{i18n topic.actions.unarchive}}</button>
+          <button {{action toggleArchived}} class='btn btn-admin'><i class='fa fa-folder'></i> {{i18n topic.actions.unarchive}}</button>
         {{else}}
-          <button {{action toggleArchived}} class='btn btn-admin'><i class='icon-folder-close'></i> {{i18n topic.actions.archive}}</button>
+          <button {{action toggleArchived}} class='btn btn-admin'><i class='fa fa-folder'></i> {{i18n topic.actions.archive}}</button>
         {{/if}}
       </li>
 
       <li>
         {{#if visible}}
-          <button {{action toggleVisibility}} class='btn btn-admin'><i class='icon-eye-close'></i> {{i18n topic.actions.invisible}}</button>
+          <button {{action toggleVisibility}} class='btn btn-admin'><i class='fa fa-eye-slash'></i> {{i18n topic.actions.invisible}}</button>
         {{else}}
-          <button {{action toggleVisibility}} class='btn btn-admin'><i class='icon-eye-open'></i> {{i18n topic.actions.visible}}</button>
+          <button {{action toggleVisibility}} class='btn btn-admin'><i class='fa fa-eye'></i> {{i18n topic.actions.visible}}</button>
         {{/if}}
       </li>
 
       {{#if canConvertToRegular}}
       <li>
-          <button {{action convertToRegular}} class='btn btn-admin'><i class='icon-minus'></i> {{i18n topic.actions.convert_to_topic}}</button>
+          <button {{action convertToRegular}} class='btn btn-admin'><i class='fa fa-minus'></i> {{i18n topic.actions.convert_to_topic}}</button>
       </li>
       {{/if}}
 
       <li>
-        <button class='btn btn-admin' {{action resetRead}}><i class='icon-remove'></i> {{i18n topic.actions.reset_read}}</button>
+        <button class='btn btn-admin' {{action resetRead}}><i class='fa fa-times'></i> {{i18n topic.actions.reset_read}}</button>
       </li>
     </ul>
   </div>
 {{else}}
-  <button class='btn no-text' id='show-topic-admin' {{action show}}><i class='icon icon-wrench'></i></button>
+  <button class='btn no-text' id='show-topic-admin' {{action show}}><i class='fa fa-wrench'></i></button>
 {{/if}}

app/assets/javascripts/discourse/templates/user/preferences.js.handlebars

@@ -7,7 +7,7 @@
       <div class="controls">
         <span class='static'>{{username}}</span>
         {{#if can_edit_username}}
-          {{#link-to "preferences.username" class="btn pad-left"}}<i class="icon-pencil"></i>{{/link-to}}
+          {{#link-to "preferences.username" class="btn pad-left"}}<i class="fa fa-pencil"></i>{{/link-to}}
         {{/if}}
       </div>
       <div class='instructions'>
@@ -32,7 +32,7 @@
       <div class="controls">
         <span class='static'>{{email}}</span>
         {{#if can_edit_email}}
-          {{#link-to "preferences.email" class="btn pad-left"}}<i class="icon-pencil"></i>{{/link-to}}
+          {{#link-to "preferences.email" class="btn pad-left no-text"}}<i class="fa fa-pencil"></i>{{/link-to}}
         {{/if}}
       </div>
       <div class='instructions'>
@@ -43,7 +43,7 @@
     <div class="control-group">
       <label class="control-label">{{i18n user.password.title}}</label>
       <div class="controls">
-        <a href="#" {{action changePassword}} class='btn'><i class="icon icon-envelope"></i>{{i18n user.change_password.action}}</a> {{passwordProgress}}
+        <a href="#" {{action changePassword}} class='btn'><i class="fa fa-envelope"></i>{{i18n user.change_password.action}}</a> {{passwordProgress}}
       </div>
     </div>
 
@@ -52,9 +52,9 @@
       <div class="controls">
         {{boundAvatar model imageSize="large"}}
         {{#if allowAvatarUpload}}
-          <button {{action showAvatarSelector}} class="btn pad-left"><i class="icon-pencil"></i></button>
+          <button {{action showAvatarSelector}} class="btn pad-left no-text"><i class="fa fa-pencil"></i></button>
         {{else}}
-          <a href="//gravatar.com/emails" target="_blank" title="{{i18n user.change_avatar.gravatar_title}}" class="btn"><i class="icon-pencil"></i></a>
+          <a href="//gravatar.com/emails" target="_blank" title="{{i18n user.change_avatar.gravatar_title}}" class="btn no-text"><i class="fa fa-pencil"></i></a>
         {{/if}}
       </div>
     </div>

app/assets/javascripts/discourse/templates/user/user.js.handlebars

@@ -11,23 +11,23 @@
       </ul>
 
       {{#if canSeePrivateMessages}}
-        <h3><i class='icon icon-envelope'></i> {{i18n user.private_messages}}</h3>
+        <h3><i class='fa fa-envelope'></i> {{i18n user.private_messages}}</h3>
         <ul class='action-list nav-stacked'>
           <li {{bindAttr class=":noGlyph privateMessagesActive:active"}}>
-            {{#link-to 'userPrivateMessages.index' model}}{{i18n user.messages.all}}<span class='icon-chevron-right'></span>{{/link-to}}
+            {{#link-to 'userPrivateMessages.index' model}}{{i18n user.messages.all}}<span class='fa fa-chevron-right'></span>{{/link-to}}
           </li>
           <li {{bindAttr class=":noGlyph privateMessagesMineActive:active"}}>
-            {{#link-to 'userPrivateMessages.mine' model}}{{i18n user.messages.mine}}<span class='icon-chevron-right'></span>{{/link-to}}
+            {{#link-to 'userPrivateMessages.mine' model}}{{i18n user.messages.mine}}<span class='fa fa-chevron-right'></span>{{/link-to}}
           </li>
           <li {{bindAttr class=":noGlyph privateMessagesUnreadActive:active"}}>
-            {{#link-to 'userPrivateMessages.unread' model}}{{i18n user.messages.unread}}<span class='icon-chevron-right'></span>{{/link-to}}
+            {{#link-to 'userPrivateMessages.unread' model}}{{i18n user.messages.unread}}<span class='fa fa-chevron-right'></span>{{/link-to}}
           </li>
         </ul>
       {{/if}}
 
       {{#if can_edit}}
         <div style='margin-top: 10px'>
-          <button class='btn' data-not-implemented='true' disabled title="{{i18n not_implemented}}"><i class='icon icon-download-alt'></i>{{i18n user.download_archive}}</button>
+          <button class='btn' data-not-implemented='true' disabled title="{{i18n not_implemented}}"><i class='fa fa-download'></i>{{i18n user.download_archive}}</button>
         </div>
       {{/if}}
     </section>
@@ -45,7 +45,7 @@
 
           {{#if isSuspended}}
             <div class='suspended'>
-              <i class='icon icon-ban-circle'></i>
+              <i class='fa fa-ban'></i>
               <b>{{i18n user.suspended_notice date="suspendedTillDate"}}</b><br/>
               <b>{{i18n user.suspended_reason}}</b> {{suspend_reason}}
             </div>
@@ -82,24 +82,24 @@
         <section class='controls'>
           {{#if can_send_private_message_to_user}}
             <button class='btn btn-primary' {{action composePrivateMessage}}>
-              <i class='icon icon-envelope'></i>
+              <i class='fa fa-envelope'></i>
               {{i18n user.private_message}}
             </button>
           {{/if}}
 
           {{#if viewingSelf}}
-            <button {{action "logout"}} class='btn btn-danger right'><i class='icon icon-signout'></i>{{i18n user.log_out}}</button>
+            <button {{action "logout"}} class='btn btn-danger right'><i class='fa fa-sign-out'></i>{{i18n user.log_out}}</button>
           {{/if}}
 
           {{#if currentUser.staff}}
-            <a {{bindAttr href="adminPath"}} class='btn right'><i class="icon-wrench"></i>&nbsp;{{i18n admin.user.show_admin_profile}}</a>
+            <a {{bindAttr href="adminPath"}} class='btn right'><i class="fa fa-wrench"></i>{{i18n admin.user.show_admin_profile}}</a>
           {{/if}}
 
           {{#if can_edit}}
-            {{#link-to 'preferences' class="btn right"}}<i class='icon icon-cog'></i>{{i18n user.preferences}}{{/link-to}}
+            {{#link-to 'preferences' class="btn right"}}<i class='fa fa-cog'></i>{{i18n user.preferences}}{{/link-to}}
           {{/if}}
 
-          {{#link-to 'user.invited' class="btn right"}}<i class='icon icon-envelope-alt'></i>{{i18n user.invited.title}}{{/link-to}}
+          {{#link-to 'user.invited' class="btn right"}}<i class='fa fa-envelope-o'></i>{{i18n user.invited.title}}{{/link-to}}
 
         </section>
       </section>

app/assets/javascripts/discourse/views/buttons/clear_pin_button.js

@@ -23,7 +23,7 @@ Discourse.ClearPinButton = Discourse.ButtonView.extend({
   },
 
   renderIcon: function(buffer) {
-    buffer.push("<i class='icon icon-pushpin'></i>");
+    buffer.push("<i class='fa fa-thumb-tack'></i>");
   }
 });
 

app/assets/javascripts/discourse/views/buttons/favorite_button.js

@@ -18,7 +18,7 @@ Discourse.FavoriteButton = Discourse.ButtonView.extend({
   },
 
   renderIcon: function(buffer) {
-    buffer.push("<i class='icon-star " +
+    buffer.push("<i class='fa fa-star " +
                  (this.get('controller.starred') ? ' starred' : '') +
                  "'></i>");
   }

app/assets/javascripts/discourse/views/buttons/invite_reply_button.js

@@ -13,7 +13,7 @@ Discourse.InviteReplyButton = Discourse.ButtonView.extend({
   disabled: Em.computed.or('controller.archived', 'controller.closed', 'controller.deleted'),
 
   renderIcon: function(buffer) {
-    buffer.push("<i class='icon icon-group'></i>");
+    buffer.push("<i class='fa fa-users'></i>");
   },
 
   click: function() {

app/assets/javascripts/discourse/views/buttons/notifications_button.js

@@ -31,9 +31,9 @@ Discourse.NotificationsButton = Discourse.DropdownButtonView.extend({
 
     var icon = (function() {
       switch (key) {
-        case 'watching': return '<i class="icon-circle heatmap-high"></i>&nbsp;';
+        case 'watching': return '<i class="fa fa-circle heatmap-high"></i>&nbsp;';
-        case 'tracking': return '<i class="icon-circle heatmap-low"></i>&nbsp;';
+        case 'tracking': return '<i class="fa fa-circle heatmap-low"></i>&nbsp;';
-        case 'muted': return '<i class="icon-remove-sign"></i>&nbsp;';
+        case 'muted': return '<i class="fa fa-times-circle"></i>&nbsp;';
         default: return '';
       }
     })();

app/assets/javascripts/discourse/views/buttons/reply_button.js

@@ -21,7 +21,7 @@ Discourse.ReplyButton = Discourse.ButtonView.extend({
   }.property(),
 
   renderIcon: function(buffer) {
-    buffer.push("<i class='icon icon-plus'></i>");
+    buffer.push("<i class='fa fa-plus'></i>");
   },
 
   click: function() {

app/assets/javascripts/discourse/views/buttons/share_button.js

@@ -13,7 +13,7 @@ Discourse.ShareButton = Discourse.ButtonView.extend({
   topic: Em.computed.alias('controller.model'),
 
   renderIcon: function(buffer) {
-    buffer.push("<i class='icon icon-link'></i>");
+    buffer.push("<i class='fa fa-link'></i>");
   }
 });
 

app/assets/javascripts/discourse/views/input_tip_view.js

@@ -16,8 +16,8 @@ Discourse.InputTipView = Discourse.View.extend({
   render: function(buffer) {
     var reason = this.get('validation.reason');
     if (reason) {
-      var icon = this.get('good') ? 'icon-ok' : 'icon-remove';
+      var icon = this.get('good') ? 'fa-check' : 'fa-times';
-      return buffer.push("<i class=\"icon " + icon + "\"></i> " + reason);
+      return buffer.push("<i class=\"fa " + icon + "\"></i> " + reason);
     }
   }
 });

app/assets/javascripts/discourse/views/list/list_wide_categories_view.js

@@ -15,7 +15,7 @@ Discourse.ListWideCategoriesView = Discourse.View.extend({
   enableOrdering: function(){
     var self = this;
     Em.run.next(function(){
-      self.rows().sortable({handle: '.icon-reorder'}).on('sortupdate',function(evt, data){
+      self.rows().sortable({handle: '.fa-bars'}).on('sortupdate',function(evt, data){
         var tr = $(data.item);
         var categoryId = tr.data('category_id');
         var position = self.rows().find('tr').index(tr[0]);

app/assets/javascripts/discourse/views/modal/upload_selector_view.js

@@ -11,7 +11,7 @@ Discourse.UploadSelectorView = Discourse.ModalBodyView.extend({
   classNames: ['upload-selector'],
 
   title: function() { return Discourse.UploadSelectorController.translate("title"); }.property(),
-  uploadIcon: function() { return Discourse.Utilities.allowsAttachments() ? "icon-file-alt" : "icon-picture"; }.property(),
+  uploadIcon: function() { return Discourse.Utilities.allowsAttachments() ? "fa-file-o" : "fa-picture-o"; }.property(),
 
   tip: function() {
     var source = this.get("controller.local") ? "local" : "remote";

app/assets/javascripts/discourse/views/post_link_view.js

@@ -14,7 +14,7 @@ Discourse.PostLinkView = Discourse.View.extend({
   render: function(buffer) {
     var clicks;
     buffer.push("<a href='" + this.get('content.url') + "' class='track-link'>");
-    buffer.push("<i class='icon icon-arrow-" + this.direction() + "'></i>");
+    buffer.push("<i class='fa fa-arrow-" + this.direction() + "'></i>");
     buffer.push(this.get('content.title'));
     if (clicks = this.get('content.clicks')) {
       buffer.push("<span class='badge badge-notification clicks'>" + clicks + "</span>");

app/assets/javascripts/discourse/views/post_menu_view.js

@@ -56,8 +56,8 @@ Discourse.PostMenuView = Discourse.View.extend({
     buffer.push("<span class='badge-posts'>" + reply_count + "</span>");
     buffer.push(I18n.t("post.has_replies", { count: reply_count }));
 
-    var icon = (this.get('post.replies.length') > 0) ? 'icon-chevron-up' : 'icon-chevron-down';
+    var icon = (this.get('post.replies.length') > 0) ? 'fa-chevron-up' : 'fa-chevron-down';
-    return buffer.push("<i class='icon " + icon + "'></i></button>");
+    return buffer.push("<i class='fa " + icon + "'></i></button>");
   },
 
   clickReplies: function() {
@@ -86,7 +86,7 @@ Discourse.PostMenuView = Discourse.View.extend({
         if (!topic.get('details.can_delete')) { return; }
         label = "topic.actions.delete";
         action = "deleteTopic";
-        icon = "trash";
+        icon = "trash-o";
       }
 
     } else {
@@ -101,13 +101,13 @@ Discourse.PostMenuView = Discourse.View.extend({
         if (!post.get('can_delete')) { return; }
         label = "post.controls.delete";
         action = "delete";
-        icon = "trash";
+        icon = "trash-o";
       }
     }
 
     buffer.push("<button title=\"" +
                 I18n.t(label) +
-                "\" data-action=\"" + action + "\" class=\"delete\"><i class=\"icon-" + icon + "\"></i></button>");
+                "\" data-action=\"" + action + "\" class=\"delete\"><i class=\"fa fa-" + icon + "\"></i></button>");
   },
 
   clickDeleteTopic: function() {
@@ -131,7 +131,7 @@ Discourse.PostMenuView = Discourse.View.extend({
     if (!post.get('actionByName.like.can_act')) return;
     buffer.push("<button title=\"" +
                 (I18n.t("post.controls.like")) +
-                "\" data-action=\"like\" class='like'><i class=\"icon-heart\"></i></button>");
+                "\" data-action=\"like\" class='like'><i class=\"fa fa-heart\"></i></button>");
   },
 
   clickLike: function() {
@@ -144,7 +144,7 @@ Discourse.PostMenuView = Discourse.View.extend({
     if (!this.present('post.flagsAvailable')) return;
     buffer.push("<button title=\"" +
                 (I18n.t("post.controls.flag")) +
-                "\" data-action=\"flag\" class='flag'><i class=\"icon-flag\"></i></button>");
+                "\" data-action=\"flag\" class='flag'><i class=\"fa fa-flag\"></i></button>");
   },
 
   clickFlag: function() {
@@ -156,7 +156,7 @@ Discourse.PostMenuView = Discourse.View.extend({
     if (!post.get('can_edit')) return;
     buffer.push("<button title=\"" +
                  (I18n.t("post.controls.edit")) +
-                 "\" data-action=\"edit\" class='edit'><i class=\"icon-pencil\"></i></button>");
+                 "\" data-action=\"edit\" class='edit'><i class=\"fa fa-pencil\"></i></button>");
   },
 
   clickEdit: function() {
@@ -168,7 +168,7 @@ Discourse.PostMenuView = Discourse.View.extend({
     buffer.push("<button title=\"" +
                  I18n.t("post.controls.share") +
                  "\" data-share-url=\"" + post.get('shareUrl') + "\" data-post-number=\"" + post.get('post_number') +
-                 "\" class='share'><i class=\"icon-link\"></i></button>");
+                 "\" class='share'><i class=\"fa fa-link\"></i></button>");
   },
 
   // Reply button
@@ -176,7 +176,7 @@ Discourse.PostMenuView = Discourse.View.extend({
     if (!this.get('controller.model.details.can_create_post')) return;
     buffer.push("<button title=\"" +
                  (I18n.t("post.controls.reply")) +
-                 "\" class='create' data-action=\"reply\"><i class='icon-reply'></i><span class='btn-text'>" +
+                 "\" class='create' data-action=\"reply\"><i class='fa fa-reply'></i><span class='btn-text'>" +
                  (I18n.t("topic.reply.title")) + "</span></button>");
   },
 

app/assets/javascripts/discourse/views/post_view.js

@@ -76,7 +76,7 @@ Discourse.PostView = Discourse.GroupedView.extend(Ember.Evented, {
     // Only add the expand/contract control if it's not a full post
     var expandContract = "";
     if (!$aside.data('full')) {
-      expandContract = "<i class='icon-" + desc + "' title='" + I18n.t("post.expand_collapse") + "'></i>";
+      expandContract = "<i class='fa fa-" + desc + "' title='" + I18n.t("post.expand_collapse") + "'></i>";
       $aside.css('cursor', 'pointer');
     }
     $('.quote-controls', $aside).html("" + expandContract + navLink);

app/assets/javascripts/discourse/views/quote_button_view.js

@@ -27,7 +27,7 @@ Discourse.QuoteButtonView = Discourse.View.extend({
     @method render
   **/
   render: function(buffer) {
-    buffer.push('<i class="icon-quote-right"></i>&nbsp;&nbsp;');
+    buffer.push('<i class="fa fa-quote-right"></i>&nbsp;&nbsp;');
     buffer.push(I18n.t("post.quote_reply"));
   },
 

app/assets/javascripts/discourse/views/topic_closing_view.js

@@ -42,7 +42,7 @@ Discourse.TopicClosingView = Discourse.View.extend({
       rerenderDelay = 1000;
     }
 
-    buffer.push('<h3><i class="icon icon-time"></i> ');
+    buffer.push('<h3><i class="fa fa-clock-o"></i> ');
     buffer.push( I18n.t('topic.auto_close_notice', {timeLeft: timeLeftString}) );
     buffer.push('</h3>');
 

app/assets/javascripts/discourse/views/user/activity_filter_view.js

@@ -50,11 +50,11 @@ Discourse.ActivityFilterView = Ember.Component.extend({
     buffer.push("<a href='" + this.get('url') + "'>");
     var icon = this.get('icon');
     if (icon) {
-      buffer.push("<i class='glyph icon icon-" + icon + "'></i> ");
+      buffer.push("<i class='glyph fa fa-" + icon + "'></i> ");
     }
 
     buffer.push(this.get('description') + " <span class='count'>(" + this.get('activityCount') + ")</span>");
-    buffer.push("<span class='icon-chevron-right'></span></a>");
+    buffer.push("<span class='fa fa-chevron-right'></span></a>");
   },
 
   icon: function(){

app/assets/stylesheets/common/admin/admin_base.scss

@@ -367,7 +367,7 @@ table {
     width: 740px;
     padding: 0 10px 10px 0;
     word-wrap: break-word;
-    .icon,h3 { display: inline-block; }
+    .fa,h3 { display: inline-block; }
 
   }
   .flaggers {
@@ -421,7 +421,7 @@ table {
     width: 20px;
   }
 
-  .version-notes .icon {
+  .version-notes .fa {
     vertical-align: bottom;
   }
 
@@ -432,7 +432,7 @@ table {
     display: none;
   }
 
-  .icon {
+  .fa {
     font-size: 26px;
   }
 
@@ -448,7 +448,7 @@ table {
 }
 
 .update-nag {
-  i.icon {
+  i.fa {
     font-size: 20px;
   }
 }
@@ -485,7 +485,7 @@ table.api-keys {
     width: 100%;
 
     .title {
-      i.icon {
+      i.fa {
         color: #444;
       }
     }
@@ -548,7 +548,7 @@ table.api-keys {
       float: left;
       margin: 20px 20px 0 20px;
 
-      .icon {
+      .fa {
         font-size: 32px;
         vertical-align: middle;
         color: $darkish_gray;
@@ -806,7 +806,7 @@ table.api-keys {
   }
   .btn {
     padding: 2px 8px;
-    .icon {
+    .fa {
       margin-right: 2px;
     }
   }

app/assets/stylesheets/common/components/buttons.css.scss

@@ -29,11 +29,11 @@ button {
     cursor: default;
     opacity: 0.4;
   }
-  .icon {
+  .fa {
     margin-right: 7px;
   }
   &.no-text {
-    .icon {
+    .fa {
       margin-right: 0;
       line-height: 10px;
     }

app/assets/stylesheets/common/components/navs.css.scss

@@ -72,7 +72,7 @@
     }
   }
   .active > a,
-  .active .icon-chevron-right {
+  .active .fa-chevron-right {
     color: $white;
     background-color: $nav-stacked-background-color-active;
   }
@@ -80,7 +80,7 @@
     font-size: 12px;
     line-height: 16px;
   }
-  .icon-chevron-right {
+  .fa-chevron-right {
     float: right;
     margin: 0;
     color: $nav-stacked-chevron-color;
@@ -94,5 +94,6 @@
     text-align: center;
     position: absolute;
     left: 2px;
+    line-height: 20px;
   }
 }

app/assets/stylesheets/desktop/compose.scss

@@ -540,7 +540,7 @@ div.ac-wrap {
     margin: 0;
   }
   .auto-close-fields {
-    i.icon-time {
+    i.fa-clock-o {
       font-size: 16px;
       line-height: 8px;
     }

app/assets/stylesheets/desktop/discourse.scss

@@ -116,7 +116,7 @@ body {
     }
   }
   #main {
-    .icon-star.starred {
+    .fa-star.starred {
       color: #e45735;
     }
     a.star {

app/assets/stylesheets/desktop/header.scss

@@ -31,7 +31,7 @@
   #site-logo {
     max-width: 122px;
   }
-  .icon-home {
+  .fa-home {
     font-size: 20px;
     line-height: 40px;
   }
@@ -101,7 +101,7 @@
         border-top: 1px solid $white;
       }
     }
-    [class^="icon-"] {
+    [class^="fa fa-"] {
       width: 32px;
       height: 32px;
       font-size: 20px;
@@ -165,7 +165,7 @@
     padding: 5px;
     font-size: 13px;
     line-height: 16px;
-    .icon {
+    .fa {
       margin-right: 3px;
     }
   }
@@ -187,7 +187,7 @@
   // Notifications
 
   &#notifications-dropdown {
-    .icon {
+    .fa {
       color: #777;
     }
     li {

app/assets/stylesheets/desktop/modal.scss

@@ -364,7 +364,7 @@
   .permission {
     margin-left: 20px;
   }
-  .icon-remove-sign {
+  .fa-times-circle {
     margin-left: 5px;
   }
   li {

app/assets/stylesheets/desktop/topic-list.scss

@@ -115,7 +115,7 @@
   .star {
     width: 20px;
     padding-right: 0;
-    .icon-star {
+    .fa-star {
       position: relative;
     }
     + .main-link {

app/assets/stylesheets/desktop/topic-post.scss

@@ -1,5 +1,6 @@
 @import "common/foundation/variables";
 @import "common/foundation/mixins";
+@import "common/foundation/helpers";
 
 .gap {
   background-color: #f9f9f9;
@@ -350,7 +351,7 @@ a.star {
         border-bottom: 0;
         padding-bottom: 1px;
       }
-      .icon {
+      .fa {
         margin: 0;
         font-size: 18px;
         line-height: 52px;
@@ -397,7 +398,7 @@ span.post-count {
   .btn {
     margin-bottom: 5px;
     margin-right: 10px;
-    .icon-star {margin-right: 5px;}
+    .fa-star {margin-right: 5px;}
   }
 }
 

app/assets/stylesheets/desktop/topic.scss

@@ -61,7 +61,7 @@
   }
   .topic-statuses {
     margin-top: -2px;
-    .icon-pushpin { margin-top: -1px; }
+    .fa-thumb-tack { margin-top: -1px; }
   }
   .chzn-container { vertical-align: middle; }
 }
@@ -69,7 +69,7 @@
 #topic-closing-info {
   margin-left: 10px;
   margin-top: 10px;
-  height: 20px; 
+  height: 20px;
 }
 
 #topic-progress-wrapper {

app/assets/stylesheets/desktop/upload.scss

@@ -1,7 +1,7 @@
 @import "common/foundation/variables";
 @import "common/foundation/mixins";
 
-.add-upload .icon-plus {
+.add-upload .fa-plus {
   font-size: 10px;
   position: relative;
   left: -5px;

app/assets/stylesheets/desktop/user.scss

@@ -310,7 +310,7 @@
   .avatar-link {
     float: none;
   }
-  .icon {
+  .fa {
     width: 15px;
     display: inline-block;
     color: #777;

app/assets/stylesheets/mobile/compose.scss

@@ -476,7 +476,7 @@ div.ac-wrap {
     margin: 0;
   }
   .auto-close-fields {
-    i.icon-time {
+    i.fa-clock-o {
       font-size: 16px;
       line-height: 8px;
     }

app/assets/stylesheets/mobile/discourse.scss

@@ -90,7 +90,7 @@ body {
     }
   }
   #main {
-    .icon-star.starred {
+    .fa-star.starred {
       color: #fe1;
     }
     a.star {

app/assets/stylesheets/mobile/header.scss

@@ -6,14 +6,14 @@
 // --------------------------------------------------
 
 .d-header {
-  padding-left: 10px !important; 
+  padding-left: 10px !important;
   padding-right: 10px !important;
   min-width: 100%;
   position: absolute;
   top: 0;
   z-index: 1001;
   background-color: #fff;
-box-shadow: 0 0 3px #aaa;
+  box-shadow: 0 0 3px #aaa;
 
   .docked & {
     position: fixed;
@@ -36,7 +36,7 @@ box-shadow: 0 0 3px #aaa;
   #site-logo {
     width: 110px;
   }
-  .icon-home {
+  .fa-home {
     font-size: 20px;
     line-height: 40px;
   }
@@ -108,7 +108,7 @@ box-shadow: 0 0 3px #aaa;
         border-top: 1px solid $white;
       }
     }
-    [class^="icon-"] {
+    [class^="fa fa-"] {
       width: 32px;
       height: 32px;
       font-size: 20px;
@@ -172,7 +172,7 @@ box-shadow: 0 0 3px #aaa;
     padding: 5px;
     font-size: 13px;
     line-height: 16px;
-    .icon {
+    .fa {
       margin-right: 3px;
     }
   }
@@ -191,7 +191,7 @@ box-shadow: 0 0 3px #aaa;
   // Notifications
 
   &#notifications-dropdown {
-    .icon {
+    .fa {
       color: #777;
     }
     li {

app/assets/stylesheets/mobile/modal.scss

@@ -338,7 +338,7 @@
   .permission {
     margin-left: 20px;
   }
-  .icon-remove-sign {
+  .fa-times-circle {
     margin-left: 5px;
   }
   li {

app/assets/stylesheets/mobile/topic-post.scss

@@ -251,7 +251,7 @@ a.star {
       }
       &.collapsed {
       }
-      .icon {
+      .fa {
         margin: 0;
         font-size: 18px;
         line-height: 52px;
@@ -295,7 +295,7 @@ span.post-count {
   .btn {
     margin-bottom: 5px;
     margin-right: 10px;
-    .icon-star {margin-right: 5px;}
+    .fa-star {margin-right: 5px;}
   }
 }
 

app/assets/stylesheets/mobile/upload.scss

@@ -1,7 +1,7 @@
 @import "../common/foundation/variables";
 @import "../common/foundation/mixins";
 
-.add-upload .icon-plus {
+.add-upload .fa-plus {
   font-size: 10px;
   position: relative;
   left: -5px;

app/assets/stylesheets/mobile/user.scss

@@ -241,7 +241,7 @@
   .avatar-link {
     float: none;
   }
-  .icon {
+  .fa {
     width: 15px;
     display: inline-block;
     color: #777;