Convert {booticon} to {biticon} — freedesktop/tango icon names throughout

Replace all {booticon iname="icon-*"} and {booticon iname="fa-*"} calls with
{biticon ipackage="icons" iname="<freedesktop-name>"} using the tango iconset.
Mapping covers ~70 distinct old names to tango equivalents (edit-delete,
document-properties, go-next, lock, internet-mail, etc.).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

22 files changed, 72 insertions, 72 deletions

diff --git a/modules/mod_user_profile.tpl b/modules/mod_user_profile.tpl
index f63bc44..d37bd8b 100644
--- a/modules/mod_user_profile.tpl
+++ b/modules/mod_user_profile.tpl
@@ -13,10 +13,10 @@
 
 	<div class="floaticon">
 		{if $gQueryUserId && $gBitSystem->isPackageActive( 'messages' ) && $gBitUser->hasPermission( 'p_messages_send' ) && $userPrefs.messages_allow_messages eq 'y'}
-			&nbsp;<a href="{$smarty.const.MESSAGES_PKG_URL}compose.php?to={$userInfo.login}">{booticon iname="fa-envelope" iexplain="Send user a personal message"}</a>
+			&nbsp;<a href="{$smarty.const.MESSAGES_PKG_URL}compose.php?to={$userInfo.login}">{biticon ipackage="icons" iname="internet-mail" iexplain="Send user a personal message"}</a>
 		{/if}
 		{if $gBitUser->hasPermission('p_users_edit_user_homepage')}
-			<a href="{$smarty.const.USERS_PKG_URL}preferences.php?view_user={$userInfo.user_id}">{booticon iname="fa-pencil" iexplain="Edit your preferences"}</a>
+			<a href="{$smarty.const.USERS_PKG_URL}preferences.php?view_user={$userInfo.user_id}">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="Edit your preferences"}</a>
 		{/if}
 	</div>
 
diff --git a/modules/mod_who_is_there.tpl b/modules/mod_who_is_there.tpl
index 6f48111..1ade10e 100644
--- a/modules/mod_who_is_there.tpl
+++ b/modules/mod_who_is_there.tpl
@@ -14,7 +14,7 @@
 	</div>
 	{section name=ix loop=$online_users}
 		{if $user && $gBitSystem->isFeatureActive( 'feature_messages' ) && $gBitUser->hasPermission( 'p_messages_send' )}
-			<a href="{$smarty.const.MESSAGES_PKG_URL}compose.php?to={$online_users[ix].user}" title="{tr}Send a message to{/tr} {$online_users[ix].user}">{booticon iname="fa-envelope" iexplain="send message"}</a>
+			<a href="{$smarty.const.MESSAGES_PKG_URL}compose.php?to={$online_users[ix].user}" title="{tr}Send a message to{/tr} {$online_users[ix].user}">{biticon ipackage="icons" iname="internet-mail" iexplain="send message"}</a>
 		{/if}
 		{if $online_users[ix].users_information eq 'public'}
 			{math equation="x - y" x=$smarty.now y=$online_users[ix].last_get assign=idle}
diff --git a/templates/admin_assign_role_user.tpl b/templates/admin_assign_role_user.tpl
index b3cfb8a..7ff11e5 100755
--- a/templates/admin_assign_role_user.tpl
+++ b/templates/admin_assign_role_user.tpl
@@ -1,7 +1,7 @@
 {* $Header$ *}
 {strip}
 <div class="floaticon">{bithelp}</div>
-<div class="floaticon"><a href="{$smarty.const.USERS_PKG_URL}admin/index.php">{booticon iname="fa-arrow-left" iexplain="back to users"}</a></div>
+<div class="floaticon"><a href="{$smarty.const.USERS_PKG_URL}admin/index.php">{biticon ipackage="icons" iname="go-previous" iexplain="back to users"}</a></div>
 
 <div class="admin users">
 	<div class="header">
@@ -52,7 +52,7 @@
 						<a href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php?role_id={$roleId}">{$role.role_name}</a>
 						{if $roleId eq $assignUser->mInfo.default_role_id}</strong>{/if}
 						{if $roleId != -1}
-							&nbsp;<a class="btn btn-xs btn-danger" href="{$smarty.const.USERS_PKG_URL}admin/assign_role_user.php?action=removerole&amp;role_id={$roleId}&amp;assign_user={$assignUser->mUserId}&amp;tk={$gBitUser->mTicket}">{booticon iname="fa-trash" iexplain="remove from role"}</a>
+							&nbsp;<a class="btn btn-xs btn-danger" href="{$smarty.const.USERS_PKG_URL}admin/assign_role_user.php?action=removerole&amp;role_id={$roleId}&amp;assign_user={$assignUser->mUserId}&amp;tk={$gBitUser->mTicket}">{biticon ipackage="icons" iname="edit-delete" iexplain="remove from role"}</a>
 						{/if}
 						<br />
 					{/foreach}
@@ -92,7 +92,7 @@
 						<td>{$role.role_desc}</td>
 						<td class="actionicon">
 							<a href="{$smarty.const.USERS_PKG_URL}admin/assign_role_user.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;action=assign&amp;role_id={$roleId}&amp;assign_user={$assignUser->mUserId}&amp;tk={$gBitUser->mTicket}">
-								{booticon iname="fa-key" iexplain="assign"}
+								{biticon ipackage="icons" iname="lock" iexplain="assign"}
 							</a>
 						</td>
 					</tr>
diff --git a/templates/admin_list_users.tpl b/templates/admin_list_users.tpl
index c17297f..94ca946 100755
--- a/templates/admin_list_users.tpl
+++ b/templates/admin_list_users.tpl
@@ -75,7 +75,7 @@
 					{/if}
 					{formlabel label="User will be added to the following role" for=""}
 					{forminput}
-						{$defaultRoleName} <a href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php?role_id={$defaultRoleId}">{booticon iname="fa-pen-to-square" iexplain="change settings"}</a>
+						{$defaultRoleName} <a href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php?role_id={$defaultRoleId}">{biticon ipackage="icons" iname="document-properties" iexplain="change settings"}</a>
 						{formhelp note="This is the role that is selected as the default role. If you would like to change the default role, please click on the edit icon and set a different role as default role."}
 					{/forminput}
 					</div>
diff --git a/templates/admin_login.tpl b/templates/admin_login.tpl
index 28403d9..4756674 100644
--- a/templates/admin_login.tpl
+++ b/templates/admin_login.tpl
@@ -89,7 +89,7 @@
 			{forminput}
 				{foreach from=$hybridProviders key=providerKey item=providerHash}
 					{assign var=providerActive value="users_ha_`$providerKey`_enabled"}
-					<fieldset><legend class="checkbox"><label><input id="{$providerActive}_checkbox" type="checkbox" name="hybridauth[{$providerActive}]" {if $gBitSystem->getConfig($providerActive)}checked{/if}> {booticon iname="fa-`$providerHash.icon`"} {$providerHash.provider}</label></legend>
+					<fieldset><legend class="checkbox"><label><input id="{$providerActive}_checkbox" type="checkbox" name="hybridauth[{$providerActive}]" {if $gBitSystem->getConfig($providerActive)}checked{/if}> {biticon ipackage="icons" iname="fa-`$providerHash.icon`"} {$providerHash.provider}</label></legend>
 					<script>
 					$('#{$providerActive}_checkbox').change(function(){
 						if($(this).prop("checked")) $('#{$providerActive}').show(); else $('#{$providerActive}').hide();
diff --git a/templates/admin_role_edit.tpl b/templates/admin_role_edit.tpl
index 7561773..c98b222 100755
--- a/templates/admin_role_edit.tpl
+++ b/templates/admin_role_edit.tpl
@@ -3,7 +3,7 @@
 
 <div class="floaticon">
 	<a href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php">
-		{booticon iname="fa-users" iexplain="Role List"}
+		{biticon ipackage="icons" iname="system-users" iexplain="Role List"}
 	</a>
 	{bithelp}
 </div>
diff --git a/templates/admin_role_permissions.tpl b/templates/admin_role_permissions.tpl
index 6075438..4cd2282 100755
--- a/templates/admin_role_permissions.tpl
+++ b/templates/admin_role_permissions.tpl
@@ -35,7 +35,7 @@
 						{assign var=prev_package value=$perm.package}
 					{/if}
 					<tr class="{cycle values="odd,even"}{if $unassignedPerms.$p|default:false} prio5{/if}">
-						<td>{if $unassignedPerms.$p|default:false}{booticon iname="fa-triangle-exclamation" iexplain="Unassigned Permission"}{/if}</td>
+						<td>{if $unassignedPerms.$p|default:false}{biticon ipackage="icons" iname="dialog-warning" iexplain="Unassigned Permission"}{/if}</td>
 						<td title="{$perm.perm_desc}"><abbr title="{$perm.perm_desc}">{$p}</abbr></td>
 						{foreach from=$allRoles item=role}
 							{if     $perm.perm_level == 'admin'     }{assign var=id value=1}
@@ -59,7 +59,7 @@
 
 							{if $role.role_id lt 4}
 								<td class="alignleft {$class} width5p">
-									{if $id == $role.role_id}<label for="{$p}{$role.role_id}">{booticon iname="fa-check" iexplain="Default"}</label>{/if}
+									{if $id == $role.role_id}<label for="{$p}{$role.role_id}">{biticon ipackage="icons" iname="dialog-ok" iexplain="Default"}</label>{/if}
 								</td>
 							{/if}
 						{/foreach}
@@ -67,7 +67,7 @@
 				{/foreach}
 			</table>
 
-			<p class="formhelp">{tr}Default permissions set after installation are marked with:{/tr} {booticon iname="fa-check" iexplain="Default"}</p>
+			<p class="formhelp">{tr}Default permissions set after installation are marked with:{/tr} {biticon ipackage="icons" iname="dialog-ok" iexplain="Default"}</p>
 
 			<div class="submit">
 				<input type="submit" class="btn btn-default" name="save" value="{tr}Apply Changes{/tr}" />
@@ -95,9 +95,9 @@
 										{foreach from=$perms item=perm}
 											<li>
 												{$perm.role_name}: {if $perm.is_revoked}
-													{booticon iname="fa-circle-minus" iexplain="Removed Permission"}
+													{biticon ipackage="icons" iname="list-remove" iexplain="Removed Permission"}
 												{else}
-													{booticon iname="fa-circle-plus" iexplain="Added Permission"}
+													{biticon ipackage="icons" iname="list-add" iexplain="Added Permission"}
 												{/if} {$perm.perm_name}
 											</li>
 										{/foreach}
diff --git a/templates/admin_roles_list.tpl b/templates/admin_roles_list.tpl
index 7e885a8..d1446c6 100755
--- a/templates/admin_roles_list.tpl
+++ b/templates/admin_roles_list.tpl
@@ -19,11 +19,11 @@
 			{foreach from=$roleList key=roleId item=grp}
 				<li class="item {cycle values='odd,even'}">
 					<div class="floaticon">
-						{smartlink ititle="Edit" ipackage="users" ifile="admin/edit_role.php" booticon="fa-edit" role_id=$roleId}
-						{smartlink ititle="Role Members" ipackage="users" ifile="admin/edit_role.php" booticon="fa-group" members=$roleId}
+						{smartlink ititle="Edit" ipackage="users" ifile="admin/edit_role.php" biticon="document-properties" role_id=$roleId}
+						{smartlink ititle="Role Members" ipackage="users" ifile="admin/edit_role.php" biticon="system-users" members=$roleId}
 						{if $roleId ne $smarty.const.ANONYMOUS_TEAM_ID}
-							{smartlink ititle="Batch assign" ipackage="users" ifile="admin/edit_role.php" booticon="fa-cogs" batch_assign=$roleId}
-							{smartlink ititle="Remove" ipackage="users" ifile="admin/edit_role.php" booticon="fa-trash" action=delete role_id=$roleId}
+							{smartlink ititle="Batch assign" ipackage="users" ifile="admin/edit_role.php" biticon="preferences-system" batch_assign=$roleId}
+							{smartlink ititle="Remove" ipackage="users" ifile="admin/edit_role.php" biticon="edit-delete" action=delete role_id=$roleId}
 						{/if}
 					</div>
 
diff --git a/templates/center_user_wiki_page.tpl b/templates/center_user_wiki_page.tpl
index 5ac6e53..1701eed 100644
--- a/templates/center_user_wiki_page.tpl
+++ b/templates/center_user_wiki_page.tpl
@@ -5,24 +5,24 @@
 		<div class="floaticon">
 			{if $gBitUser->hasPermission( 'p_users_admin' )}
 				{if $gBitSystem->isPackageActive( 'bitcommerce' ) && $gBitUser->hasPermission( 'p_commerce_admin' )}
-					{smartlink ipackage=bitcommerce ifile="admin/list_orders.php" user_id=$userInfo.user_id ititle="Orders" booticon="fa-shopping-cart"}
+					{smartlink ipackage=bitcommerce ifile="admin/list_orders.php" user_id=$userInfo.user_id ititle="Orders" biticon="package-x-generic"}
 				{/if}
-				{smartlink ipackage=users ifile="admin/index.php" assume_user=$userInfo.user_id tk=$gBitUser->mTicket ititle="Assume user identity" booticon="fa-user-doctor"}
-{smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userInfo.user_id ititle="User Activity" booticon="fa-bolt"}
+				{smartlink ipackage=users ifile="admin/index.php" assume_user=$userInfo.user_id tk=$gBitUser->mTicket ititle="Assume user identity" biticon="system-users"}
+{smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userInfo.user_id ititle="User Activity" biticon="utilities-system-monitor"}
 				{if $userInfo.user_id != $smarty.const.ANONYMOUS_USER_ID}
-					{smartlink ipackage=liberty ifile="list_content.php" user_id=$userInfo.user_id ititle="User Content" booticon="fa-square-list"}
-					{smartlink ipackage=users ifile="admin/index.php" action=delete user_id=$userInfo.user_id ititle="Remove" booticon="fa-trash"}
+					{smartlink ipackage=liberty ifile="list_content.php" user_id=$userInfo.user_id ititle="User Content" biticon="text-x-generic"}
+					{smartlink ipackage=users ifile="admin/index.php" action=delete user_id=$userInfo.user_id ititle="Remove" biticon="edit-delete"}
 				{/if}
 				{if $gBitUser->mUserId != $gQueryUser->mUserId}
-					{smartlink ipackage=users ifile="preferences.php" view_user=$userInfo.user_id ititle="Edit User Information" booticon="fa-check"}
+					{smartlink ipackage=users ifile="preferences.php" view_user=$userInfo.user_id ititle="Edit User Information" biticon="dialog-ok"}
 				{/if}
 			{/if}
 			{if $gBitUser->isRegistered() && $gBitUser->mUserId eq $gQueryUser->mUserId}
 				{if $gBitSystem->isFeatureActive('users_preferences')}
-					{smartlink ipackage=users ifile="preferences.php" ititle="Edit personal profile and images" booticon="fa-check"}
+					{smartlink ipackage=users ifile="preferences.php" ititle="Edit personal profile and images" biticon="dialog-ok"}
 				{/if}
 				{if $gBitUser->hasPermission('p_users_edit_user_homepage')}
-					{smartlink ipackage=users ifile="edit_personal_page.php" ititle="Edit personal wiki page" booticon="fa-edit"}
+					{smartlink ipackage=users ifile="edit_personal_page.php" ititle="Edit personal wiki page" biticon="document-properties"}
 				{/if}
 			{/if}
 		</div>
diff --git a/templates/login_inc.tpl b/templates/login_inc.tpl
index cbfdf71..56ac28d 100644
--- a/templates/login_inc.tpl
+++ b/templates/login_inc.tpl
@@ -5,7 +5,7 @@
 	<div class="form-group">
 		{formlabel label="Sign in with" for="user"}
 		{forminput}
-			{foreach from=$hybridProviders key=providerKey item=providerHash}<a {if !$providerHash.image}class="btn btn-default"{/if} href="{$smarty.const.USERS_PKG_URL}validate?provider={$providerHash.provider}">{if $providerHash.image}<img src="{$providerHash.image}" alt="{tr}Sign in with {$providerHash.provider}{/tr}" style="max-height:40px">{else}{booticon iname=$providerHash.icon} {$providerHash.provider}{/if}</a> {/foreach}
+			{foreach from=$hybridProviders key=providerKey item=providerHash}<a {if !$providerHash.image}class="btn btn-default"{/if} href="{$smarty.const.USERS_PKG_URL}validate?provider={$providerHash.provider}">{if $providerHash.image}<img src="{$providerHash.image}" alt="{tr}Sign in with {$providerHash.provider}{/tr}" style="max-height:40px">{else}{biticon ipackage="icons" iname=$providerHash.icon} {$providerHash.provider}{/if}</a> {/foreach}
 			{formhelp note="Use one of the sites above to login. If you have previously logged in, we will connect your existing account."}
 		{/forminput}
 	</div>
@@ -57,7 +57,7 @@
 		{formlabel label="" for=""}
 		{forminput class="submit"}
 			<input type="submit" class="btn btn-primary" name="login" value="{tr}Sign In{/tr}" />
-			{if !$gBitSystem->isFeatureActive('site_https_login_required') && empty($smarty.server.HTTPS)} {booticon iname="fa-unlock" iexplain="Insecure" class="fa-large"}{/if}
+			{if !$gBitSystem->isFeatureActive('site_https_login_required') && empty($smarty.server.HTTPS)} {biticon ipackage="icons" iname="lock" iexplain="Insecure" class="fa-large"}{/if}
 		{/forminput}
 	</div>
 {/form}
diff --git a/templates/menu_users.tpl b/templates/menu_users.tpl
index 9b0388c..dadef5d 100755
--- a/templates/menu_users.tpl
+++ b/templates/menu_users.tpl
@@ -5,49 +5,49 @@
 {if $packageMenuTitle}<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>{/if}
 <ul class="{$packageMenuClass}">
 	{if $gBitUser->isRegistered()}
-		<li><a class="item" href="{$gBitSystem->getConfig('users_login_homepage',"`$smarty.const.USERS_PKG_URL`my.php")}">{booticon iname="fa-circle-arrow-right" iexplain="My Personal Page"}My Personal Page</a></li>
+		<li><a class="item" href="{$gBitSystem->getConfig('users_login_homepage',"`$smarty.const.USERS_PKG_URL`my.php")}">{biticon ipackage="icons" iname="go-next" iexplain="My Personal Page"}My Personal Page</a></li>
 		{if $gBitUser->hasPermission( 'p_users_view_user_homepage' )}
-			<li><a class="item" href="{$gBitUser->getDisplayUrl()}">{booticon iname="fa-home" iexplain="My Profile"}My Profile</a></li>
+			<li><a class="item" href="{$gBitUser->getDisplayUrl()}">{biticon ipackage="icons" iname="go-home" iexplain="My Profile"}My Profile</a></li>
 		{/if}
 		{if $gBitUser->hasPermission( 'p_users_edit_user_homepage' )}
-			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}edit_personal_page.php">{booticon iname="fa-pen-to-square" iexplain="Edit My Homepage"}Edit My Homepage</a></li>
+			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}edit_personal_page.php">{biticon ipackage="icons" iname="document-properties" iexplain="Edit My Homepage"}Edit My Homepage</a></li>
 		{/if}
 		{if $gBitSystem->isFeatureActive( 'users_preferences' )}
-			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}preferences.php">{booticon iname="fa-inbox" iexplain="Preferences"}Preferences</a></li>
+			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}preferences.php">{biticon ipackage="icons" iname="internet-mail" iexplain="Preferences"}Preferences</a></li>
 		{/if}
 		{if $gBitUser->hasPermission( 'p_users_create_personal_groups' )}
-			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}my_groups.php">{booticon iname="fa-group" iexplain="My Groups"}My Groups</a></li>
+			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}my_groups.php">{biticon ipackage="icons" iname="system-users" iexplain="My Groups"}My Groups</a></li>
 		{/if}
 		{if $gBitUser->hasPermission( 'p_users_create_personal_roles' )}
-			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}my_roles.php">{booticon iname="fa-group" iexplain="My Roles"}My Roles</a></li>
+			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}my_roles.php">{biticon ipackage="icons" iname="system-users" iexplain="My Roles"}My Roles</a></li>
 		{/if}
 		{if $gBitSystem->isFeatureActive( 'users_watches' )}
-			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}watches.php">{booticon iname="fa-asterisk" iexplain="My Watches"}My Watches</a></li>
+			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}watches.php">{biticon ipackage="icons" iname="emblem-important" iexplain="My Watches"}My Watches</a></li>
 		{/if}
 		{if $gBitSystem->isPackageActive( 'messages' ) && $gBitUser->hasPermission( 'p_messages_send' )}
-			<li><a class="item" {if $unreadMsgs}title="{tr}You have unread messages{/tr}"{/if} href="{$smarty.const.MESSAGES_PKG_URL}message_box.php">{booticon iname="fa-inbox" iexplain="Message Box"}{if $unreadMsgs}<strong> [{$unreadMsgs}]</strong>{/if}</a></li>
-			<li><a class="item" href="{$smarty.const.MESSAGES_PKG_URL}compose.php">{booticon iname="fa-envelope" iexplain="Compose Message"}Compose Message</a></li>
+			<li><a class="item" {if $unreadMsgs}title="{tr}You have unread messages{/tr}"{/if} href="{$smarty.const.MESSAGES_PKG_URL}message_box.php">{biticon ipackage="icons" iname="internet-mail" iexplain="Message Box"}{if $unreadMsgs}<strong> [{$unreadMsgs}]</strong>{/if}</a></li>
+			<li><a class="item" href="{$smarty.const.MESSAGES_PKG_URL}compose.php">{biticon ipackage="icons" iname="internet-mail" iexplain="Compose Message"}Compose Message</a></li>
 		{/if}
 		{if $gBitSystem->isPackageActive( 'gatekeeper' )}
-			<li><a class="item" href="{$smarty.const.GATEKEEPER_PKG_URL}">{booticon iname="fa-lock" iexplain="Security Settings"}Security Settings</a></li>
+			<li><a class="item" href="{$smarty.const.GATEKEEPER_PKG_URL}">{biticon ipackage="icons" iname="lock" iexplain="Security Settings"}Security Settings</a></li>
 		{/if}
 		{if $gBitSystem->isPackageActive( 'quota' )}
-			<li><a class="item" href="{$smarty.const.QUOTA_PKG_URL}">{booticon iname="fa-hard-drive" iexplain="My quota and usage"}My quota and usage</a></li>
+			<li><a class="item" href="{$smarty.const.QUOTA_PKG_URL}">{biticon ipackage="icons" iname="drive-harddisk" iexplain="My quota and usage"}My quota and usage</a></li>
 		{/if}
 		{if $gBitUser->hasPermission( 'p_liberty_attach_attachments' )}
-			<li><a class="item" href="{$smarty.const.LIBERTY_PKG_URL}attachments.php">{booticon iname="fa-paperclip" iexplain="My Files"}My Files</a></li>
+			<li><a class="item" href="{$smarty.const.LIBERTY_PKG_URL}attachments.php">{biticon ipackage="icons" iname="mail-attachment" iexplain="My Files"}My Files</a></li>
 		{/if}
 		{if $gBitUser->hasPermission('p_liberty_list_content')}
-			<li><a class="item" href="{$smarty.const.LIBERTY_PKG_URL}list_content.php">{booticon iname="fa-list" iexplain="List Site Content"}List Site Content</a></li>
+			<li><a class="item" href="{$smarty.const.LIBERTY_PKG_URL}list_content.php">{biticon ipackage="icons" iname="text-x-generic" iexplain="List Site Content"}List Site Content</a></li>
 		{/if}
 		{if $gBitUser->hasPermission('p_users_view_user_list')}
-			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}index.php">{booticon iname="fa-group" ipackage="icons" iexplain="List Site Users"}List Site Users</a></li>
+			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}index.php">{biticon ipackage="icons" iname="system-users" ipackage="icons" iexplain="List Site Users"}List Site Users</a></li>
 		{/if}
-		<li><a class="item" href="{$smarty.const.USERS_PKG_URL}logout.php">{booticon iname="fa-signout" iexplain="Log out"}Log out</a></li>
+		<li><a class="item" href="{$smarty.const.USERS_PKG_URL}logout.php">{biticon ipackage="icons" iname="system-log-out" iexplain="Log out"}Log out</a></li>
 	{else}
-		<li><a class="item" href="{$smarty.const.USERS_PKG_URL}signin.php">{booticon iname="fa-signin" iexplain="Login"}Login</a></li>
+		<li><a class="item" href="{$smarty.const.USERS_PKG_URL}signin.php">{biticon ipackage="icons" iname="system-users" iexplain="Login"}Login</a></li>
 		{if $gBitSystem->isFeatureActive('users_allow_register')}
-			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}register.php">{booticon iname="fa-user" iexplain="Register"}Register</a></li>
+			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}register.php">{biticon ipackage="icons" iname="user-desktop" iexplain="Register"}Register</a></li>
 		{/if}
 	{/if}
 </ul>
diff --git a/templates/my_group_edit.tpl b/templates/my_group_edit.tpl
index c172437..3822299 100644
--- a/templates/my_group_edit.tpl
+++ b/templates/my_group_edit.tpl
@@ -116,7 +116,7 @@
 									{foreach from=$groupInfo.perms key=permName item=perm}
 										<tr class="{cycle values="odd,even"}">
 											<td>
-												{smartlink ititle="Remove" booticon="fa-trash" package=$package group_id=$groupInfo.group_id action=remove permission=$permName}
+												{smartlink ititle="Remove" biticon="edit-delete" package=$package group_id=$groupInfo.group_id action=remove permission=$permName}
 												&nbsp;{$permName}
 											</td>
 											<td>{$perm.perm_desc}</td>
diff --git a/templates/my_role_edit.tpl b/templates/my_role_edit.tpl
index 1bb56a7..af8852c 100644
--- a/templates/my_role_edit.tpl
+++ b/templates/my_role_edit.tpl
@@ -116,7 +116,7 @@
 									{foreach from=$roleInfo.perms key=permName item=perm}
 										<tr class="{cycle values="odd,even"}">
 											<td>
-												{smartlink ititle="Remove" booticon="fa-trash" package=$package role_id=$roleInfo.role_id action=remove permission=$permName}
+												{smartlink ititle="Remove" biticon="edit-delete" package=$package role_id=$roleInfo.role_id action=remove permission=$permName}
 												&nbsp;{$permName}
 											</td>
 											<td>{$perm.perm_desc}</td>
diff --git a/templates/my_roles_list.tpl b/templates/my_roles_list.tpl
index 8f11127..1fcf03f 100644
--- a/templates/my_roles_list.tpl
+++ b/templates/my_roles_list.tpl
@@ -25,7 +25,7 @@
 								<td>
 									{if $role.public eq 'y'}
 										<a href="{$smarty.const.USERS_PKG_URL}my_roles.php?remove_public_role=y&amp;public_role_id={$roleId}" 
-											onclick="return confirm('{tr}Are you sure you want to leave this role?{/tr}')">{booticon iname="fa-scissors" iexplain="Leave Role"}</a>
+											onclick="return confirm('{tr}Are you sure you want to leave this role?{/tr}')">{biticon ipackage="icons" iname="edit-cut" iexplain="Leave Role"}</a>
 									{else}
 										&nbsp;
 									{/if}
@@ -48,7 +48,7 @@
 								<tr class="{cycle values="odd,even"}">
 									<td>{$role.role_name}</td>
 									<td>{$role.role_desc}</td>
-									<td><a href="{$smarty.const.USERS_PKG_URL}my_roles.php?add_public_role=y&amp;public_role_id={$role.role_id}"  title="{tr}Assign Role{/tr}">{booticon iname="fa-key" iexplain="join role"}</a></td>								
+									<td><a href="{$smarty.const.USERS_PKG_URL}my_roles.php?add_public_role=y&amp;public_role_id={$role.role_id}"  title="{tr}Assign Role{/tr}">{biticon ipackage="icons" iname="lock" iexplain="join role"}</a></td>								
 								</tr>
 							{/if}
 						{/foreach}
@@ -113,10 +113,10 @@
 								{/if}
 
 								<td class="actionicon">
-									<a href="{$smarty.const.USERS_PKG_URL}my_roles.php?role_id={$roleId}">{booticon iname="fa-pen-to-square" iexplain="edit"}</a>
+									<a href="{$smarty.const.USERS_PKG_URL}my_roles.php?role_id={$roleId}">{biticon ipackage="icons" iname="document-properties" iexplain="edit"}</a>
 									{if $roleId ne -1}{* sorry for hardcoding, really need php define ANONYMOUS_TEAM_ID - spiderr *}
 										<a href="{$smarty.const.USERS_PKG_URL}my_roles.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;action=delete&amp;role_id={$roleId}" 
-										onclick="return confirm('{tr}Are you sure you want to delete this role?{/tr}')">{booticon iname="fa-trash" iexplain="Delete Role"}</a>
+										onclick="return confirm('{tr}Are you sure you want to delete this role?{/tr}')">{biticon ipackage="icons" iname="edit-delete" iexplain="Delete Role"}</a>
 									{/if}
 								</td>
 							</tr>
diff --git a/templates/register.tpl b/templates/register.tpl
index ca2ac82..d87fc45 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -12,7 +12,7 @@
 		<div class="form-group">
 			{formlabel label="Click to Register" for="user"}
 			{forminput}
-				{foreach from=$hybridProviders key=providerKey item=providerHash}<a class="btn btn-default" href="{$smarty.const.USERS_PKG_URL}validate?provider={$providerHash.provider}">{booticon iname=$providerHash.icon} {$providerHash.provider}</a> {/foreach}
+				{foreach from=$hybridProviders key=providerKey item=providerHash}<a class="btn btn-default" href="{$smarty.const.USERS_PKG_URL}validate?provider={$providerHash.provider}">{biticon ipackage="icons" iname=$providerHash.icon} {$providerHash.provider}</a> {/foreach}
 				{formhelp note="1-Click registration with any of the sites above."}
 			{/forminput}
 		</div>
diff --git a/templates/role_list_members.tpl b/templates/role_list_members.tpl
index bb6810f..f1343f7 100644
--- a/templates/role_list_members.tpl
+++ b/templates/role_list_members.tpl
@@ -1,7 +1,7 @@
 {strip}
 <div class="floaticon">
 	<a href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php">
-		{booticon iname="fa-users" iexplain="Role List"}
+		{biticon ipackage="icons" iname="system-users" iexplain="Role List"}
 	</a>
 	{bithelp}
 </div>
@@ -18,7 +18,7 @@
 			{foreach from=$roleMembers key=userId item=member}
 				<li>{displayname hash=$member}
 					{if $member.user_id != $smarty.const.ANONYMOUS_USER_ID && $roleInfo.role_id != $smarty.const.ANONYMOUS_TEAM_ID}
-						&nbsp;<a href="{$smarty.const.USERS_PKG_URL}admin/assign_role_user.php?action=removerole&amp;role_id={$roleInfo.role_id}&amp;assign_user={$member.user_id}">{booticon iname="fa-trash" iexplain="remove from role"}</a>
+						&nbsp;<a href="{$smarty.const.USERS_PKG_URL}admin/assign_role_user.php?action=removerole&amp;role_id={$roleInfo.role_id}&amp;assign_user={$member.user_id}">{biticon ipackage="icons" iname="edit-delete" iexplain="remove from role"}</a>
 					{/if}
 				</li>
 			{foreachelse}
diff --git a/templates/user_activity.tpl b/templates/user_activity.tpl
index 7df7864..ee171c6 100755
--- a/templates/user_activity.tpl
+++ b/templates/user_activity.tpl
@@ -35,7 +35,7 @@
 
 			{if $watches}
 				<tr>
-					<td><button class="btn btn-default btn-sm" name="delete" value="{tr}delete{/tr}">{booticon iname="fa-trash" iexplain=Remove}</button></td>
+					<td><button class="btn btn-default btn-sm" name="delete" value="{tr}delete{/tr}">{biticon ipackage="icons" iname="edit-delete" iexplain=Remove}</button></td>
 				</tr>
 			{/if}
 		</table>
diff --git a/templates/user_assigned_modules.tpl b/templates/user_assigned_modules.tpl
index 5437440..1d6ef41 100755
--- a/templates/user_assigned_modules.tpl
+++ b/templates/user_assigned_modules.tpl
@@ -25,15 +25,15 @@
 											{tr}Position {$modules.$area[ix].ord}{/tr}<br />
 											{$modules.$area[ix].name}
 											<div style="text-align:center;">
-												{smartlink ititle="Up" booticon="fa-arrow-up" fMove=up fPackage=$fPackage fModule=$modules.$area[ix].module_id}
-												{smartlink ititle="Down" booticon="fa-arrow-down" fMove=down fPackage=$fPackage fModule=$modules.$area[ix].module_id}
+												{smartlink ititle="Up" biticon="go-up" fMove=up fPackage=$fPackage fModule=$modules.$area[ix].module_id}
+												{smartlink ititle="Down" biticon="go-down" fMove=down fPackage=$fPackage fModule=$modules.$area[ix].module_id}
 												{if $colkey eq 'right'}
-													{smartlink ititle="Move to Left" booticon="fa-arrow-left" fMove=left fPackage=$fPackage fModule=$modules.$area[ix].module_id}
+													{smartlink ititle="Move to Left" biticon="go-previous" fMove=left fPackage=$fPackage fModule=$modules.$area[ix].module_id}
 												{elseif $colkey eq 'left'}
-													{smartlink ititle="Move to Right" booticon="fa-arrow-right" fMove=right fPackage=$fPackage fModule=$modules.$area[ix].module_id}
+													{smartlink ititle="Move to Right" biticon="go-next" fMove=right fPackage=$fPackage fModule=$modules.$area[ix].module_id}
 												{/if}
 												{if $column[ix].type ne 'P'}
-													{smartlink ititle="Unassign" booticon="fa-trash" onclick="return confirm('Are you sure you want to remove `$modules.$area[ix].name`?');" fMove=unassign fPackage=$fPackage fModule=$modules.$area[ix].module_id}
+													{smartlink ititle="Unassign" biticon="edit-delete" onclick="return confirm('Are you sure you want to remove `$modules.$area[ix].name`?');" fMove=unassign fPackage=$fPackage fModule=$modules.$area[ix].module_id}
 												{/if}
 											</div>
 										</td>
diff --git a/templates/user_favs_service_icon_inc.tpl b/templates/user_favs_service_icon_inc.tpl
index ee6dce4..c6f5a71 100644
--- a/templates/user_favs_service_icon_inc.tpl
+++ b/templates/user_favs_service_icon_inc.tpl
@@ -8,9 +8,9 @@
 {/foreach}
 <a title="{if $isBookmarked eq 'true'}{tr}Remove from your favorites{/tr}{else}{tr}Add to your favorites{/tr}{/if}" onclick="BitUser.toggleBookmark({$gContent->mContentId});" href="javascript:void(0); {* {$smarty.const.USERS_PKG_URL}bookmark.php?content_id={$gContent->mContentId} *}" >
 	{if $isBookmarked eq 'true'}
-		{booticon iname="fa-bookmark-empty" ipackage="icons" iexplain="Remove Bookmark"}
+		{biticon ipackage="icons" iname="bookmark-new" ipackage="icons" iexplain="Remove Bookmark"}
 	{else}
-		{booticon iname="fa-bookmark" ipackage="icons" iexplain="Bookmark"}
+		{biticon ipackage="icons" iname="bookmark-new" ipackage="icons" iexplain="Bookmark"}
 	{/if}
 </a>
 	<script>/* <![CDATA[ */
diff --git a/templates/user_watches.tpl b/templates/user_watches.tpl
index 166eb89..e45addf 100755
--- a/templates/user_watches.tpl
+++ b/templates/user_watches.tpl
@@ -44,7 +44,7 @@
 
 				{if $watches}
 					<tr>
-						<td><button class="btn btn-default btn-sm" name="delete" value="{tr}delete{/tr}">{booticon iname="fa-trash" iexplain=remove}</button></td>
+						<td><button class="btn btn-default btn-sm" name="delete" value="{tr}delete{/tr}">{biticon ipackage="icons" iname="edit-delete" iexplain=remove}</button></td>
 					</tr>
 				{/if}
 			</table>
diff --git a/templates/users_list.tpl b/templates/users_list.tpl
index f1e79eb..9ebd242 100755
--- a/templates/users_list.tpl
+++ b/templates/users_list.tpl
@@ -77,19 +77,19 @@
 							<strong title="{tr}Content Count{/tr}">{$contentCount} </strong>
 						{/if}
 						{if $gBitSystem->isPackageActive( 'bitcommerce' ) && $gBitUser->hasPermission( 'p_commerce_admin' )}
-							{smartlink ipackage=bitcommerce ifile="admin/list_orders.php" user_id=$userHash.user_id ititle="Orders" booticon="fa-shopping-cart"}
+							{smartlink ipackage=bitcommerce ifile="admin/list_orders.php" user_id=$userHash.user_id ititle="Orders" biticon="package-x-generic"}
 						{/if}
-						{smartlink ipackage=liberty ifile="list_content.php" user_id=$userHash.user_id ititle="User Content" booticon="fa-list"}
-						{smartlink ipackage=users ifile="admin/index.php" assume_user=$userHash.user_id ititle="Assume User Identity" booticon="fa-user-doctor"}
-						{smartlink ipackage=users ifile="preferences.php" view_user=$userHash.user_id ititle="Edit User Information" booticon="fa-edit"}
-{smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userHash.user_id ititle="User Activity" booticon="fa-bolt"}
+						{smartlink ipackage=liberty ifile="list_content.php" user_id=$userHash.user_id ititle="User Content" biticon="text-x-generic"}
+						{smartlink ipackage=users ifile="admin/index.php" assume_user=$userHash.user_id ititle="Assume User Identity" biticon="system-users"}
+						{smartlink ipackage=users ifile="preferences.php" view_user=$userHash.user_id ititle="Edit User Information" biticon="document-properties"}
+{smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userHash.user_id ititle="User Activity" biticon="utilities-system-monitor"}
 						{if $userHash.user_id != $smarty.const.ANONYMOUS_USER_ID && $userHash.user_id != $smarty.const.ROOT_USER_ID && $userHash.user_id != $gBitUser->mUserId}
 							{if $userHash.content_status_id > 0}
-								{smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=ban ititle="Disable Account" booticon="fa-ban"}
+								{smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=ban ititle="Disable Account" biticon="process-stop"}
 							{else}
-								{smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=unban ititle="Re-enable Account" booticon="fa-user-lock"}
+								{smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=unban ititle="Re-enable Account" biticon="lock"}
 							{/if}
-							{smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=delete ititle="Remove" booticon="fa-trash"}
+							{smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=delete ititle="Remove" biticon="edit-delete"}
 						{/if}
 					</div>
 					<div>{tr}User ID{/tr}: {$userHash.user_id}</div>
diff --git a/templates/validate_auth.tpl b/templates/validate_auth.tpl
index 691b728..442728a 100755
--- a/templates/validate_auth.tpl
+++ b/templates/validate_auth.tpl
@@ -21,7 +21,7 @@
 				</div>
 			</div>
 
-			<p class="alert alert-success">{booticon iname="fa-square-check"} {tr}Congratulations you have authenticated this account!{/tr}</p>
+			<p class="alert alert-success">{biticon ipackage="icons" iname="dialog-ok"} {tr}Congratulations you have authenticated this account!{/tr}</p>
 
 			<p>{tr}We do not have an existing user for this account from{/tr} {$smarty.request.provider}.</p> <p>{tr}Have you previously logged into{/tr} {$gBitSystem->getSiteTitle()}? <span class="btn btn-info btn-sm" onclick="BitBase.showById('auth-local-login');BitBase.hideById('auth-local-new');">{tr}Yes{/tr}</span> <span class="btn btn-info btn-sm" onclick="BitBase.showById('auth-local-new');BitBase.hideById('auth-local-login');">{tr}No{/tr}</span></p>