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>

17 files changed, 52 insertions, 52 deletions

diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
index b84fef4..c06ddcc 100755
--- a/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
+++ b/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
@@ -26,7 +26,7 @@
 						<img src="{$galItem->mInfo.thumbnail_url.avatar}" alt="{$galItem->mInfo.title|escape}" />
 					</a>
 					<h2 class="heading">
-						<div class="image-heading">{booticon iname="icon-picture" isize="small" iexplain=$galItem->getContentTypeName()|escape}{$galItem->getDisplayLink( null )}</div>
+						<div class="image-heading">{biticon ipackage="icons" iname="image-x-generic" isize="small" iexplain=$galItem->getContentTypeName()|escape}{$galItem->getDisplayLink( null )}</div>
 					</h2>
 					<div class="caption">
 						<div class="meta floatright">
@@ -52,7 +52,7 @@
 						<img src="{$galItem->mPreviewImage->mInfo.thumbnail_url.avatar}" alt="{$galItem->mInfo.title|escape}"/>
 					</a>
 					<div class="heading">
-						<h2>{booticon iname="icon-picture"   isize="small" iexplain=$galItem->getContentTypeName()|escape}{$galItem->getDisplayLink( null )}</h2><span class="image-count">({$galItem->getImageCount()} {tr}Items{/tr})</span>
+						<h2>{biticon ipackage="icons" iname="image-x-generic"   isize="small" iexplain=$galItem->getContentTypeName()|escape}{$galItem->getDisplayLink( null )}</h2><span class="image-count">({$galItem->getImageCount()} {tr}Items{/tr})</span>
 					</div>
 					<div class="caption">
 						<div class="image-title"><p>{$galItem->mInfo.title|escape}</p></div>
@@ -120,9 +120,9 @@ jQuery(document).ready(function($) {
 		renderSSControls:          true,
 		renderNavControls:         true,
 		playLinkText:              '',
-		playLinkImage:             '{/literal}{booticon iname="icon-control-start" isize="small" iexplain="Play Slideshow"}{literal}',
+		playLinkImage:             '{/literal}{biticon ipackage="icons" iname="media-skip-backward" isize="small" iexplain="Play Slideshow"}{literal}',
 		pauseLinkText:             '',
-		pauseLinkImage:            '{/literal}{booticon iname="icon-control-pause" isize="small" iexplain="Pause Slideshow"}{literal}',
+		pauseLinkImage:            '{/literal}{biticon ipackage="icons" iname="media-playback-pause" isize="small" iexplain="Pause Slideshow"}{literal}',
 		prevLinkText:              '&laquo;',
 		nextLinkText:              '&raquo;',
 		nextPageLinkText:          'Next &rsaquo;',
diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_2.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_2.tpl
index 10771b7..e04d2e2 100644
--- a/gallery_views/galleriffic/fisheye_galleriffic_inc_2.tpl
+++ b/gallery_views/galleriffic/fisheye_galleriffic_inc_2.tpl
@@ -36,7 +36,7 @@
 						<img src="{$galItem->mInfo.thumbnail_url.avatar}" alt="{$galItem->mInfo.title|escape}" />
 					</a>
 					<h2 class="heading">
-						<div class="image-heading">{booticon iname="icon-picture" isize="small" iexplain=$galItem->getContentTypeName()|escape}{$galItem->getDisplayLink( null )}</div>
+						<div class="image-heading">{biticon ipackage="icons" iname="image-x-generic" isize="small" iexplain=$galItem->getContentTypeName()|escape}{$galItem->getDisplayLink( null )}</div>
 					</h2>
 					<div class="caption">
 						<div class="meta floatright">
@@ -62,7 +62,7 @@
 						<img src="{$galItem->mPreviewImage->mInfo.thumbnail_url.avatar}" alt="{$galItem->mInfo.title|escape}"/>
 					</a>
 					<div class="heading">
-						<h2>{booticon iname="icon-picture" isize="small" iexplain=$galItem->getContentTypeName()|escape}{$galItem->getDisplayLink( null )}</h2><span class="image-count">({$galItem->getImageCount()} {tr}Items{/tr})</span>
+						<h2>{biticon ipackage="icons" iname="image-x-generic" isize="small" iexplain=$galItem->getContentTypeName()|escape}{$galItem->getDisplayLink( null )}</h2><span class="image-count">({$galItem->getImageCount()} {tr}Items{/tr})</span>
 					</div>
 					<div class="caption">
 						<div class="image-title"><p>{$galItem->mInfo.title|escape}</p></div>
@@ -128,9 +128,9 @@ jQuery(document).ready(function($) {
 		renderSSControls:          true,
 		renderNavControls:         true,
 		playLinkText:              '',
-		playLinkImage:             '{/literal}{booticon iname="icon-control-start" isize="small" iexplain="Play Slideshow"}{literal}',
+		playLinkImage:             '{/literal}{biticon ipackage="icons" iname="media-skip-backward" isize="small" iexplain="Play Slideshow"}{literal}',
 		pauseLinkText:             '',
-		pauseLinkImage:            '{/literal}{booticon iname="icon-control-pause" isize="small" iexplain="Pause Slideshow"}{literal}',
+		pauseLinkImage:            '{/literal}{biticon ipackage="icons" iname="media-playback-pause" isize="small" iexplain="Pause Slideshow"}{literal}',
 		prevLinkText:              '&laquo;',
 		nextLinkText:              '&raquo;',
 		nextPageLinkText:          'Next &rsaquo;',
@@ -204,7 +204,7 @@ jQuery(document).ready(function($) {
 				{if $galItem->mInfo.thumbnail_url.small}
 					<img src="{$galItem->mInfo.thumbnail_url.small}" style="float:left;margin-right:8px;max-width:80px;" alt="" />
 				{else}
-					{booticon iname="fa-film" isize="medium" iexplain="Video"}
+					{biticon ipackage="icons" iname="camera-video" isize="medium" iexplain="Video"}
 				{/if}
 				<span>{$galItem->mInfo.title|escape}</span>
 				<div style="clear:both;"></div>
diff --git a/gallery_views/simple_list/fisheye_simple_list_inc.tpl b/gallery_views/simple_list/fisheye_simple_list_inc.tpl
index 3b6c68c..5161876 100755
--- a/gallery_views/simple_list/fisheye_simple_list_inc.tpl
+++ b/gallery_views/simple_list/fisheye_simple_list_inc.tpl
@@ -109,11 +109,11 @@
 							<a href="{$galItem->mInfo.download_url}">{biticon ipackage="icons" iname="emblem-downloads" iexplain="Download File"}</a>
 						{/if}
 						{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
-							<a href="{$galItem->getDisplayUrl()}">{booticon iname="fa-folder-open" iexplain="View File"}</a>
+							<a href="{$galItem->getDisplayUrl()}">{biticon ipackage="icons" iname="folder-open" iexplain="View File"}</a>
 						{/if}
 						{if $gContent->isOwner( $galItem->mInfo ) || $gBitUser->isAdmin()}
-							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;action=edit">{booticon iname="fa-pencil" iexplain="Edit File"}</a>
-							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;delete=1">{booticon iname="fa-trash" iexplain="Remove File"}</a>
+							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;action=edit">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="Edit File"}</a>
+							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;delete=1">{biticon ipackage="icons" iname="edit-delete" iexplain="Remove File"}</a>
 						{/if}
 					{/if}
 				</td>
diff --git a/liberty_plugins/data.carousel.php b/liberty_plugins/data.carousel.php
index d15dd4f..ffafa33 100755
--- a/liberty_plugins/data.carousel.php
+++ b/liberty_plugins/data.carousel.php
@@ -34,7 +34,7 @@ $pluginParams = [
 	'plugin_type'   => DATA_PLUGIN,
 
 	// display icon in quicktags bar
-	'booticon'       => '{booticon iname="icon-picture" iexplain="Image"}',
+	'booticon'       => '{biticon ipackage="icons" iname="image-x-generic" iexplain="Image"}',
 	'taginsert'     => '{carousel id= size= nolink=}',
 
 	// functions
diff --git a/liberty_plugins/data.gallery.php b/liberty_plugins/data.gallery.php
index a0cfccf..02c4978 100755
--- a/liberty_plugins/data.gallery.php
+++ b/liberty_plugins/data.gallery.php
@@ -34,7 +34,7 @@ $pluginParams = [
 	'plugin_type'   => DATA_PLUGIN,
 
 	// display icon in quicktags bar
-	'booticon'       => '{booticon iname="icon-picture" iexplain="Image"}',
+	'booticon'       => '{biticon ipackage="icons" iname="image-x-generic" iexplain="Image"}',
 	'taginsert'     => '{gallery id= size= nolink=}',
 
 	// functions
diff --git a/liberty_plugins/data.image.php b/liberty_plugins/data.image.php
index e801cff..94833ba 100755
--- a/liberty_plugins/data.image.php
+++ b/liberty_plugins/data.image.php
@@ -34,7 +34,7 @@ $pluginParams = [
 	'plugin_type'   => DATA_PLUGIN,
 
 	// display icon in quicktags bar
-	'booticon'       => '{booticon iname="icon-picture" iexplain="Image"}',
+	'booticon'       => '{biticon ipackage="icons" iname="image-x-generic" iexplain="Image"}',
 	'taginsert'     => '{image id= size= nolink=}',
 
 	// functions
diff --git a/templates/edit_image.tpl b/templates/edit_image.tpl
index 7ad5c9c..ab3cab7 100755
--- a/templates/edit_image.tpl
+++ b/templates/edit_image.tpl
@@ -87,10 +87,10 @@
 							{formlabel label="Rotate Image"}
 							{forminput}
 {if function_exists('exif_read_data')}
-								<label class="radio-inline"><input type="radio" name="rotate_image" value="auto"/> {booticon iname="icon-chevron-sign-up" iexplain="Auto Rotate"}</label>
+								<label class="radio-inline"><input type="radio" name="rotate_image" value="auto"/> {biticon ipackage="icons" iname="go-up" iexplain="Auto Rotate"}</label>
 {/if}
-								<label class="radio-inline"><input type="radio" name="rotate_image" value="-90"/> {booticon iname="icon-rotate-left" iexplain="Rotate Counter Clockwise"}</label>
-								<label class="radio-inline"><input type="radio" name="rotate_image" value="90"/> {booticon iname="icon-rotate-left" iexplain="Rotate Clockwise"}</label>
+								<label class="radio-inline"><input type="radio" name="rotate_image" value="-90"/> {biticon ipackage="icons" iname="edit-undo" iexplain="Rotate Counter Clockwise"}</label>
+								<label class="radio-inline"><input type="radio" name="rotate_image" value="90"/> {biticon ipackage="icons" iname="edit-undo" iexplain="Rotate Clockwise"}</label>
 								<label class="radio-inline"><input type="radio" name="rotate_image" value="" checked="checked"/> {tr}don't rotate{/tr}</label>
 							{/forminput}
 						</div>
diff --git a/templates/gallery_icons_inc.tpl b/templates/gallery_icons_inc.tpl
index 9a2c5db..14711f2 100755
--- a/templates/gallery_icons_inc.tpl
+++ b/templates/gallery_icons_inc.tpl
@@ -1,20 +1,20 @@
 <div class="floaticon">
 	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$gContent->mInfo}
 	{if $gContent->hasUserPermission( 'p_fisheye_download_gallery_arc' ) }	
-		<a title="{tr}Download Gallery{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}view.php?gallery_id={$gContent->mGalleryId}&amp;download=1">{booticon iname="fa-cloud-arrow-down" iexplain="Download Gallery"}</a>
+		<a title="{tr}Download Gallery{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}view.php?gallery_id={$gContent->mGalleryId}&amp;download=1">{biticon ipackage="icons" iname="network-receive" iexplain="Download Gallery"}</a>
 	{/if}
 	{if $gContent->hasUpdatePermission()}
-		<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}">{booticon iname="fa-pen-to-square"  ipackage="icons"  iexplain="Edit"}</a>
-		<a title="{tr}Image Order{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image_order.php?gallery_id={$gContent->mGalleryId}">{booticon iname="fa-sort" iexplain="Image Order"}</a>
+		<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage="icons" iname="document-properties"  ipackage="icons"  iexplain="Edit"}</a>
+		<a title="{tr}Image Order{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image_order.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage="icons" iname="view-sort-ascending" iexplain="Image Order"}</a>
 	{/if}
 	{if $gContent->hasUpdatePermission() || $gContent->getPreference('is_public')}
-		<a title="{tr}Add Image{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$gContent->mGalleryId}">{booticon iname="fa-upload" ipackage="icons" iexplain="Add Image"}</a>
+		<a title="{tr}Add Image{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage="icons" iname="network-transmit" ipackage="icons" iexplain="Add Image"}</a>
 	{/if}
 	{if $gContent->getPreference('is_public')}
-		{booticon iname="fa-asterisk"  ipackage="icons"  iexplain="Public"}
+		{biticon ipackage="icons" iname="emblem-important"  ipackage="icons"  iexplain="Public"}
 	{/if}
 	{if $gContent->hasAdminPermission()}
-		<a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}&amp;delete=1">{booticon iname="fa-trash" ipackage="icons" iexplain="Delete Gallery"}</a>
-	{* appears broken at the moment	<a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_gallery_perms.php?gallery_id={$gContent->mGalleryId}">{booticon iname="fa-key" ipackage="icons" iexplain="User Permissions"}</a> *}
+		<a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}&amp;delete=1">{biticon ipackage="icons" iname="edit-delete" ipackage="icons" iexplain="Delete Gallery"}</a>
+	{* appears broken at the moment	<a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_gallery_perms.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage="icons" iname="lock" ipackage="icons" iexplain="User Permissions"}</a> *}
 	{/if}
 </div>
diff --git a/templates/gallery_nav.tpl b/templates/gallery_nav.tpl
index 681e3e1..e326d0b 100755
--- a/templates/gallery_nav.tpl
+++ b/templates/gallery_nav.tpl
@@ -28,7 +28,7 @@
 				{if !empty( $gGallery->mInfo.previous_image_id )}
 					<a href="{$gContent->getImageUrl($gGallery->mInfo.previous_image_id)|escape}">
 						{if $gBitSystem->isFeatureActive( 'gallerybar_use_icons' )}
-							{booticon iname="fa-arrow-left"  ipackage="icons"  iexplain=previous}
+							{biticon ipackage="icons" iname="go-previous"  ipackage="icons"  iexplain=previous}
 						{else}
 							&laquo;&nbsp;{tr}previous{/tr}
 						{/if}
@@ -44,7 +44,7 @@
 				{if !empty( $gGallery->mInfo.next_image_id )}
 					<a href="{$gContent->getImageUrl($gGallery->mInfo.next_image_id)|escape}">
 						{if $gBitSystem->isFeatureActive( 'gallerybar_use_icons' )}
-							{booticon iname="fa-arrow-right" iexplain=next}
+							{biticon ipackage="icons" iname="go-next" iexplain=next}
 						{else}
 							{tr}next{/tr}&nbsp;&raquo;
 						{/if}
diff --git a/templates/image_order.tpl b/templates/image_order.tpl
index 099d249..a6ec76e 100755
--- a/templates/image_order.tpl
+++ b/templates/image_order.tpl
@@ -46,10 +46,10 @@
 							<strong>{tr}Uploaded{/tr}</strong>: {$galItem->mInfo.created|bit_short_datetime}<br />
 							<strong>{tr}File name{/tr}</strong>: {$galItem->mInfo.filename|default:''} <br />
 								{if $galItem->mInfo.user_id == $gBitUser->mUserId || $gBitUser->isAdmin()}
-								<strong>{tr}Edit Image{/tr}</strong>: <a href="javascript:void(0);" data-toggle="modal" data-target="#imageEditModal" data-fetch-url="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?ajax=true&amp;content_id={$galItem->mInfo.content_id}&amp;gallery_id={$gContent->mGalleryId}">{booticon iname="fa-pen-to-square" iexplain="Edit Details"}</a>
-								<noscript><div><a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}">{booticon iname="fa-pen-to-square" iexplain="Edit Image"}</a></div></noscript>
+								<strong>{tr}Edit Image{/tr}</strong>: <a href="javascript:void(0);" data-toggle="modal" data-target="#imageEditModal" data-fetch-url="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?ajax=true&amp;content_id={$galItem->mInfo.content_id}&amp;gallery_id={$gContent->mGalleryId}">{biticon ipackage="icons" iname="document-properties" iexplain="Edit Details"}</a>
+								<noscript><div><a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}">{biticon ipackage="icons" iname="document-properties" iexplain="Edit Image"}</a></div></noscript>
 {*								jspopup href="`$smarty.const.FISHEYE_PKG_URL`edit_image.php?content_id=$galItem->mInfo.content_id" title="edit image" *}
-								<a target="_new" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}">{booticon iname="fa-pen-to-square" iexplain="Edit Image"}</a>
+								<a target="_new" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}">{biticon ipackage="icons" iname="document-properties" iexplain="Edit Image"}</a>
 								<br />
 								{/if}
 							{/if}
diff --git a/templates/list_galleries.tpl b/templates/list_galleries.tpl
index 3094beb..09e658e 100755
--- a/templates/list_galleries.tpl
+++ b/templates/list_galleries.tpl
@@ -10,7 +10,7 @@
 
 	<section class="body">
 		<ul class="list-inline sortby">
-			<li>{booticon iname="fa-circle-arrow-right" iexplain="sort by"}</li>
+			<li>{biticon ipackage="icons" iname="go-next" iexplain="sort by"}</li>
 			{if $gBitSystem->isFeatureActive('fisheye_list_title')}
 				<li>{smartlink ititle="Gallery Name" isort="title" user_id=$gQuerUserId offset=$iMaxRows home=$userInfo.login search=$iSearchString}</li>
 			{/if}
@@ -50,7 +50,7 @@
 							</a>
 							</h3><div class="security" style="position:absolute; top:5%;right:5%;color:#fff;">
 							{if $gal.is_hidden=='y' || $gal.is_private=='y' || $gal.access_answer}
-								{booticon iname="fa-lock" iexplain="Security" label=true}
+								{biticon ipackage="icons" iname="lock" iexplain="Security" label=true}
 							{/if}
 							{if $gal.is_hidden=='y'}
 								<span style="padding:5px;">{tr}Hidden{/tr}</span>
@@ -69,7 +69,7 @@
 							<strong>{displayname hash=$gal nolink=true}</strong> <small><a href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php?user_id={$gal.user_id}" style="display:block;">{tr}Galleries{/tr}</a></small>
 						{/if}
 						{* if $galleryList[ix]->isProtected()}
-							{booticon iname="fa-lock" iexplain="Protected"}
+							{biticon ipackage="icons" iname="lock" iexplain="Protected"}
 						{/if *}
 
 						{if $gBitSystem->isFeatureActive('fisheye_list_created' ) || $gBitSystem->isFeatureActive('fisheye_list_lastmodif' )}
diff --git a/templates/list_galleries2.tpl b/templates/list_galleries2.tpl
index 27b59ee..fc45215 100755
--- a/templates/list_galleries2.tpl
+++ b/templates/list_galleries2.tpl
@@ -9,7 +9,7 @@
 
 	<section class="body">
 		<ul class="list-inline sortby">
-			<li>{booticon iname="icon-circle-arrow-right"  ipackage="icons"  iexplain="sort by" iforce="icon"}</li>
+			<li>{biticon ipackage="icons" iname="go-next"  ipackage="icons"  iexplain="sort by" iforce="icon"}</li>
 			{if $gBitSystem->isFeatureActive('fisheye_list_title')}
 				<li>{smartlink ititle="Gallery Name" isort="title" user_id=$gQuerUserId offset=$iMaxRows home=$userInfo.login|default:'none' search=$iSearchString}</li>
 			{/if}
@@ -49,7 +49,7 @@
 							</a>
 							</h3><div class="security" style="position:absolute; top:5%;right:5%;color:#fff;">
 							{if $gal.is_hidden|default:'n' == 'y' || $gal.is_private|default:'n' == 'y' || $gal.access_answer|default:false}
-								{booticon iname="icon-lock" ipackage="icons" iexplain="Security" label=true}
+								{biticon ipackage="icons" iname="lock" ipackage="icons" iexplain="Security" label=true}
 							{/if}
 							{if $gal.is_hidden|default:'n' =='y'}
 								<span style="padding:5px;">Hidden</span>
@@ -68,7 +68,7 @@
 							<strong>{displayname hash=$gal nolink=true}</strong> <small><a href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php?user_id={$gal.user_id}" style="display:block;">Galleries</a></small>
 						{/if}
 						{* if $galleryList[ix]->isProtected()}
-							{booticon iname="icon-lock" ipackage="icons" iexplain="Protected"}
+							{biticon ipackage="icons" iname="lock" ipackage="icons" iexplain="Protected"}
 						{/if *}
 
 						{if $gBitSystem->isFeatureActive('fisheye_list_created' ) || $gBitSystem->isFeatureActive('fisheye_list_lastmodif' )}
diff --git a/templates/menu_fisheye.tpl b/templates/menu_fisheye.tpl
index 123943f..4ebec77 100755
--- a/templates/menu_fisheye.tpl
+++ b/templates/menu_fisheye.tpl
@@ -2,23 +2,23 @@
 {if !empty($packageMenuTitle)}<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>{/if}
 <ul class="{$packageMenuClass}">
 	{if $gBitUser->hasPermission('p_fisheye_view')}
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php">{booticon iname="icon-list" iexplain="List Galleries" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php">{biticon ipackage="icons" iname="text-x-generic" iexplain="List Galleries" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->hasPermission('p_fisheye_create')}
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php?user_id={$gBitUser->mUserId}">{booticon iname="icon-picture" iexplain="My Galleries" ilocation=menu}</a></li>
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}edit.php">{booticon iname="icon-camera" iexplain="Create a Gallery" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php?user_id={$gBitUser->mUserId}">{biticon ipackage="icons" iname="image-x-generic" iexplain="My Galleries" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}edit.php">{biticon ipackage="icons" iname="camera-photo" iexplain="Create a Gallery" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->hasPermission('p_fisheye_upload')}
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}upload.php">{booticon iname="fa-cloud-arrow-up" iexplain="Upload Images" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}upload.php">{biticon ipackage="icons" iname="network-transmit" iexplain="Upload Images" ilocation=menu}</a></li>
 	{/if}
 	{* if $gBitUser->hasPermission('p_fisheye_view')}
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}gallery_tree.php">{booticon iname="icon-sitemap" iexplain="growser gallery tree" ilocation=menu} Browse Gallery Tree</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}gallery_tree.php">{biticon ipackage="icons" iname="preferences-system" iexplain="growser gallery tree" ilocation=menu} Browse Gallery Tree</a></li>
 	{/if *}
 	{if $gBitUser->isRegistered() && $gBitSystem->isPackageActive('quota')}
-		<li><a class="item" href="{$smarty.const.QUOTA_PKG_URL}">{booticon iname="icon-hdd" iexplain="Usage" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.QUOTA_PKG_URL}">{biticon ipackage="icons" iname="drive-harddisk" iexplain="Usage" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->isRegistered() && $gBitSystem->isPackageActive('gatekeeper')}
-		<li><a class="item" href="{$smarty.const.GATEKEEPER_PKG_URL}">{booticon iname="fa-lock" iexplain="Security" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.GATEKEEPER_PKG_URL}">{biticon ipackage="icons" iname="lock" iexplain="Security" ilocation=menu}</a></li>
 	{/if}
 	{*if $gBitUser->hasPermission('p_fisheye_admin')}
 		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}admin/admin_imagegals.php">{tr}Admin Galleries{/tr}</a></li>
diff --git a/templates/upload_fisheye.tpl b/templates/upload_fisheye.tpl
index 3a2cd5e..bb0f5d8 100755
--- a/templates/upload_fisheye.tpl
+++ b/templates/upload_fisheye.tpl
@@ -6,7 +6,7 @@
 {strip}
 <div class="admin fisheye">
 	<div class="header">
-		<h1>{booticon iname="fa-cloud-arrow-up" iexplain="^"} {tr}Upload Photos{/tr}</h1>
+		<h1>{biticon ipackage="icons" iname="network-transmit" iexplain="^"} {tr}Upload Photos{/tr}</h1>
 	</div>
 
 	<div class="body">
@@ -16,7 +16,7 @@
 					{jstab title="Upload Files"}
 						{formfeedback note=$quotaMessage}
 
-						<p class="warning">{booticon iname="fa-triangle-exclamation" iexplain=Warning} {tr}The maximum file size you can upload is {$uploadMax} Megabytes{/tr}</p>
+						<p class="warning">{biticon ipackage="icons" iname="dialog-warning" iexplain=Warning} {tr}The maximum file size you can upload is {$uploadMax} Megabytes{/tr}</p>
 						{formfeedback error=$errors}
 
 						{formhelp note="Here you can upload files. You can upload single files, or you can upload archived files (.zip's, .tar's, etc.) Archived uploads will automatically be decompressed, and a gallery will created for every gallery in it. If you have nested folders, the hierarchy will be maintained for you with nested galleries." force=true}
diff --git a/templates/view_gallery_files_inc.tpl b/templates/view_gallery_files_inc.tpl
index 88b0402..a23c05c 100755
--- a/templates/view_gallery_files_inc.tpl
+++ b/templates/view_gallery_files_inc.tpl
@@ -2,7 +2,7 @@
 {minifind}
 
 <ul class="list-inline navbar sortby">
-	<li>{booticon iname="fa-circle-arrow-right" iexplain="sort by"}</li>
+	<li>{biticon ipackage="icons" iname="go-next" iexplain="sort by"}</li>
 	<li>{smartlink ititle="Created" isort="created" numPages=$gContent->mInfo.num_pages gallery_id=$gContent->mGalleryId gallery_path=$gContent->mGalleryPath page=$pageCount}</li>
 	<li>{smartlink ititle="Last Modified" isort="last_modified" numPages=$gContent->mInfo.num_pages gallery_id=$gContent->mGalleryId gallery_path=$gContent->mGalleryPath page=$pageCount}</li>
 	<li>{smartlink ititle="File Type" isort="file_type" numPages=$gContent->mInfo.num_pages gallery_id=$gContent->mGalleryId gallery_path=$gContent->mGalleryPath page=$pageCount}</li>
diff --git a/templates/view_gallery_images_inc.tpl b/templates/view_gallery_images_inc.tpl
index 6928e28..6232ba2 100755
--- a/templates/view_gallery_images_inc.tpl
+++ b/templates/view_gallery_images_inc.tpl
@@ -118,11 +118,11 @@
 							<a href="{$galItem->mInfo.download_url}">{biticon ipackage="icons" iname="emblem-downloads" iexplain="Download File"}</a>
 						{/if}
 						{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
-							<a href="{$galItem->getDisplayUrl()}">{booticon iname="fa-folder-open" iexplain="View File"}</a>
+							<a href="{$galItem->getDisplayUrl()}">{biticon ipackage="icons" iname="folder-open" iexplain="View File"}</a>
 						{/if}
 						{if $gContent->isOwner( $galItem->mInfo ) || $gBitUser->isAdmin()}
-							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;action=edit">{booticon iname="fa-pen-to-square" iexplain="Edit File"}</a>
-							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;delete=1">{booticon iname="fa-trash" iexplain="Remove File"}</a>
+							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;action=edit">{biticon ipackage="icons" iname="document-properties" iexplain="Edit File"}</a>
+							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;delete=1">{biticon ipackage="icons" iname="edit-delete" iexplain="Remove File"}</a>
 						{/if}
 					{/if}
 				</td>
diff --git a/templates/view_image.tpl b/templates/view_image.tpl
index c5b3dfe..785fc71 100755
--- a/templates/view_image.tpl
+++ b/templates/view_image.tpl
@@ -8,9 +8,9 @@
 		<div class="floaticon">
 			{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$gContent->mInfo}
 			{if $gContent->hasUpdatePermission()}
-				<a title="{tr}Refresh{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image/{$gContent->mImageId}?rethumb=1">{booticon iname="fa-arrows-rotate" iexplain="Refresh"}</a>
-				<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}">{booticon iname="fa-pen-to-square" iexplain="Edit Image"}</a>
-				<a title="{tr}Delete{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}&amp;delete=1">{booticon iname="fa-trash" iexplain="Delete Image"}</a>
+				<a title="{tr}Refresh{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image/{$gContent->mImageId}?rethumb=1">{biticon ipackage="icons" iname="view-refresh" iexplain="Refresh"}</a>
+				<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}">{biticon ipackage="icons" iname="document-properties" iexplain="Edit Image"}</a>
+				<a title="{tr}Delete{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}&amp;delete=1">{biticon ipackage="icons" iname="edit-delete" iexplain="Delete Image"}</a>
 			{/if}
 		</div>
 	{/if}