Add and change some Fontello icons for admin theme

16 files changed, 919 insertions, 405 deletions

diff --git a/theme/admin/html/main.php b/theme/admin/html/main.php
index db637da..9a5de23 100644
--- a/theme/admin/html/main.php
+++ b/theme/admin/html/main.php
@@ -26,8 +26,8 @@
 					<?php if(Application::isAuthenticated()): ?>
 						<li><a href="<?=Application::getAdminURL()?>" title="<?=$Language->text('overview_dashboard_text')?>"><i class="fa fa-dashboard"></i><span>Dashboard</span></a></li>
 						<li><a href="<?=Application::getAdminURL('post/')?>" title="<?=$Language->text('post_overview')?>"><i class="fa fa-newspaper-o"></i><span><?=$Language->text('posts')?></span></a></li>
-						<li><a href="<?=Application::getAdminURL('page/')?>" title="<?=$Language->text('page_overview')?>"><i class="fa fa-file-text-o"></i><span><?=$Language->text('pages')?></span></a></li>
-						<li><a href="<?=Application::getAdminURL('user/')?>" title="<?=$Language->text('user_overview')?>"><i class="fa fa-user"></i><span><?=$Language->text('users')?></span></a></li>
+						<li><a href="<?=Application::getAdminURL('page/')?>" title="<?=$Language->text('page_overview')?>"><i class="fa fa-folder-open"></i><span><?=$Language->text('pages')?></span></a></li>
+						<li><a href="<?=Application::getAdminURL('user/')?>" title="<?=$Language->text('user_overview')?>"><i class="fa fa-users"></i><span><?=$Language->text('users')?></span></a></li>
 						<li><a href="<?=Application::getAdminURL('database.php')?>" title="<?=$Language->text('overview_database_text')?>"><i class="fa fa-database"></i><span><?=$Language->text('overview_database_text')?></span></a></li>
 						<li><a href="<?=Application::getAdminURL('auth.php?action=logout&amp;token='.Application::getSecurityToken())?>"><i class="fa fa-sign-out"></i><span><?=$Language->text('logout')?></span></a></li>
 					<?php else: ?>
diff --git a/theme/admin/html/page/form.php b/theme/admin/html/page/form.php
index c0ffe2f..e818e4b 100644
--- a/theme/admin/html/page/form.php
+++ b/theme/admin/html/page/form.php
@@ -46,7 +46,7 @@
 		</div>
 
 		<label for="form_time_update">
-			<i class="fa fa-clock-o"></i><?=$Language->text('label_update')?></label>
+			<i class="fa fa-pencil"></i><?=$Language->text('label_update')?></label>
 
 		<div class="form-grid-item">
 			<input id="form_time_update" name="time_update" placeholder="<?=escapeHTML($FORM['DATA']['TIME_UPDATE'] ? $FORM['DATA']['TIME_UPDATE'] : 'CURRENT_TIMESTAMP')?>" value="" />
diff --git a/theme/admin/html/page/index.php b/theme/admin/html/page/index.php
index bdc7f94..b53e269 100644
--- a/theme/admin/html/page/index.php
+++ b/theme/admin/html/page/index.php
@@ -1,8 +1,8 @@
 <main id="main-content" class="wide">
-<h1><i class="fa fa-file-text-o"></i><?=$Language->text('page_overview')?></h1>
+<h1><i class="fa fa-folder-open"></i><?=$Language->text('page_overview')?></h1>
 <p class="actions-before"><?=$Language->text('overview_page_desc')?></p>
 <ul class="actions">
-	<li><a href="<?=Application::getAdminURL('page/insert.php')?>" title="<?=$Language->text('insert_page')?>"><i class="fa fa-pencil-square-o"></i><?=$Language->text('insert')?></a></li>
+	<li><a href="<?=Application::getAdminURL('page/insert.php')?>" title="<?=$Language->text('insert_page')?>"><i class="fa fa-plus"></i><?=$Language->text('insert')?></a></li>
 	<li><a href="<?=Application::getAdminURL('page/search.php')?>" title="<?=$Language->text('search_page')?>"><i class="fa fa-search"></i><?=$Language->text('search')?></a></li>
 </ul>
 
diff --git a/theme/admin/html/post/form.php b/theme/admin/html/post/form.php
index dbf0ab5..08f82dd 100644
--- a/theme/admin/html/post/form.php
+++ b/theme/admin/html/post/form.php
@@ -46,7 +46,7 @@
 		</div>
 
 		<label for="form_time_update">
-			<i class="fa fa-clock-o"></i><?=$Language->text('label_update')?></label>
+			<i class="fa fa-pencil"></i><?=$Language->text('label_update')?></label>
 
 		<div class="form-grid-item">
 			<input id="form_time_update" name="time_update" placeholder="<?=escapeHTML($FORM['DATA']['TIME_UPDATE'] ? $FORM['DATA']['TIME_UPDATE'] : 'CURRENT_TIMESTAMP')?>" value="" />
diff --git a/theme/admin/html/post/index.php b/theme/admin/html/post/index.php
index 83dd5dc..eb5cb7e 100644
--- a/theme/admin/html/post/index.php
+++ b/theme/admin/html/post/index.php
@@ -2,7 +2,7 @@
 <h1><i class="fa fa-newspaper-o"></i><?=$Language->text('post_overview')?></h1>
 <p class="actions-before"><?=$Language->text('overview_post_desc')?></p>
 <ul class="actions">
-	<li><a href="<?=Application::getAdminURL('post/insert.php')?>" title="<?=$Language->text('insert_post')?>"><i class="fa fa-pencil-square-o"></i><?=$Language->text('insert')?></a></li>
+	<li><a href="<?=Application::getAdminURL('post/insert.php')?>" title="<?=$Language->text('insert_post')?>"><i class="fa fa-plus"></i><?=$Language->text('insert')?></a></li>
 	<li><a href="<?=Application::getAdminURL('post/search.php')?>" title="<?=$Language->text('search_post')?>"><i class="fa fa-search"></i><?=$Language->text('search')?></a></li>
 </ul>
 
diff --git a/theme/admin/html/user/form.php b/theme/admin/html/user/form.php
index 54e21a1..2c12936 100644
--- a/theme/admin/html/user/form.php
+++ b/theme/admin/html/user/form.php
@@ -56,7 +56,7 @@
 		</div>
 
 		<label for="form_time_update">
-			<i class="fa fa-clock-o"></i><?=$Language->text('label_update')?></label>
+			<i class="fa fa-pencil"></i><?=$Language->text('label_update')?></label>
 
 		<div class="form-grid-item">
 			<input id="form_time_update" name="time_update" placeholder="<?=escapeHTML($FORM['DATA']['TIME_UPDATE'] ? $FORM['DATA']['TIME_UPDATE'] : 'CURRENT_TIMESTAMP')?>" value="" />
diff --git a/theme/admin/html/user/index.php b/theme/admin/html/user/index.php
index 7e1d794..1746f11 100644
--- a/theme/admin/html/user/index.php
+++ b/theme/admin/html/user/index.php
@@ -1,8 +1,8 @@
 <main id="main-content">
-<h1><i class="fa fa-user"></i><?=$Language->text('user_overview')?></h1>
+<h1><i class="fa fa-users"></i><?=$Language->text('user_overview')?></h1>
 <p class="actions-before"><?=$Language->text('overview_user_desc')?></p>
 <ul class="actions">
-	<li><a href="<?=Application::getAdminURL('user/insert.php')?>" title="<?=$Language->text('insert_user')?>"><i class="fa fa-pencil-square-o"></i><?=$Language->text('insert')?></a></li>
+	<li><a href="<?=Application::getAdminURL('user/insert.php')?>" title="<?=$Language->text('insert_user')?>"><i class="fa fa-plus"></i><?=$Language->text('insert')?></a></li>
 </ul>
 
 <div class="item-container user">
diff --git a/theme/admin/rsrc/css/import/_font-awesome.scss b/theme/admin/rsrc/css/import/_font-awesome.scss
deleted file mode 100644
index 448491f..0000000
--- a/theme/admin/rsrc/css/import/_font-awesome.scss
+++ /dev/null
@@ -1,138 +0,0 @@
-/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# FontAwesome Main
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-.fa {
-	font: normal normal normal 14px/1 "FontAwesome";
-	font-size: inherit;
-	speak: none;
-	display: inline-block;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale
-}
-
-/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# FontAwesome Icons
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-.fa-bug:before {
-	content: "\f188";
-}
-
-.fa-key:before {
-	content: "\f084";
-}
-
-.fa-link:before {
-	content: "\f0c1";
-}
-
-.fa-bold:before {
-	content: "\f032";
-}
-
-.fa-code:before {
-	content: "\f121";
-}
-
-.fa-user:before {
-	content: "\f007";
-}
-
-.fa-book:before {
-	content: "\f02d";
-}
-
-.fa-italic:before {
-	content: "\f033";
-}
-
-.fa-header:before {
-	content: "\f1dc";
-}
-
-.fa-search:before {
-	content: "\f002";
-}
-
-.fa-trash-o:before {
-	content: "\f014";
-}
-
-.fa-sign-in:before {
-	content: "\f090";
-}
-
-.fa-clock-o:before {
-	content: "\f017";
-}
-
-.fa-list-ul:before {
-	content: "\f0ca";
-}
-
-.fa-list-ol:before {
-	content: "\f0cb";
-}
-
-.fa-database:before {
-	content: "\f1c0";
-}
-
-.fa-language:before {
-	content: "\f1ab";
-}
-
-.fa-sign-out:before {
-	content: "\f08b";
-}
-
-.fa-dashboard:before {
-	content: "\f0e4";
-}
-
-.fa-picture-o:before {
-	content: "\f03e";
-}
-
-.fa-envelope-o:before {
-	content: "\f003";
-}
-
-.fa-arrow-left:before {
-	content: "\f060";
-}
-
-.fa-quote-right:before {
-	content: "\f10e";
-}
-
-.fa-user-secret:before {
-	content: "\f21b";
-}
-
-.fa-file-text-o:before {
-	content: "\f0f6";
-}
-
-.fa-newspaper-o:before {
-	content: "\f1ea";
-}
-
-.fa-arrow-right:before {
-	content: "\f061";
-}
-
-.fa-external-link:before {
-	content: "\f08e";
-}
-
-.fa-github-square:before {
-	content: "\f092";
-}
-
-.fa-pencil-square-o:before {
-	content: "\f044";
-}
-
-.fa-exclamation-triangle:before {
-	content: "\f071";
-}
diff --git a/theme/admin/rsrc/css/import/_fontello.scss b/theme/admin/rsrc/css/import/_fontello.scss
new file mode 100644
index 0000000..7c2e964
--- /dev/null
+++ b/theme/admin/rsrc/css/import/_fontello.scss
@@ -0,0 +1,116 @@
+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# Fontello
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+.fa:before {
+	font-family: "Fontello";
+	font-style: normal;
+	font-weight: normal;
+	speak: never;
+
+	display: inline-block;
+	text-decoration: inherit;
+	text-align: center;
+
+	/* For safety - reset parent styles, that can break glyph codes*/
+	font-variant: normal;
+	text-transform: none;
+
+	/* Font smoothing. That was taken from TWBS */
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+
+	/* Uncomment for 3D effect */
+	/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
+}
+
+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# Font Awesome icons
+# ------------------
+# Copyright (C) 2016 by Dave Gandy
+# Author: Dave Gandy
+# License: SIL
+# Homepage: http://fortawesome.github.com/Font-Awesome/
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+.fa-pencil:before { content: '\e800'; }
+.fa-comment:before { content: '\e801'; }
+.fa-chat:before { content: '\e802'; }
+.fa-users:before { content: '\e803'; }
+.fa-cancel:before { content: '\e804'; }
+.fa-plus:before { content: '\e805'; }
+.fa-list:before { content: '\e80b'; }
+.fa-arrow-down:before { content: '\e80e'; }
+.fa-arrow-up:before { content: '\e811'; }
+.fa-arrows-cw:before { content: '\e813'; }
+.fa-tag:before { content: '\e815'; }
+.fa-tags:before { content: '\e816'; }
+.fa-star:before { content: '\e817'; }
+.fa-star-empty:before { content: '\e818'; }
+.fa-eye:before { content: '\e81a'; }
+.fa-ok:before { content: '\e81b'; }
+.fa-info-circled:before { content: '\e81c'; }
+.fa-home:before { content: '\e81d'; }
+.fa-attach:before { content: '\e81e'; }
+.fa-cog:before { content: '\e81f'; }
+.fa-check:before { content: '\e821'; }
+.fa-floppy:before { content: '\e822'; }
+.fa-eye-off:before { content: '\e823'; }
+.fa-folder-open:before { content: '\e824'; }
+.fa-wrench:before { content: '\e825'; }
+.fa-search:before { content: '\f002'; }
+.fa-envelope-o:before { content: '\f003'; }
+.fa-user:before { content: '\f007'; }
+.fa-trash-o:before { content: '\f014'; }
+.fa-clock-o:before { content: '\f017'; }
+.fa-book:before { content: '\f02d'; }
+.fa-bold:before { content: '\f032'; }
+.fa-italic:before { content: '\f033'; }
+.fa-picture-o:before { content: '\f03e'; }
+.fa-pencil-square-o:before { content: '\f044'; }
+.fa-arrow-left:before { content: '\f060'; }
+.fa-arrow-right:before { content: '\f061'; }
+.fa-exclamation-triangle:before { content: '\f071'; }
+.fa-key:before { content: '\f084'; }
+.fa-sign-out:before { content: '\f08b'; }
+.fa-external-link:before { content: '\f08e'; }
+.fa-sign-in:before { content: '\f090'; }
+.fa-github-square:before { content: '\f092'; }
+.fa-uncheck:before { content: '\f096'; }
+.fa-link:before { content: '\f0c1'; }
+.fa-menu:before { content: '\f0c9'; }
+.fa-list-ul:before { content: '\f0ca'; }
+.fa-list-ol:before { content: '\f0cb'; }
+.fa-dashboard:before { content: '\f0e4'; }
+.fa-comment-empty:before { content: '\f0e5'; }
+.fa-chat-empty:before { content: '\f0e6'; }
+.fa-file-text-o:before { content: '\f0f6'; }
+.fa-quote-left:before { content: '\f10d'; }
+.fa-quote-right:before { content: '\f10e'; }
+.fa-smile:before { content: '\f118'; }
+.fa-frown:before { content: '\f119'; }
+.fa-meh:before { content: '\f11a'; }
+.fa-keyboard:before { content: '\f11c'; }
+.fa-code:before { content: '\f121'; }
+.fa-attention-alt:before { content: '\f12a'; }
+.fa-sort-name-up:before { content: '\f15d'; }
+.fa-sort-name-down:before { content: '\f15e'; }
+.fa-sort-up:before { content: '\f160'; }
+.fa-sort-down:before { content: '\f161'; }
+.fa-sort-number-up:before { content: '\f162'; }
+.fa-sort-number-down:before { content: '\f163'; }
+.fa-sun:before { content: '\f185'; }
+.fa-moon:before { content: '\f186'; }
+.fa-box:before { content: '\f187'; }
+.fa-bug:before { content: '\f188'; }
+.fa-language:before { content: '\f1ab'; }
+.fa-database:before { content: '\f1c0'; }
+.fa-file-archive:before { content: '\f1c6'; }
+.fa-header:before { content: '\f1dc'; }
+.fa-newspaper-o:before { content: '\f1ea'; }
+.fa-at:before { content: '\f1fa'; }
+.fa-toggle-off:before { content: '\f204'; }
+.fa-toggle-on:before { content: '\f205'; }
+.fa-user-secret:before { content: '\f21b'; }
+.fa-server:before { content: '\f233'; }
+.fa-commenting:before { content: '\f27a'; }
+.fa-commenting-o:before { content: '\f27b'; }
+.fa-user-circle-o:before { content: '\f2be'; }
diff --git a/theme/admin/rsrc/css/import/_fonts.scss b/theme/admin/rsrc/css/import/_fonts.scss
index 2145065..4431bec 100644
--- a/theme/admin/rsrc/css/import/_fonts.scss
+++ b/theme/admin/rsrc/css/import/_fonts.scss
@@ -2,9 +2,10 @@
 # Font "Font Awesome" [4.7.0] (by Fontello): SIL Open Font License (OFL)
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 @font-face {
-	font-family: "FontAwesome";
+	font-family: "Fontello";
 	font-weight: 400;
-	src: url("../font/font-awesome-fontello.woff2") format("woff2");
+	font-style: normal;
+	src: url("../font/fontello.woff2") format("woff2");
 }
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/theme/admin/rsrc/css/main.css b/theme/admin/rsrc/css/main.css
index 7d93d94..d227c31 100644
--- a/theme/admin/rsrc/css/main.css
+++ b/theme/admin/rsrc/css/main.css
@@ -588,7 +588,7 @@ table, td {
 
 .button-list.markdown > li {
   float: left;
-  padding: 0.5rem;
+  padding: 0.25rem;
   cursor: pointer;
   width: 1.75rem;
   box-sizing: border-box;
@@ -793,151 +793,374 @@ label:after {
   }
 }
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# FontAwesome Main
+# Fontello
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-.fa {
-  font: normal normal normal 14px/1 "FontAwesome";
-  font-size: inherit;
-  speak: none;
+.fa:before {
+  font-family: "Fontello";
+  font-style: normal;
+  font-weight: normal;
+  speak: never;
   display: inline-block;
+  text-decoration: inherit;
+  text-align: center;
+  /* For safety - reset parent styles, that can break glyph codes*/
+  font-variant: normal;
+  text-transform: none;
+  /* Font smoothing. That was taken from TWBS */
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  /* Uncomment for 3D effect */
+  /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# FontAwesome Icons
+# Font Awesome icons
+# ------------------
+# Copyright (C) 2016 by Dave Gandy
+# Author: Dave Gandy
+# License: SIL
+# Homepage: http://fortawesome.github.com/Font-Awesome/
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-.fa-bug:before {
-  content: "";
+.fa-pencil:before {
+  content: "";
 }
 
-.fa-key:before {
-  content: "";
+.fa-comment:before {
+  content: "";
 }
 
-.fa-link:before {
-  content: "";
+.fa-chat:before {
+  content: "";
 }
 
-.fa-bold:before {
-  content: "";
+.fa-users:before {
+  content: "";
 }
 
-.fa-code:before {
-  content: "";
+.fa-cancel:before {
+  content: "";
+}
+
+.fa-plus:before {
+  content: "";
+}
+
+.fa-list:before {
+  content: "";
+}
+
+.fa-arrow-down:before {
+  content: "";
+}
+
+.fa-arrow-up:before {
+  content: "";
+}
+
+.fa-arrows-cw:before {
+  content: "";
+}
+
+.fa-tag:before {
+  content: "";
+}
+
+.fa-tags:before {
+  content: "";
+}
+
+.fa-star:before {
+  content: "";
+}
+
+.fa-star-empty:before {
+  content: "";
+}
+
+.fa-eye:before {
+  content: "";
+}
+
+.fa-ok:before {
+  content: "";
+}
+
+.fa-info-circled:before {
+  content: "";
+}
+
+.fa-home:before {
+  content: "";
+}
+
+.fa-attach:before {
+  content: "";
+}
+
+.fa-cog:before {
+  content: "";
+}
+
+.fa-check:before {
+  content: "";
+}
+
+.fa-floppy:before {
+  content: "";
+}
+
+.fa-eye-off:before {
+  content: "";
+}
+
+.fa-folder-open:before {
+  content: "";
+}
+
+.fa-wrench:before {
+  content: "";
+}
+
+.fa-search:before {
+  content: "";
+}
+
+.fa-envelope-o:before {
+  content: "";
 }
 
 .fa-user:before {
   content: "";
 }
 
+.fa-trash-o:before {
+  content: "";
+}
+
+.fa-clock-o:before {
+  content: "";
+}
+
 .fa-book:before {
   content: "";
 }
 
+.fa-bold:before {
+  content: "";
+}
+
 .fa-italic:before {
   content: "";
 }
 
-.fa-header:before {
-  content: "";
+.fa-picture-o:before {
+  content: "";
 }
 
-.fa-search:before {
-  content: "";
+.fa-pencil-square-o:before {
+  content: "";
 }
 
-.fa-trash-o:before {
-  content: "";
+.fa-arrow-left:before {
+  content: "";
+}
+
+.fa-arrow-right:before {
+  content: "";
+}
+
+.fa-exclamation-triangle:before {
+  content: "";
+}
+
+.fa-key:before {
+  content: "";
+}
+
+.fa-sign-out:before {
+  content: "";
+}
+
+.fa-external-link:before {
+  content: "";
 }
 
 .fa-sign-in:before {
   content: "";
 }
 
-.fa-clock-o:before {
-  content: "";
+.fa-github-square:before {
+  content: "";
 }
 
-.fa-list-ul:before {
-  content: "";
+.fa-uncheck:before {
+  content: "";
 }
 
-.fa-list-ol:before {
-  content: "";
+.fa-link:before {
+  content: "";
 }
 
-.fa-database:before {
-  content: "";
+.fa-menu:before {
+  content: "";
 }
 
-.fa-language:before {
-  content: "";
+.fa-list-ul:before {
+  content: "";
 }
 
-.fa-sign-out:before {
-  content: "";
+.fa-list-ol:before {
+  content: "";
 }
 
 .fa-dashboard:before {
   content: "";
 }
 
-.fa-picture-o:before {
-  content: "";
+.fa-comment-empty:before {
+  content: "";
 }
 
-.fa-envelope-o:before {
-  content: "";
+.fa-chat-empty:before {
+  content: "";
 }
 
-.fa-arrow-left:before {
-  content: "";
+.fa-file-text-o:before {
+  content: "";
+}
+
+.fa-quote-left:before {
+  content: "";
 }
 
 .fa-quote-right:before {
   content: "";
 }
 
-.fa-user-secret:before {
-  content: "";
+.fa-smile:before {
+  content: "";
 }
 
-.fa-file-text-o:before {
-  content: "";
+.fa-frown:before {
+  content: "";
+}
+
+.fa-meh:before {
+  content: "";
+}
+
+.fa-keyboard:before {
+  content: "";
+}
+
+.fa-code:before {
+  content: "";
+}
+
+.fa-attention-alt:before {
+  content: "";
+}
+
+.fa-sort-name-up:before {
+  content: "";
+}
+
+.fa-sort-name-down:before {
+  content: "";
+}
+
+.fa-sort-up:before {
+  content: "";
+}
+
+.fa-sort-down:before {
+  content: "";
+}
+
+.fa-sort-number-up:before {
+  content: "";
+}
+
+.fa-sort-number-down:before {
+  content: "";
+}
+
+.fa-sun:before {
+  content: "";
+}
+
+.fa-moon:before {
+  content: "";
+}
+
+.fa-box:before {
+  content: "";
+}
+
+.fa-bug:before {
+  content: "";
+}
+
+.fa-language:before {
+  content: "";
+}
+
+.fa-database:before {
+  content: "";
+}
+
+.fa-file-archive:before {
+  content: "";
+}
+
+.fa-header:before {
+  content: "";
 }
 
 .fa-newspaper-o:before {
   content: "";
 }
 
-.fa-arrow-right:before {
-  content: "";
+.fa-at:before {
+  content: "";
 }
 
-.fa-external-link:before {
-  content: "";
+.fa-toggle-off:before {
+  content: "";
 }
 
-.fa-github-square:before {
-  content: "";
+.fa-toggle-on:before {
+  content: "";
 }
 
-.fa-pencil-square-o:before {
-  content: "";
+.fa-user-secret:before {
+  content: "";
 }
 
-.fa-exclamation-triangle:before {
-  content: "";
+.fa-server:before {
+  content: "";
+}
+
+.fa-commenting:before {
+  content: "";
+}
+
+.fa-commenting-o:before {
+  content: "";
+}
+
+.fa-user-circle-o:before {
+  content: "";
 }
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 # Font "Font Awesome" [4.7.0] (by Fontello): SIL Open Font License (OFL)
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 @font-face {
-  font-family: "FontAwesome";
+  font-family: "Fontello";
   font-weight: 400;
-  src: url("../font/font-awesome-fontello.woff2") format("woff2");
+  font-style: normal;
+  src: url("../font/fontello.woff2") format("woff2");
 }
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 # Font "Kadwa": SIL Open Font License (OFL)
diff --git a/theme/admin/rsrc/css/main.scss b/theme/admin/rsrc/css/main.scss
index cc9bbb1..9eff371 100644
--- a/theme/admin/rsrc/css/main.scss
+++ b/theme/admin/rsrc/css/main.scss
@@ -656,7 +656,7 @@ table, td {
 
 .button-list.markdown > li {
 	float: left;
-	padding: 0.5rem;
+	padding: 0.25rem;
 	cursor: pointer;
 	width: 1.75rem;
 	box-sizing: border-box;
@@ -788,5 +788,5 @@ label {
 }
 
 @import "import/responsive";
-@import "import/font-awesome";
+@import "import/fontello";
 @import "import/fonts";
diff --git a/theme/admin/rsrc/font/font-awesome-fontello.json b/theme/admin/rsrc/font/font-awesome-fontello.json
deleted file mode 100644
index 599f149..0000000
--- a/theme/admin/rsrc/font/font-awesome-fontello.json
+++ /dev/null
@@ -1,196 +0,0 @@
-{
-  "name": "",
-  "css_prefix_text": "fa-",
-  "css_use_suffix": false,
-  "hinting": true,
-  "units_per_em": 1000,
-  "ascent": 850,
-  "glyphs": [
-    {
-      "uid": "7432077e6a2d6aa19984ca821bb6bbda",
-      "css": "bug",
-      "code": 61832,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "f2aa28a2548ed3d2be718d087b65ee21",
-      "css": "key",
-      "code": 61572,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "0ddd3e8201ccc7d41f7b7c9d27eca6c1",
-      "css": "link",
-      "code": 61633,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "02cca871bb69da75e8ee286b7055832c",
-      "css": "bold",
-      "code": 61490,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "7034e4d22866af82bef811f52fb1ba46",
-      "css": "code",
-      "code": 61729,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "8b80d36d4ef43889db10bc1f0dc9a862",
-      "css": "user",
-      "code": 61447,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "9755f76110ae4d12ac5f9466c9152031",
-      "css": "book",
-      "code": 61485,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "a8cb1c217f02b073db3670c061cc54d2",
-      "css": "italic",
-      "code": 61491,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "0c708edd8fae2376b3370aa56d40cf9e",
-      "css": "header",
-      "code": 61916,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "f48ae54adfb27d8ada53d0fd9e34ee10",
-      "css": "trash-o",
-      "code": 61460,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "3a00327e61b997b58518bd43ed83c3df",
-      "css": "sign-in",
-      "code": 61584,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "598a5f2bcf3521d1615de8e1881ccd17",
-      "css": "clock-o",
-      "code": 61463,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "a2a74f5e7b7d9ba054897d8c795a326a",
-      "css": "list-ul",
-      "code": 61642,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "f6766a8b042c2453a4e153af03294383",
-      "css": "list-ol",
-      "code": 61643,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "347c38a8b96a509270fdcabc951e7571",
-      "css": "database",
-      "code": 61888,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "4fc9b8c122d1b5ca3df42a104a655e8b",
-      "css": "language",
-      "code": 61867,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "0d20938846444af8deb1920dc85a29fb",
-      "css": "sign-out",
-      "code": 61579,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "0bda4bc779d4c32623dec2e43bd67ee8",
-      "css": "dashboard",
-      "code": 61668,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "381da2c2f7fd51f8de877c044d7f439d",
-      "css": "picture-o",
-      "code": 61502,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "bf882b30900da12fca090d9796bc3030",
-      "css": "envelope-o",
-      "code": 61443,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "555ef8c86832e686fef85f7af2eb7cde",
-      "css": "arrow-left",
-      "code": 61536,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "d745d7c05b94e609decabade2cae12cb",
-      "css": "quote-right",
-      "code": 61710,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "f9c8ea86275ca16128235c6452b67b8e",
-      "css": "user-secret",
-      "code": 61979,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "5408be43f7c42bccee419c6be53fdef5",
-      "css": "file-text-o",
-      "code": 61686,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "032bd8bbd70adf90ead98b6813bfe446",
-      "css": "newspaper-o",
-      "code": 61930,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "ad6b3fbb5324abe71a9c0b6609cbb9f1",
-      "css": "arrow-right",
-      "code": 61537,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "e15f0d620a7897e2035c18c80142f6d9",
-      "css": "external-link",
-      "code": 61582,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "0ece9a12de796b8411f868d582bee678",
-      "css": "github-square",
-      "code": 61586,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "41087bc74d4b20b55059c60a33bf4008",
-      "css": "pencil-square-o",
-      "code": 61508,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "c76b7947c957c9b78b11741173c8349b",
-      "css": "exclamation-triangle",
-      "code": 61553,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "9dd9e835aebe1060ba7190ad2b2ed951",
-      "css": "search",
-      "code": 61442,
-      "src": "fontawesome"
-    }
-  ]
-}
diff --git a/theme/admin/rsrc/font/font-awesome-fontello.woff2 b/theme/admin/rsrc/font/font-awesome-fontello.woff2
deleted file mode 100644
index 5b5c567..0000000
--- a/theme/admin/rsrc/font/font-awesome-fontello.woff2
+++ /dev/null
diff --git a/theme/admin/rsrc/font/fontello.json b/theme/admin/rsrc/font/fontello.json
new file mode 100644
index 0000000..1af78d5
--- /dev/null
+++ b/theme/admin/rsrc/font/fontello.json
@@ -0,0 +1,508 @@
+{
+  "name": "",
+  "css_prefix_text": "fa-",
+  "css_use_suffix": false,
+  "hinting": true,
+  "units_per_em": 1000,
+  "ascent": 850,
+  "glyphs": [
+    {
+      "uid": "7432077e6a2d6aa19984ca821bb6bbda",
+      "css": "bug",
+      "code": 61832,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "f2aa28a2548ed3d2be718d087b65ee21",
+      "css": "key",
+      "code": 61572,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "0ddd3e8201ccc7d41f7b7c9d27eca6c1",
+      "css": "link",
+      "code": 61633,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "02cca871bb69da75e8ee286b7055832c",
+      "css": "bold",
+      "code": 61490,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "7034e4d22866af82bef811f52fb1ba46",
+      "css": "code",
+      "code": 61729,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "8b80d36d4ef43889db10bc1f0dc9a862",
+      "css": "user",
+      "code": 61447,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "9755f76110ae4d12ac5f9466c9152031",
+      "css": "book",
+      "code": 61485,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "a8cb1c217f02b073db3670c061cc54d2",
+      "css": "italic",
+      "code": 61491,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "0c708edd8fae2376b3370aa56d40cf9e",
+      "css": "header",
+      "code": 61916,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "f48ae54adfb27d8ada53d0fd9e34ee10",
+      "css": "trash-o",
+      "code": 61460,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "3a00327e61b997b58518bd43ed83c3df",
+      "css": "sign-in",
+      "code": 61584,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "598a5f2bcf3521d1615de8e1881ccd17",
+      "css": "clock-o",
+      "code": 61463,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "a2a74f5e7b7d9ba054897d8c795a326a",
+      "css": "list-ul",
+      "code": 61642,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "f6766a8b042c2453a4e153af03294383",
+      "css": "list-ol",
+      "code": 61643,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "347c38a8b96a509270fdcabc951e7571",
+      "css": "database",
+      "code": 61888,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "4fc9b8c122d1b5ca3df42a104a655e8b",
+      "css": "language",
+      "code": 61867,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "0d20938846444af8deb1920dc85a29fb",
+      "css": "sign-out",
+      "code": 61579,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "0bda4bc779d4c32623dec2e43bd67ee8",
+      "css": "dashboard",
+      "code": 61668,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "381da2c2f7fd51f8de877c044d7f439d",
+      "css": "picture-o",
+      "code": 61502,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "bf882b30900da12fca090d9796bc3030",
+      "css": "envelope-o",
+      "code": 61443,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "555ef8c86832e686fef85f7af2eb7cde",
+      "css": "arrow-left",
+      "code": 61536,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "d745d7c05b94e609decabade2cae12cb",
+      "css": "quote-right",
+      "code": 61710,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "f9c8ea86275ca16128235c6452b67b8e",
+      "css": "user-secret",
+      "code": 61979,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "5408be43f7c42bccee419c6be53fdef5",
+      "css": "file-text-o",
+      "code": 61686,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "032bd8bbd70adf90ead98b6813bfe446",
+      "css": "newspaper-o",
+      "code": 61930,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "ad6b3fbb5324abe71a9c0b6609cbb9f1",
+      "css": "arrow-right",
+      "code": 61537,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "e15f0d620a7897e2035c18c80142f6d9",
+      "css": "external-link",
+      "code": 61582,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "0ece9a12de796b8411f868d582bee678",
+      "css": "github-square",
+      "code": 61586,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "41087bc74d4b20b55059c60a33bf4008",
+      "css": "pencil-square-o",
+      "code": 61508,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "c76b7947c957c9b78b11741173c8349b",
+      "css": "exclamation-triangle",
+      "code": 61553,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "9dd9e835aebe1060ba7190ad2b2ed951",
+      "css": "search",
+      "code": 61442,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "474656633f79ea2f1dad59ff63f6bf07",
+      "css": "star",
+      "code": 59415,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "d17030afaecc1e1c22349b99f3c4992a",
+      "css": "star-empty",
+      "code": 59416,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "31972e4e9d080eaa796290349ae6c1fd",
+      "css": "users",
+      "code": 59395,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "12f4ece88e46abd864e40b35e05b11cd",
+      "css": "ok",
+      "code": 59419,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "0d6ab6194c0eddda2b8c9cedf2ab248e",
+      "css": "attach",
+      "code": 59422,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "c5fd349cbd3d23e4ade333789c29c729",
+      "css": "eye",
+      "code": 59418,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "7fd683b2c518ceb9e5fa6757f2276faa",
+      "css": "eye-off",
+      "code": 59427,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "3db5347bd219f3bce6025780f5d9ef45",
+      "css": "tag",
+      "code": 59413,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "a3f89e106175a5c5c4e9738870b12e55",
+      "css": "tags",
+      "code": 59414,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "ab95e1351ebaec5850101097cbf7097f",
+      "css": "quote-left",
+      "code": 61709,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "d35a1d35efeb784d1dc9ac18b9b6c2b6",
+      "css": "pencil",
+      "code": 59392,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "ecb97add13804c190456025e43ec003b",
+      "css": "keyboard",
+      "code": 61724,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "85528017f1e6053b2253785c31047f44",
+      "css": "comment",
+      "code": 59393,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "dcedf50ab1ede3283d7a6c70e2fe32f3",
+      "css": "chat",
+      "code": 59394,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "31951fbb9820ed0690f675b3d495c8da",
+      "css": "chat-empty",
+      "code": 61670,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "9c1376672bb4f1ed616fdd78a23667e9",
+      "css": "comment-empty",
+      "code": 61669,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "00391fac5d419345ffcccd95b6f76263",
+      "css": "attention-alt",
+      "code": 61738,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "c95735c17a10af81448c7fed98a04546",
+      "css": "folder-open",
+      "code": 59428,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "559647a6f430b3aeadbecd67194451dd",
+      "css": "menu",
+      "code": 61641,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "e99461abfef3923546da8d745372c995",
+      "css": "cog",
+      "code": 59423,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "5bb103cd29de77e0e06a52638527b575",
+      "css": "wrench",
+      "code": 59429,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "1c4068ed75209e21af36017df8871802",
+      "css": "arrow-down",
+      "code": 59406,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "95376bf082bfec6ce06ea1cda7bd7ead",
+      "css": "arrow-up",
+      "code": 59409,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "a73c5deb486c8d66249811642e5d719a",
+      "css": "arrows-cw",
+      "code": 59411,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "aa035df0908c4665c269b7b09a5596f3",
+      "css": "sun",
+      "code": 61829,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "567e3e257f2cc8fba2c12bf691c9f2d8",
+      "css": "moon",
+      "code": 61830,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "2a4e6c99b732a57da40e32fa2a7800a4",
+      "css": "toggle-off",
+      "code": 61956,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "3256ef03b16e7ab51235bc7378b53bb5",
+      "css": "toggle-on",
+      "code": 61957,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "dd6c6b221a1088ff8a9b9cd32d0b3dd5",
+      "css": "check",
+      "code": 59425,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "4b900d04e8ab8c82f080c1cfbac5772c",
+      "css": "uncheck",
+      "code": 61590,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "f4445feb55521283572ee88bc304f928",
+      "css": "floppy",
+      "code": 59426,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "0cd2582b8c93719d066ee0affd02ac78",
+      "css": "sort-up",
+      "code": 61792,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "27b13eff5eb0ca15e01a6e65ffe6eeec",
+      "css": "sort-down",
+      "code": 61793,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "3ed68ae14e9cde775121954242a412b2",
+      "css": "sort-name-up",
+      "code": 61789,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "6586267200a42008a9fc0a1bf7ac06c7",
+      "css": "sort-name-down",
+      "code": 61790,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "3a7b6876c1817ce3b801b86c04a9d0af",
+      "css": "sort-number-up",
+      "code": 61794,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "b04fc30546f597a7e0a14715e6fc81ff",
+      "css": "sort-number-down",
+      "code": 61795,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "d59ff824282fc6edaeca991deab522aa",
+      "css": "server",
+      "code": 62003,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "33194d4a025fbf12baca54579afe4c8e",
+      "css": "at",
+      "code": 61946,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "53c28626072159c49f33b71d67138ad9",
+      "css": "commenting",
+      "code": 62074,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "9cc990bbcac7aa8504078b3f49df79b1",
+      "css": "commenting-o",
+      "code": 62075,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "3fce1eca43f917c8f23e532749abae5d",
+      "css": "user-circle-o",
+      "code": 62142,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "5211af474d3a9848f67f945e2ccaf143",
+      "css": "cancel",
+      "code": 59396,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "44e04715aecbca7f266a17d5a7863c68",
+      "css": "plus",
+      "code": 59397,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "e82cedfa1d5f15b00c5a81c9bd731ea2",
+      "css": "info-circled",
+      "code": 59420,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "d7271d490b71df4311e32cdacae8b331",
+      "css": "home",
+      "code": 59421,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "04ff8d6592fe548b332b27ed87ce397a",
+      "css": "box",
+      "code": 61831,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "e80ae555c1413a4ec18b33fb348b4049",
+      "css": "file-archive",
+      "code": 61894,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "d862a10e1448589215be19702f98f2c1",
+      "css": "smile",
+      "code": 61720,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "06ddc67d609c477cd5524a7238d7850d",
+      "css": "frown",
+      "code": 61721,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "2c5055a9c9723725f49f0593a08535af",
+      "css": "meh",
+      "code": 61722,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "48b87105bd38c20315f1b705b8c7b38c",
+      "css": "list",
+      "code": 59403,
+      "src": "fontawesome"
+    }
+  ]
+}
diff --git a/theme/admin/rsrc/font/fontello.woff2 b/theme/admin/rsrc/font/fontello.woff2
new file mode 100644
index 0000000..c62227f
--- /dev/null
+++ b/theme/admin/rsrc/font/fontello.woff2