migrate from font-awesome 3.2.1 icon- to 6.1.2 fa-

21 files changed, 37 insertions, 38 deletions

diff --git a/plugins/data.attachment.php b/plugins/data.attachment.php
index a161f63..9dccb1e 100644
--- a/plugins/data.attachment.php
+++ b/plugins/data.attachment.php
@@ -35,7 +35,7 @@ $pluginParams = array (
 	'help_function' => 'data_attachment_help',
 	'syntax'        => '{attachment id= size= align= }',
 	'plugin_type'   => DATA_PLUGIN,
-	'booticon'       => '{booticon iname="icon-paper-clip" iexplain="Attachment"}',
+	'booticon'       => '{booticon iname="fa-paperclip" iexplain="Attachment"}',
 	'taginsert'     => '{attachment id= align= size= description= alt=}',
 );
 $gLibertySystem->registerPlugin( PLUGIN_GUID_DATAATTACHMENT, $pluginParams );
diff --git a/plugins/data.img.php b/plugins/data.img.php
index 0c80a15..44e7a39 100644
--- a/plugins/data.img.php
+++ b/plugins/data.img.php
@@ -22,7 +22,7 @@ $pluginParams = array (
 	'help_function' => 'data_img_help',
 	'syntax'        => "{img src=http://www.google.at/logos/olympics06_ski_jump.gif}",
 	'plugin_type'   => DATA_PLUGIN,
-	'booticon'       => '{booticon iname="icon-picture" iexplain="Web Image"}',
+	'booticon'       => '{booticon iname="fa-image-landscape" iexplain="Web Image"}',
 	'taginsert'     => '{img src= width= height= align= description= link=}'
 );
 $gLibertySystem->registerPlugin( PLUGIN_GUID_DATAIMG, $pluginParams );
diff --git a/plugins/data.jstabs.php b/plugins/data.jstabs.php
index 5ddb38e..92101b3 100644
--- a/plugins/data.jstabs.php
+++ b/plugins/data.jstabs.php
@@ -22,7 +22,7 @@ $pluginParams = array (
 	'plugin_type'   => DATA_PLUGIN,
 
 	// display icon in quicktags bar
-	'booticon'       => '{booticon iname="icon-folder-closed-alt" iexplain="Javascript Tabs"}',
+	'booticon'       => '{booticon iname="fa-folder" iexplain="Javascript Tabs"}',
 	'taginsert'     => '{jstabs}text{/jstabs}',
 
 	// functions
diff --git a/plugins/data.toc.php b/plugins/data.toc.php
index 47f390c..db1b5f9 100644
--- a/plugins/data.toc.php
+++ b/plugins/data.toc.php
@@ -36,7 +36,7 @@ $pluginParams = array (
 	'help_function' => 'data_toc_help',
 	'syntax'        => '{toc structure_id= }',
 	'plugin_type'   => DATA_PLUGIN,
-	'booticon'       => '{booticon iname="icon-list-ol" iexplain="Structure Table of Contents"}',
+	'booticon'       => '{booticon iname="fa-table-tree" iexplain="Structure Table of Contents"}',
 	'taginsert'     => '{toc}',
 	'structure_id'  => 'id of the structure to display'
 );
diff --git a/plugins/filter.maketoc.php b/plugins/filter.maketoc.php
index 0817143..47e8791 100644
--- a/plugins/filter.maketoc.php
+++ b/plugins/filter.maketoc.php
@@ -27,7 +27,7 @@ $pluginParams = array (
 	'help_page'          => 'Maketoc Filter',
 	'help_function'      => 'maketoc_help',
 	'syntax'             => '{maketoc}',
-	'booticon'            => '{booticon iname="icon-list-ul" iexplain="Page Table of Contents"}',
+	'booticon'            => '{booticon iname="fa-list-tree" iexplain="Page Table of Contents"}',
 	'taginsert'          => '{maketoc}',
 );
 $gLibertySystem->registerPlugin( PLUGIN_GUID_FILTERMAKETOC, $pluginParams );
diff --git a/templates/admin_plugins.tpl b/templates/admin_plugins.tpl
index deb2845..4d4a8f5 100644
--- a/templates/admin_plugins.tpl
+++ b/templates/admin_plugins.tpl
@@ -30,7 +30,7 @@
 											{jspopup href="http://www.bitweaver.org/wiki/`$plugin.help_page`" ibiticon="icons/dialog-information" title=$plugin.help_page class="external"}
 										{/if}
 										{if $plugin.plugin_settings_url}
-											<a href="{$plugin.plugin_settings_url}">{booticon iname="icon-edit"   iexplain="Plugin Settings"}</a>
+											<a href="{$plugin.plugin_settings_url}">{booticon iname="fa-pen-to-square" iexplain="Plugin Settings"}</a>
 										{/if}
 									</div>*}
 									<div class="checkbox" for="{$guid}"><label><strong>
diff --git a/templates/center_list_generic.tpl b/templates/center_list_generic.tpl
index 5a80a80..89b78e9 100644
--- a/templates/center_list_generic.tpl
+++ b/templates/center_list_generic.tpl
@@ -11,7 +11,7 @@
 	<div class="body">
 		{form class="minifind" legend="find in entries"}
 			<input type="hidden" name="sort_mode" value="{$sort_mode}" />
-			{booticon iname="icon-search"  ipackage="icons"  iexplain="Search"} &nbsp;
+			{booticon iname="fa-magnifying-glass" iexplain="Search"} &nbsp;
 			<label>{tr}Title{/tr}:&nbsp;<input size="16" type="text" name="find_title" value="{$find_title|default:$smarty.request.find_title|escape}" /></label> &nbsp;
 			<label>{tr}Author{/tr}:&nbsp;<input size="10" type="text" name="find_author" value="{$find_author|default:$smarty.request.find_author|escape}" /></label> &nbsp;
 			<label>{tr}Last Editor{/tr}:&nbsp;<input size="10" type="text" name="find_last_editor" value="{$find_last_editor|default:$smarty.request.find_last_editor|escape}" /></label> &nbsp;
@@ -21,7 +21,6 @@
 
 		{form id="checkform"}
 			<ul class="list-inline navbar">
-				<li>{booticon iname="icon-circle-arrow-right"  ipackage="icons"  iexplain="sort by"}</li>
 				<li>{smartlink ititle="Title" isort="title" icontrol=$listInfo}</li>
 				<li>{smartlink ititle="Last Modified" iorder="desc" idefault=1 isort="last_modified" icontrol=$listInfo}</li>
 				<li>{smartlink ititle="Author" isort="creator_user" icontrol=$listInfo}</li>
diff --git a/templates/content_permissions.tpl b/templates/content_permissions.tpl
index fff0161..4120bac 100644
--- a/templates/content_permissions.tpl
+++ b/templates/content_permissions.tpl
@@ -66,9 +66,9 @@
 		<h2>{tr}Legend{/tr}</h2>
 		
 		<dl>
-			<dt>{booticon iname="icon-plus-sign"   iexplain=""} Custom Permission: Always Allow</dt>
-			<dt>{booticon iname="icon-minus-sign"   iexplain=""} Custom Permission: Always Deny</dt>
-			<dt>{booticon iname="icon-ok"   iexplain=""} Global Permission: Allow</dt>
+			<dt>{booticon iname="fa-circle-plus"} Custom Permission: Always Allow</dt>
+			<dt>{booticon iname="fa-circle-minus"} Custom Permission: Always Deny</dt>
+			<dt>{booticon iname="fa-check"} Global Permission: Allow</dt>
 			<dt>{biticon iname="media-playback-stop" iexplain=""} Global Permission: Deny</dt>
 		</dl>
 	</div><!-- end .body -->
diff --git a/templates/content_permissions_inc.tpl b/templates/content_permissions_inc.tpl
index 60ef488..b29cfb5 100644
--- a/templates/content_permissions_inc.tpl
+++ b/templates/content_permissions_inc.tpl
@@ -25,7 +25,7 @@
 							{assign var=action value="remove"}
 						{/if}
 					{/foreach}
-					<td style="text-align:center">{smartlink ititle=Allow ibiticon=$icon iforce="icon" action=$action content_id=$gContent->mContentId perm=$perm.perm_name group_id=$group.group_id}</td>
+					<td style="text-align:center">{smartlink ititle=Allow ibiticon=$icon action=$action content_id=$gContent->mContentId perm=$perm.perm_name group_id=$group.group_id}</td>
 				</tr>
 			{/foreach}
 		</table>
@@ -83,7 +83,7 @@
 					<td>{$perm.group_name}</td>
 					<td>{$perm.perm_desc} <em>({$perm.perm_name})</em></td>
 					<td class="alignright">
-						{smartlink ititle="Remove Permission" booticon="icon-trash" iforce="icon" action=remove content_id=$gContent->mContentId perm=$perm.perm_name group_id=$perm.group_id}
+						{smartlink ititle="Remove Permission" booticon="fa-trash" action=remove content_id=$gContent->mContentId perm=$perm.perm_name group_id=$perm.group_id}
 					</td>
 				</tr>
 			{foreachelse}
diff --git a/templates/content_role_permissions.tpl b/templates/content_role_permissions.tpl
index edb9042..0f215cd 100644
--- a/templates/content_role_permissions.tpl
+++ b/templates/content_role_permissions.tpl
@@ -66,9 +66,9 @@
 		<h2>{tr}Legend{/tr}</h2>
 		
 		<dl>
-			<dt>{booticon iname="icon-plus-sign"   iexplain=""} Custom Permission: Always Allow</dt>
-			<dt>{booticon iname="icon-minus-sign"   iexplain=""} Custom Permission: Always Deny</dt>
-			<dt>{booticon iname="icon-ok"   iexplain=""} Global Permission: Allow</dt>
+			<dt>{booticon iname="fa-circle-plus"} Custom Permission: Always Allow</dt>
+			<dt>{booticon iname="fa-circle-minus"} Custom Permission: Always Deny</dt>
+			<dt>{booticon iname="fa-check"} Global Permission: Allow</dt>
 			<dt>{biticon iname="media-playback-stop" iexplain=""} Global Permission: Deny</dt>
 		</dl>
 	</div><!-- end .body -->
diff --git a/templates/content_role_permissions_inc.tpl b/templates/content_role_permissions_inc.tpl
index aca5a68..1087eda 100644
--- a/templates/content_role_permissions_inc.tpl
+++ b/templates/content_role_permissions_inc.tpl
@@ -25,7 +25,7 @@
 							{assign var=action value="remove"}
 						{/if}
 					{/foreach}
-					<td style="text-align:center">{smartlink ititle=Allow ibiticon=$icon iforce="icon" action=$action content_id=$gContent->mContentId perm=$perm.perm_name role_id=$role.role_id}</td>
+					<td style="text-align:center">{smartlink ititle=Allow ibiticon=$icon action=$action content_id=$gContent->mContentId perm=$perm.perm_name role_id=$role.role_id}</td>
 				</tr>
 			{/foreach}
 		</table>
@@ -83,7 +83,7 @@
 					<td>{$perm.role_name}</td>
 					<td>{$perm.perm_desc} <em>({$perm.perm_name})</em></td>
 					<td class="alignright">
-						{smartlink ititle="Remove Permission" booticon="icon-trash" iforce="icon" action=remove content_id=$gContent->mContentId perm=$perm.perm_name role_id=$perm.role_id}
+						{smartlink ititle="Remove Permission" booticon="fa-trash" action=remove content_id=$gContent->mContentId perm=$perm.perm_name role_id=$perm.role_id}
 					</td>
 				</tr>
 			{foreachelse}
diff --git a/templates/display_comment.tpl b/templates/display_comment.tpl
index 70c554c..03eee5b 100644
--- a/templates/display_comment.tpl
+++ b/templates/display_comment.tpl
@@ -8,16 +8,16 @@
 		<div class="floaticon">
 			{if $gBitUser->hasPermission( 'p_liberty_post_comments' )}
 				{if $gBitSystem->isFeatureActive('comments_ajax') }
-					<a href="javascript:void(0);" onclick="LibertyComment.attachForm('comment_{$comment.content_id}', '{$comment.content_id}', '{$comment.root_id}')">{booticon iname="icon-comment-alt"  ipackage="icons"  iexplain="Reply to this comment"}</a>
+					<a href="javascript:void(0);" onclick="LibertyComment.attachForm('comment_{$comment.content_id}', '{$comment.content_id}', '{$comment.root_id}')">{booticon iname="fa-comment" iexplain="Reply to this comment"}</a>
 				{else}
-					<a href="#">{booticon iname="icon-comment-alt"  class="icon" onclick="window.location='`$comments_return_url`&amp;post_comment_reply_id=`$comment.content_id`&amp;post_comment_request=1#editcomments';" iexplain="Reply to this comment" }</a>
+					<a href="#">{booticon iname="fa-comment" class="icon" onclick="window.location='`$comments_return_url`&amp;post_comment_reply_id=`$comment.content_id`&amp;post_comment_request=1#editcomments';" iexplain="Reply to this comment" }</a>
 				{/if}
 			{/if}
 			{if $comment.is_editable}
-				<a href="{$comments_return_url}&amp;post_comment_id={$comment.comment_id}&amp;post_comment_request=1#editcomments" rel="nofollow">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit"}</a>
+				<a href="{$comments_return_url}&amp;post_comment_id={$comment.comment_id}&amp;post_comment_request=1#editcomments" rel="nofollow">{booticon iname="fa-pen-to-square" ipackage="icons" iexplain="Edit"}</a>
 			{/if}
 			{if $gBitUser->hasPermission('p_liberty_admin_comments')}
-				<a href="{$comments_return_url}&amp;delete_comment_id={$comment.comment_id}" rel="nofollow">{booticon iname="icon-trash" ipackage="icons" iexplain="Remove"}</a>
+				<a href="{$comments_return_url}&amp;delete_comment_id={$comment.comment_id}" rel="nofollow">{booticon iname="fa-trash" iexplain="Remove"}</a>
 			{/if}
 		</div>
 
diff --git a/templates/edit_storage_list.tpl b/templates/edit_storage_list.tpl
index c8e8f87..20c7624 100644
--- a/templates/edit_storage_list.tpl
+++ b/templates/edit_storage_list.tpl
@@ -70,13 +70,13 @@ window.attachmentUrls["{$storage.attachment_id}"]["original"] = "{$storage.sourc
 								<a href="javascript:void(0);" onclick="
 									BitAjax.updater('edit_storage_list_tab_{$form_id}', '{$smarty.const.LIBERTY_PKG_URL}ajax_edit_storage.php', '{$smarty.capture.urlArgs}&amp;deleteAttachment={$attachmentId}&amp;form_id={$form_id}');
 									BitAjax.updater('edit_storage_list_{$form_id}', '{$smarty.const.LIBERTY_PKG_URL}ajax_edit_storage.php', '{$smarty.capture.urlArgs}&amp;form_id={$form_id}');">
-										{booticon iname="icon-trash" ipackage="icons" iexplain="delete"}
+										{booticon iname="fa-trash" iexplain="delete"}
 								</a>
 							{else}
 								{if $storage.is_mime}
-									<a href="{$storage.display_url}">{booticon iname="icon-folder-open"  ipackage="icons"  iexplain="View"}</a>
+									<a href="{$storage.display_url}">{booticon iname="fa-folder-open" iexplain="View"}</a>
 								{/if}
-								<a href="{$smarty.server.SCRIPT_NAME}?{$smarty.capture.urlArgs}&amp;deleteAttachment={$attachmentId}">{booticon iname="icon-trash" ipackage="icons" iexplain="Delete"}</a>
+								<a href="{$smarty.server.SCRIPT_NAME}?{$smarty.capture.urlArgs}&amp;deleteAttachment={$attachmentId}">{booticon iname="fa-trash" iexplain="Delete"}</a>
 							{/if}
 						{/if}
 					</div>
diff --git a/templates/list_comment_files_inc.tpl b/templates/list_comment_files_inc.tpl
index e76f249..18eeb23 100644
--- a/templates/list_comment_files_inc.tpl
+++ b/templates/list_comment_files_inc.tpl
@@ -6,7 +6,7 @@
 	<p>
 		<div class="attachments">
 		{foreach from=$storageHash item=item key=id}
-			<a class="btn btn-default" href="{$item.download_url}">{booticon iname="icon-cloud-download"} {$item.file_name|default:"File `$id`"|escape} <small>({$item.file_size|display_bytes})</small></a> <small>{jspopup notra=1 href="`$item.display_url`&popup=y" title="Details..."}</small>
+			<a class="btn btn-default" href="{$item.download_url}">{booticon iname="fa-cloud-down-arrow"} {$item.file_name|default:"File `$id`"|escape} <small>({$item.file_size|display_bytes})</small></a> <small>{jspopup notra=1 href="`$item.display_url`&popup=y" title="Details..."}</small>
 		{/foreach}
 		</div>
 	</p>
diff --git a/templates/mime/pdf/admin.tpl b/templates/mime/pdf/admin.tpl
index ec7e5fe..8846113 100644
--- a/templates/mime/pdf/admin.tpl
+++ b/templates/mime/pdf/admin.tpl
@@ -8,7 +8,7 @@
 	<div class="body">
 		{form legend="PDF Plugin settings"}
 			<p class="warning">
-				{booticon iname="icon-warning-sign"   iexplain="Warning"} {tr}To make use of this plugin, you need to install <a class="external" href="http://www.swftools.org/">SWF Tools</a>. This will provide all necessary tools to convert uploaded PDF files to shockwave flash files that can be viewed in your browser.{/tr}
+				{booticon iname="fa-triangle-exclamation" iexplain="Warning"} {tr}To make use of this plugin, you need to install <a class="external" href="http://www.swftools.org/">SWF Tools</a>. This will provide all necessary tools to convert uploaded PDF files to shockwave flash files that can be viewed in your browser.{/tr}
 			</p>
 
 			{if !$gLibertySystem->isPluginActive( 'mimepdf' )}
diff --git a/templates/mime/video/admin.tpl b/templates/mime/video/admin.tpl
index a1874c2..4a1f04d 100644
--- a/templates/mime/video/admin.tpl
+++ b/templates/mime/video/admin.tpl
@@ -12,11 +12,11 @@
 
 			{if $ffmpeg_extension}
 				<p class="success">
-					{booticon iname="icon-ok"   iexplain="OK"} {tr}The <a class="external" href="http://ffmpeg-php.sourceforge.net/">ffmpeg-php</a> extension is available.{/tr}
+					{booticon iname="fa-check" iexplain="OK"} {tr}The <a class="external" href="http://ffmpeg-php.sourceforge.net/">ffmpeg-php</a> extension is available.{/tr}
 				</p>
 			{else}
 				<p class="warning">
-					{booticon iname="icon-warning-sign"   iexplain="Warning"} {tr}If possible, please install the <a class="external" href="http://ffmpeg-php.sourceforge.net/">ffmpeg-php</a> php extension. This plugin will work without the extension but many features will not work well such as video recognition and mp4 uploads.{/tr}
+					{booticon iname="fa-triangle-exclamation" iexplain="Warning"} {tr}If possible, please install the <a class="external" href="http://ffmpeg-php.sourceforge.net/">ffmpeg-php</a> php extension. This plugin will work without the extension but many features will not work well such as video recognition and mp4 uploads.{/tr}
 				</p>
 			{/if}
 
@@ -149,7 +149,7 @@
 			</div>
 
 			<p class="warning">
-				{booticon iname="icon-warning-sign"   iexplain="Warning"} {tr}ffmpeg has a habit of changing the API when releasing new versions. Due to the demand for new features and the tendency to use cutting edge versions of ffmpeg it is very difficult to keep track of these API changes.{/tr}
+				{booticon iname="fa-triangle-exclamation" iexplain="Warning"} {tr}ffmpeg has a habit of changing the API when releasing new versions. Due to the demand for new features and the tendency to use cutting edge versions of ffmpeg it is very difficult to keep track of these API changes.{/tr}
 			</p>
 
 			<div class="form-group">
diff --git a/templates/service_content_body_inc.tpl b/templates/service_content_body_inc.tpl
index 7edd30f..776b7d4 100644
--- a/templates/service_content_body_inc.tpl
+++ b/templates/service_content_body_inc.tpl
@@ -1,4 +1,4 @@
 {if $gBitSystem->isFeatureActive( 'liberty_display_status' ) && ($gBitUser->hasPermission('p_liberty_edit_content_status') || $gBitUser->hasPermission('p_liberty_edit_all_status')) && !is_null($serviceHash.content_status_id) && $serviceHash.content_status_id != 50}
 	{assign var=contentStatusId value=$serviceHash.content_status_id}
-	<p class="liberty_status">{booticon iname="icon-warning-sign"   iexplain="Warning"} {tr}The status of this content is{/tr} <strong>{$gContent->getContentStatusName($contentStatusId)}</strong>.</p>
+	<p class="liberty_status">{booticon iname="fa-triangle-exclamation" iexplain="Warning"} {tr}The status of this content is{/tr} <strong>{$gContent->getContentStatusName($contentStatusId)}</strong>.</p>
 {/if}{$gContent->mInfo.content_status_name}
diff --git a/templates/service_content_icon_inc.tpl b/templates/service_content_icon_inc.tpl
index bb402f1..3843db6 100644
--- a/templates/service_content_icon_inc.tpl
+++ b/templates/service_content_icon_inc.tpl
@@ -8,7 +8,7 @@
 			{assign var="amp" value="?"}
 		{/if}
 		<a title="{tr}Refresh cache{/tr}" href="{$url}{$amp}refresh_liberty_cache={$serviceHash.content_id}">
-			{booticon iname="icon-recycle"  ipackage="icons"  iexplain="Refresh cache"}
+			{booticon iname="fa-recycle" iexplain="Refresh cache"}
 		</a>
 	{/if}
 	{if $gBitUser->hasPermission( 'p_liberty_assign_content_perms' ) and $serviceHash.content_id}
@@ -16,9 +16,9 @@
 			{assign var=iconClass value="highlight"}
 		{/if}
 		{if $smarty.const.ROLE_MODEL }
-			{smartlink ipackage=liberty ifile="content_role_permissions.php" ititle="Assign Permissions" booticon="icon-key" class=$iconClass ipackage=liberty ifile="content_permissions.php" content_id=$serviceHash.content_id}
+			{smartlink ipackage=liberty ifile="content_role_permissions.php" ititle="Assign Permissions" booticon="fa-key" class=$iconClass ipackage=liberty ifile="content_permissions.php" content_id=$serviceHash.content_id}
 		{else}
-			{smartlink ipackage=liberty ifile="content_permissions.php" ititle="Assign Permissions" booticon="icon-key" class=$iconClass ipackage=liberty ifile="content_permissions.php" content_id=$serviceHash.content_id}
+			{smartlink ipackage=liberty ifile="content_permissions.php" ititle="Assign Permissions" booticon="fa-key" class=$iconClass ipackage=liberty ifile="content_permissions.php" content_id=$serviceHash.content_id}
 		{/if}
 	{/if}
 {/if}
diff --git a/templates/structure_add_content.tpl b/templates/structure_add_content.tpl
index 7e5cfcc..7dfd576 100644
--- a/templates/structure_add_content.tpl
+++ b/templates/structure_add_content.tpl
@@ -92,7 +92,7 @@ function addStructure(pContentId) {
 						{$contentHash.title}
 						<div class="help-block">
 						<a target="_new" href="{$contentHash.display_url}">
-							{booticon ipackage="icons" iname="icon-zoom-in" iexplain="View (in new window)"}
+							{booticon iname="fa-magnifying-glass-plus" iexplain="View (in new window)"}
 						</a>
 {$contentHash.content_name}</div>
 					</div>
diff --git a/templates/structure_display.tpl b/templates/structure_display.tpl
index 021bf77..e439a67 100644
--- a/templates/structure_display.tpl
+++ b/templates/structure_display.tpl
@@ -22,7 +22,7 @@
 					{if $structureInfo.prev and $structureInfo.prev.structure_id}
 						<a href="index.php?structure_id={$structureInfo.prev.structure_id}">
 							{if $wikibook_use_icons eq 'y'}
-								{booticon iname="icon-arrow-left"  ipackage="icons"  iexplain=Previous}
+								{booticon iname="fa-arrow-left" iexplain=Previous}
 							{else}
 								&laquo;&nbsp;{$structureInfo.prev.title|escape}
 							{/if}
diff --git a/templates/structure_toc_leaf.tpl b/templates/structure_toc_leaf.tpl
index 45c63e4..b21dd76 100755
--- a/templates/structure_toc_leaf.tpl
+++ b/templates/structure_toc_leaf.tpl
@@ -2,8 +2,8 @@
 <li {if $editingStructure}id="structure-node-{$structure_tree.structure_id}" content_id="{$structure_tree.content_id}" structure_id="{$structure_tree.structure_id}"{/if} {if $structure_tree.structure_id==$smarty.request.structure_id}class="highlight"{/if}>
 		{if $editingStructure}
 		<div class="inline-block">
-			<div class="btn btn-default btn-xs" onclick="deleteStructureNode('{$structure_tree.structure_id}','{$structure_tree.title|escape:javascript}')">{booticon iname="icon-trash" class="icon"}</div>
-			<span class="inline-block" style="padding:5px;">{booticon iname="icon-move" class="structure-sort-handle"}</span>
+			<div class="btn btn-default btn-xs" onclick="deleteStructureNode('{$structure_tree.structure_id}','{$structure_tree.title|escape:javascript}')">{booticon iname="fa-trash" class="icon"}</div>
+			<span class="inline-block" style="padding:5px;">{booticon iname="fa-arrows-up-down-left-right" class="structure-sort-handle"}</span>
 		</div>
 		{/if}
 		<a href="{$structure_tree.display_url|default:"`$smarty.const.WIKI_PKG_URL`index.php?structure_id=`$structure_tree.structure_id`"}">{$structure_tree.title|escape}</a>