diff --git a/docs/migration.txt b/docs/migration.txt
index 23c47d30f..2cf431137 100644
--- a/docs/migration.txt
+++ b/docs/migration.txt
@@ -584,7 +584,7 @@ perl -pi.bak -e 's!\$session{setting}{(\w+)}!\$self->session->setting->get("$1")
 
 Fix $session{user}
 
-perl -pi.bak -e 's!\$session{user}{([username|userId])}!\$self->session->user->$1!g' fileNameGoesHere
+perl -pi.bak -e 's!\$session{user}{(username|userId)}!\$self->session->user->$1!g' fileNameGoesHere
 perl -pi.bak -e 's!\$session{user}{(\w+)}!\$self->session->user->profileField("$1")!g' fileNameGoesHere
 
 Fix $session{env}
@@ -756,6 +756,7 @@ processReplacements functions.
 perl -pi.bak -e 's!WebGUI\:\:HTML\:\:makeAbsolute\(!WebGUI::HTML::makeAbsolute(\$self->session,!g' fileNameGoesHere
 perl -pi.bak -e 's!WebGUI\:\:HTML\:\:processReplacements\(!WebGUI::HTML::processReplacements(\$self->session,!g' fileNameGoesHere
 
+
 5.23.15 WebGUI::HTMLForm API Refactored
 
 You now need to pass in a reference to session to the constructor.
@@ -764,6 +765,14 @@ perl -pi.bak -e 's!WebGUI\:\:HTMLForm\-\>new\(!WebGUI::HTMLForm->new(\$self->ses
 perl -pi.bak -e 's!WebGUI\:\:HTMLForm\-\>new\;!WebGUI::HTMLForm->new(\$self->session);!g' fileNameGoesHere
 
 
+5.23.15 WebGUI::Icon API Refactored
+
+WebGUI::Icon is now accessible through $session->icon.
+
+perl -pi.bak -e 's!WebGUI\:\:Icon\:\:(\w+)Icon\(!\$self->session->icon->$1(!g' fileNameGoesHere
+perl -pi.bak -e 's!(help|become|cut|copy|delete|edit|manage|moveBottom|moveDown|moveLeft|moveRight|moveTop|moveUp|locked|drag|shortcut|paste|view|export)Icon\(!\$self->session->icon->$1(!g' fileNameGoesHere 
+
+
 
 6.  Automatic list of Assets in Help System.
 -------------------------------------
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 1ffca09b8..60dce8166 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -566,7 +566,7 @@ sub getEditForm {
                 );
 	my $subtext;
         if ($self->session->user->isInGroup(3)) {
-                 $subtext = manageIcon('op=listUsers');
+                 $subtext = $self->session->icon->manage('op=listUsers');
         } else {
                  $subtext = "";
         }
@@ -863,19 +863,19 @@ Returns a toolbar with a set of icons that hyperlink to functions that delete, e
 
 sub getToolbar {
 	my $self = shift;
-	my $toolbar = deleteIcon('func=delete',$self->get("url"),WebGUI::International::get(43,"Asset"));
+	my $toolbar = $self->session->icon->delete('func=delete',$self->get("url"),WebGUI::International::get(43,"Asset"));
 	my $commit;
 	my $i18n = WebGUI::International->new("Asset");
 	if (($self->canEditIfLocked && $self->session->scratch->get("versionTag") eq $self->get("tagId")) || !$self->isLocked) {
-        	$toolbar .= editIcon('func=edit',$self->get("url"));
+        	$toolbar .= $self->session->icon->edit('func=edit',$self->get("url"));
 	} else {
-		$toolbar .= lockedIcon('func=manageRevisions',$self->get("url"));
+		$toolbar .= $self->session->icon->locked('func=manageRevisions',$self->get("url"));
 	}
 	$commit = 'contextMenu.addLink("'.$self->getUrl("func=commitRevision").'","'.$i18n->get("commit").'");' if ($self->canEditIfLocked);
-        $toolbar .= cutIcon('func=cut',$self->get("url"))
-            	.copyIcon('func=copy',$self->get("url"));
-        $toolbar .= shortcutIcon('func=createShortcut',$self->get("url")) unless ($self->get("className") =~ /Shortcut/);
-	$toolbar .= exportIcon('func=export',$self->get("url")) if defined ($self->session->config->get("exportPath"));
+        $toolbar .= $self->session->icon->cut('func=cut',$self->get("url"))
+            	.$self->session->icon->copy('func=copy',$self->get("url"));
+        $toolbar .= $self->session->icon->shortcut('func=createShortcut',$self->get("url")) unless ($self->get("className") =~ /Shortcut/);
+	$toolbar .= $self->session->icon->export('func=export',$self->get("url")) if defined ($self->session->config->get("exportPath"));
 	$self->session->style->setLink($self->session->config->get("extrasURL").'/contextMenu/contextMenu.css', {rel=>"stylesheet",type=>"text/css"});
 	$self->session->style->setScript($self->session->config->get("extrasURL").'/contextMenu/contextMenu.js', {type=>"text/javascript"});
 	return '<script type="text/javascript">
@@ -1613,21 +1613,21 @@ sub www_manageAssets {
 	foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","assetContainers")}) {
 		$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" border="0" /> 
 			<a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
-		$output .= editIcon("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
+		$output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
 		$output .= '<br />';
 	}
 	$output .= '<hr />';
 	foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets")}) {
 		$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" border="0" /> 
 			<a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
-		$output .= editIcon("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
+		$output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
 		$output .= '<br />';
 	}
 	$output .= '<hr />';
 	foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","utilityAssets")}) {
 		$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" border="0" /> 
 			<a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
-		$output .= editIcon("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
+		$output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
 		$output .= '<br />';
 	}
 	$output .= '</fieldset></div>'; 
@@ -1665,7 +1665,7 @@ sub www_manageAssets {
         foreach my $asset (@{$self->getPackageList}) {
               	$packages  .= '<img src="'.$asset->getIcon(1).'" align="middle" alt="'.$asset->getName.'" border="0" /> 
 			<a href="'.$self->getUrl("func=deployPackage;assetId=".$asset->getId).'">'.$asset->getTitle.'</a> '
-			.editIcon("func=edit;proceed=manageAssets",$asset->get("url"))
+			.$self->session->icon->edit("func=edit;proceed=manageAssets",$asset->get("url"))
 			.'<br />';
 		$hasPackages = 1;
         }
diff --git a/lib/WebGUI/Asset/FilePile.pm b/lib/WebGUI/Asset/FilePile.pm
index ae149413e..48d06ab55 100644
--- a/lib/WebGUI/Asset/FilePile.pm
+++ b/lib/WebGUI/Asset/FilePile.pm
@@ -102,7 +102,7 @@ sub edit {
                	);
 	my $subtext;
        	if ($self->session->user->isInGroup(3)) {
-               	 $subtext = manageIcon('op=listUsers');
+               	 $subtext = $self->session->icon->manage('op=listUsers');
         } else {
        	         $subtext = "";
        	}
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index a8ccc86bd..2220968d9 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -501,7 +501,7 @@ sub getUploadControl {
 	if ($self->get("storageId")) {
 		my $i;
 		foreach my $filename (@{$self->getStorageLocation->getFiles}) {
-			$uploadControl .= deleteIcon("func=deleteFile;filename=".$filename,$self->get("url"),WebGUI::International::get("delete file warning","Asset_Collaboration"))	
+			$uploadControl .= $self->session->icon->delete("func=deleteFile;filename=".$filename,$self->get("url"),WebGUI::International::get("delete file warning","Asset_Collaboration"))	
 				.' <a href="'.$self->getStorageLocation->getUrl($filename).'">'.$filename.'</a>'
 				.'<br />';
 			$i++;
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index 18f59536d..640e7be70 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -355,8 +355,8 @@ sub getOverridesList {
 			$output .= '<tr>';
 			$output .= '<td class="tableData"><a href="'.$self->getUrl('func=editOverride;fieldName='.$prop).'">'.$prop.'</a></td>';
 			$output .= '<td class="tableData">';
-			$output .= editIcon('func=editOverride;fieldName='.$prop,$self->get("url"));
-			$output .= deleteIcon('func=deleteOverride;fieldName='.$prop,$self->get("url")) if exists $overrides{overrides}{$prop};
+			$output .= $self->session->icon->edit('func=editOverride;fieldName='.$prop,$self->get("url"));
+			$output .= $self->session->icon->delete('func=deleteOverride;fieldName='.$prop,$self->get("url")) if exists $overrides{overrides}{$prop};
 			$output .= '</td><td>';
 			$output .= $overrides{overrides}{$prop}{origValue};
 			$output .= '</td><td>';
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index 570abd6eb..a3b7542a2 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -43,12 +43,12 @@ sub appendPostListTemplateVars {
 	foreach my $row (@$page) {
 		my $post = WebGUI::Asset->new($row->{assetId}, $row->{className}, $row->{revisionDate});
 		$post->{_parent} = $self; # caching parent for efficiency 
-		my $controls = deleteIcon('func=delete',$post->get("url"),"Delete").editIcon('func=edit',$post->get("url"));
+		my $controls = $self->session->icon->delete('func=delete',$post->get("url"),"Delete").$self->session->icon->edit('func=edit',$post->get("url"));
 		if ($self->get("sortBy") eq "lineage") {
 			if ($self->get("sortOrder") eq "desc") {
-				$controls .= moveUpIcon('func=demote',$post->get("url")).moveDownIcon('func=promote',$post->get("url"));
+				$controls .= $self->session->icon->moveUp('func=demote',$post->get("url")).$self->session->icon->moveDown('func=promote',$post->get("url"));
 			} else {
-				$controls .= moveUpIcon('func=promote',$post->get("url")).moveDownIcon('func=demote',$post->get("url"));
+				$controls .= $self->session->icon->moveUp('func=promote',$post->get("url")).$self->session->icon->moveDown('func=demote',$post->get("url"));
 			}
 		}
 		my $inDateRange;
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 589f74b24..eab4445b4 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -91,10 +91,10 @@ sub _fieldAdminIcons {
 	my $tid = shift;
 	my $cantDelete = shift;
 	my $output;
-	$output = deleteIcon('func=deleteFieldConfirm;fid='.$fid.';tid='.$tid,$self->get("url"),WebGUI::International::get(19,"Asset_DataForm")) unless ($cantDelete);
-	$output .= editIcon('func=editField;fid='.$fid.';tid='.$tid,$self->get("url"))
-		.moveUpIcon('func=moveFieldUp;fid='.$fid.';tid='.$tid,$self->get("url"))
-		.moveDownIcon('func=moveFieldDown;fid='.$fid.';tid='.$tid,$self->get("url"));
+	$output = $self->session->icon->delete('func=deleteFieldConfirm;fid='.$fid.';tid='.$tid,$self->get("url"),WebGUI::International::get(19,"Asset_DataForm")) unless ($cantDelete);
+	$output .= $self->session->icon->edit('func=editField;fid='.$fid.';tid='.$tid,$self->get("url"))
+		.$self->session->icon->moveUp('func=moveFieldUp;fid='.$fid.';tid='.$tid,$self->get("url"))
+		.$self->session->icon->moveDown('func=moveFieldDown;fid='.$fid.';tid='.$tid,$self->get("url"));
 	return $output;
 }
 #-------------------------------------------------------------------
@@ -103,10 +103,10 @@ sub _tabAdminIcons {
 	my $tid = shift;
 	my $cantDelete = shift;
 	my $output;
-	$output = deleteIcon('func=deleteTabConfirm;tid='.$tid,$self->get("url"),WebGUI::International::get(100,"Asset_DataForm")) unless ($cantDelete);
-	$output .= editIcon('func=editTab;tid='.$tid,$self->get("url"))
-		.moveLeftIcon('func=moveTabLeft;tid='.$tid,$self->get("url"))
-		.moveRightIcon('func=moveTabRight;tid='.$tid,$self->get("url"));
+	$output = $self->session->icon->delete('func=deleteTabConfirm;tid='.$tid,$self->get("url"),WebGUI::International::get(100,"Asset_DataForm")) unless ($cantDelete);
+	$output .= $self->session->icon->edit('func=editTab;tid='.$tid,$self->get("url"))
+		.$self->session->icon->moveLeft('func=moveTabLeft;tid='.$tid,$self->get("url"))
+		.$self->session->icon->moveRight('func=moveTabRight;tid='.$tid,$self->get("url"));
 	return $output;
 }
 
@@ -331,9 +331,9 @@ sub getListTemplateVars {
 		push(@recordLoop,{
 			"record.ipAddress"=>$record->{ipAddress},
 			"record.edit.url"=>$self->getUrl("func=view;entryId=".$record->{DataForm_entryId}),
-			"record.edit.icon"=>editIcon("func=view;entryId=".$record->{DataForm_entryId}, $self->getUrl),
+			"record.edit.icon"=>$self->session->icon->edit("func=view;entryId=".$record->{DataForm_entryId}, $self->getUrl),
 			"record.delete.url"=>$self->getUrl("func=deleteEntry;entryId=".$record->{DataForm_entryId}),
-			"record.delete.icon"=>deleteIcon("func=deleteEntry;entryId=".$record->{Asset_DataForm_entryId}, $self->getUrl, WebGUI::International::get('Delete entry confirmation',"Asset_DataForm")),
+			"record.delete.icon"=>$self->session->icon->delete("func=deleteEntry;entryId=".$record->{Asset_DataForm_entryId}, $self->getUrl, WebGUI::International::get('Delete entry confirmation',"Asset_DataForm")),
 			"record.username"=>$record->{username},
 			"record.userId"=>$record->{userId},
 			"record.submissionDate.epoch"=>$record->{submissionDate},
diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm
index 92ca7fa93..44bc1e6af 100644
--- a/lib/WebGUI/Asset/Wobject/Layout.pm
+++ b/lib/WebGUI/Asset/Wobject/Layout.pm
@@ -205,7 +205,7 @@ sub view {
 			}
 			</style>
 			');
-		$vars{"dragger.icon"} = WebGUI::Icon::dragIcon();
+		$vars{"dragger.icon"} = $self->session->icon->drag();
 		$vars{"dragger.init"} = '
 			<iframe id="dragSubmitter" style="display: none;" src="'.$self->session->config->get("extrasURL").'/spacer.gif"></iframe>
 			<script type="text/javascript">
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 4980b8722..f2d8dbe5a 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -287,7 +287,7 @@ sub getToolbar {
 		}
 		my $toolbar;
 		if (!$self->isLocked || $self->get("isLockedBy") eq $self->session->user->profileField("userId")) {
-			$toolbar = editIcon('func=edit'.$returnUrl,$self->get("url"));
+			$toolbar = $self->session->icon->edit('func=edit'.$returnUrl,$self->get("url"));
 		}
 		my $i18n = WebGUI::International->new("Asset");
 		return '<script type="text/javascript">
diff --git a/lib/WebGUI/Asset/Wobject/Product.pm b/lib/WebGUI/Asset/Wobject/Product.pm
index 2618e710f..83638accb 100644
--- a/lib/WebGUI/Asset/Wobject/Product.pm
+++ b/lib/WebGUI/Asset/Wobject/Product.pm
@@ -757,10 +757,10 @@ sub view {
    $var{"addFeature.label"} = WebGUI::International::get(34,'Asset_Product');
    $sth = $self->session->db->read("select feature,Product_featureId from Product_feature where assetId=".$self->session->db->quote($self->getId)." order by sequenceNumber");
    while (%data = $sth->hash) {
-      $segment = deleteIcon('func=deleteFeatureConfirm&fid='.$data{Product_featureId},$self->get("url"),WebGUI::International::get(3,'Asset_Product'))
-                 .editIcon('func=editFeature&fid='.$data{Product_featureId},$self->get("url"))
-                 .moveUpIcon('func=moveFeatureUp&&fid='.$data{Product_featureId},$self->get("url"))
-                 .moveDownIcon('func=moveFeatureDown&&fid='.$data{Product_featureId},$self->get("url"));
+      $segment = $self->session->icon->delete('func=deleteFeatureConfirm&fid='.$data{Product_featureId},$self->get("url"),WebGUI::International::get(3,'Asset_Product'))
+                 .$self->session->icon->edit('func=editFeature&fid='.$data{Product_featureId},$self->get("url"))
+                 .$self->session->icon->moveUp('func=moveFeatureUp&&fid='.$data{Product_featureId},$self->get("url"))
+                 .$self->session->icon->moveDown('func=moveFeatureDown&&fid='.$data{Product_featureId},$self->get("url"));
 	  push(@featureloop,{
 			              "feature.feature"=>$data{feature},
 			              "feature.controls"=>$segment
@@ -774,10 +774,10 @@ sub view {
    $var{"addBenefit.label"} = WebGUI::International::get(55,'Asset_Product');
    $sth = $self->session->db->read("select benefit,Product_benefitId from Product_benefit where assetId=".$self->session->db->quote($self->getId)." order by sequenceNumber");
    while (%data = $sth->hash) {
-      $segment = deleteIcon('func=deleteBenefitConfirm&bid='.$data{Product_benefitId},$self->get("url"),WebGUI::International::get(48,'Asset_Product'))
-                 .editIcon('func=editBenefit&bid='.$data{Product_benefitId},$self->get("url"))
-                 .moveUpIcon('func=moveBenefitUp&bid='.$data{Product_benefitId},$self->get("url"))
-                 .moveDownIcon('func=moveBenefitDown&bid='.$data{Product_benefitId},$self->get("url"));
+      $segment = $self->session->icon->delete('func=deleteBenefitConfirm&bid='.$data{Product_benefitId},$self->get("url"),WebGUI::International::get(48,'Asset_Product'))
+                 .$self->session->icon->edit('func=editBenefit&bid='.$data{Product_benefitId},$self->get("url"))
+                 .$self->session->icon->moveUp('func=moveBenefitUp&bid='.$data{Product_benefitId},$self->get("url"))
+                 .$self->session->icon->moveDown('func=moveBenefitDown&bid='.$data{Product_benefitId},$self->get("url"));
 	  push(@benefitloop,{
 			              "benefit.benefit"=>$data{benefit},
 			              "benefit.controls"=>$segment
@@ -791,10 +791,10 @@ sub view {
    $var{"addSpecification.label"} = WebGUI::International::get(35,'Asset_Product');
    $sth = $self->session->db->read("select name,value,units,Product_specificationId from Product_specification where assetId=".$self->session->db->quote($self->getId)." order by sequenceNumber");
    while (%data = $sth->hash) {
-      $segment = deleteIcon('func=deleteSpecificationConfirm&sid='.$data{Product_specificationId},$self->get("url"),WebGUI::International::get(5,'Asset_Product'))
-                 .editIcon('func=editSpecification&sid='.$data{Product_specificationId},$self->get("url"))
-                 .moveUpIcon('func=moveSpecificationUp&sid='.$data{Product_specificationId},$self->get("url"))
-                 .moveDownIcon('func=moveSpecificationDown&sid='.$data{Product_specificationId},$self->get("url"));
+      $segment = $self->session->icon->delete('func=deleteSpecificationConfirm&sid='.$data{Product_specificationId},$self->get("url"),WebGUI::International::get(5,'Asset_Product'))
+                 .$self->session->icon->edit('func=editSpecification&sid='.$data{Product_specificationId},$self->get("url"))
+                 .$self->session->icon->moveUp('func=moveSpecificationUp&sid='.$data{Product_specificationId},$self->get("url"))
+                 .$self->session->icon->moveDown('func=moveSpecificationDown&sid='.$data{Product_specificationId},$self->get("url"));
       push(@specificationloop,{
 			                      "specification.controls"=>$segment,
 			                      "specification.specification"=>$data{value},
@@ -812,9 +812,9 @@ sub view {
 		                     where Product_accessory.assetId=".$self->session->db->quote($self->getId)." 
 		                     order by Product_accessory.sequenceNumber");
    while (my ($id) = $sth->array) {
-      $segment = deleteIcon('func=deleteAccessoryConfirm&aid='.$id,$self->get("url"),WebGUI::International::get(2,'Asset_Product'))
-                 .moveUpIcon('func=moveAccessoryUp&aid='.$id,$self->get("url"))
-                 .moveDownIcon('func=moveAccessoryDown&aid='.$id,$self->get("url"));
+      $segment = $self->session->icon->delete('func=deleteAccessoryConfirm&aid='.$id,$self->get("url"),WebGUI::International::get(2,'Asset_Product'))
+                 .$self->session->icon->moveUp('func=moveAccessoryUp&aid='.$id,$self->get("url"))
+                 .$self->session->icon->moveDown('func=moveAccessoryDown&aid='.$id,$self->get("url"));
 		my $accessory = WebGUI::Asset->newByDynamicClass($id);
 	  push(@accessoryloop,{
 			               "accessory.URL"=>$accessory->getUrl,
@@ -833,9 +833,9 @@ sub view {
 		                     where Product_related.assetId=".$self->session->db->quote($self->getId)." 
 		                     order by Product_related.sequenceNumber");
    while (my ($id) = $sth->array) {
-      $segment = deleteIcon('func=deleteRelatedConfirm&rid='.$id,$self->get("url"),WebGUI::International::get(4,'Asset_Product'))
-                 .moveUpIcon('func=moveRelatedUp&rid='.$id,$self->get("url"))
-                 .moveDownIcon('func=moveRelatedDown&rid='.$id,$self->get("url"));
+      $segment = $self->session->icon->delete('func=deleteRelatedConfirm&rid='.$id,$self->get("url"),WebGUI::International::get(4,'Asset_Product'))
+                 .$self->session->icon->moveUp('func=moveRelatedUp&rid='.$id,$self->get("url"))
+                 .$self->session->icon->moveDown('func=moveRelatedDown&rid='.$id,$self->get("url"));
 		my $related = WebGUI::Asset->newByDynamicClass($id);
       push(@relatedloop,{
 			              "relatedproduct.URL"=>$related->getUrl,
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 6148438a6..b49a44bc1 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -625,10 +625,10 @@ sub view {
 		while (my %data = $sth2->hash) {
 		  push(@edit,{
 			'question.edit.controls'=>
-				deleteIcon('func=deleteQuestionConfirm;qid='.$data{Survey_questionId}, $self->get("url"), WebGUI::International::get(44,'Asset_Survey')).
-				editIcon('func=editQuestion;qid='.$data{Survey_questionId}, $self->get("url")).
-				moveUpIcon('func=moveQuestionUp;qid='.$data{Survey_questionId}, $self->get("url")).
-				moveDownIcon('func=moveQuestionDown;qid='.$data{Survey_questionId}, $self->get("url")),
+				$self->session->icon->delete('func=deleteQuestionConfirm;qid='.$data{Survey_questionId}, $self->get("url"), WebGUI::International::get(44,'Asset_Survey')).
+				$self->session->icon->edit('func=editQuestion;qid='.$data{Survey_questionId}, $self->get("url")).
+				$self->session->icon->moveUp('func=moveQuestionUp;qid='.$data{Survey_questionId}, $self->get("url")).
+				$self->session->icon->moveDown('func=moveQuestionDown;qid='.$data{Survey_questionId}, $self->get("url")),
 			'question.edit.question'=>$data{question},
 			'question.edit.id'=>$data{Survey_questionId}
 		  });
@@ -637,10 +637,10 @@ sub view {
 	
 		push(@sectionEdit,{
 			'section.edit.controls'=>
-				deleteIcon('func=deleteSectionConfirm;sid='.$sectionData{Survey_sectionId}, $self->get("url"), WebGUI::International::get(105,'Asset_Survey')).
-				editIcon('func=editSection;sid='.$sectionData{Survey_sectionId}, $self->get("url")).
-				moveUpIcon('func=moveSectionUp;sid='.$sectionData{Survey_sectionId}, $self->get("url")).
-				moveDownIcon('func=moveSectionDown;sid='.$sectionData{Survey_sectionId}, $self->get("url")),
+				$self->session->icon->delete('func=deleteSectionConfirm;sid='.$sectionData{Survey_sectionId}, $self->get("url"), WebGUI::International::get(105,'Asset_Survey')).
+				$self->session->icon->edit('func=editSection;sid='.$sectionData{Survey_sectionId}, $self->get("url")).
+				$self->session->icon->moveUp('func=moveSectionUp;sid='.$sectionData{Survey_sectionId}, $self->get("url")).
+				$self->session->icon->moveDown('func=moveSectionDown;sid='.$sectionData{Survey_sectionId}, $self->get("url")),
 			'section.edit.sectionName'=>$sectionData{sectionName},
 			'section.edit.id'=>$sectionData{Survey_sectionId},
 			'section.questions_loop'=>\@edit
@@ -973,11 +973,11 @@ sub www_editQuestion {
 			where Survey_questionId=".$self->session->db->quote($question->{Survey_questionId})." order by sequenceNumber");
 		while (%data = $sth->hash) {
 			$output .= 
-				deleteIcon('func=deleteAnswerConfirm;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, 
+				$self->session->icon->delete('func=deleteAnswerConfirm;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, 
 					$self->get("url"),WebGUI::International::get(45,'Asset_Survey')).
-                                editIcon('func=editAnswer;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
-                                moveUpIcon('func=moveAnswerUp'.';qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
-                                moveDownIcon('func=moveAnswerDown;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
+                                $self->session->icon->edit('func=editAnswer;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
+                                $self->session->icon->moveUp('func=moveAnswerUp'.';qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
+                                $self->session->icon->moveDown('func=moveAnswerDown;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
                                 ' '.$data{answer}.'<br />';
 		}
 		$sth->finish;
diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm
index 2601e5199..fdd870b9d 100644
--- a/lib/WebGUI/AssetBranch.pm
+++ b/lib/WebGUI/AssetBranch.pm
@@ -207,7 +207,7 @@ sub www_editBranch {
                 );
 	my $subtext;
         if ($self->session->user->isInGroup(3)) {
-                 $subtext = manageIcon('op=listUsers');
+                 $subtext = $self->session->icon->manage('op=listUsers');
         } else {
                  $subtext = "";
         }
diff --git a/lib/WebGUI/AssetMetaData.pm b/lib/WebGUI/AssetMetaData.pm
index c8fd3851e..961132614 100644
--- a/lib/WebGUI/AssetMetaData.pm
+++ b/lib/WebGUI/AssetMetaData.pm
@@ -273,8 +273,8 @@ sub www_manageMetaData {
 	my $output;
 	my $fields = $self->getMetaDataFields();
 	foreach my $fieldId (keys %{$fields}) {
-		$output .= deleteIcon("func=deleteMetaDataField;fid=".$fieldId,$self->get("url"),WebGUI::International::get('deleteConfirm','Asset'));
-		$output .= editIcon("func=editMetaDataField;fid=".$fieldId,$self->get("url"));
+		$output .= $self->session->icon->delete("func=deleteMetaDataField;fid=".$fieldId,$self->get("url"),WebGUI::International::get('deleteConfirm','Asset'));
+		$output .= $self->session->icon->edit("func=editMetaDataField;fid=".$fieldId,$self->get("url"));
 		$output .= " <b>".$fields->{$fieldId}{fieldName}."</b><br />";
 	}	
         $ac->setHelp("metadata manage","Asset");
diff --git a/lib/WebGUI/AssetVersioning.pm b/lib/WebGUI/AssetVersioning.pm
index de4613ea9..6d9e70de3 100644
--- a/lib/WebGUI/AssetVersioning.pm
+++ b/lib/WebGUI/AssetVersioning.pm
@@ -455,7 +455,7 @@ sub www_manageRevisions {
 		left join assetVersionTag on assetData.tagId=assetVersionTag.tagId left join users on assetData.revisedBy=users.userId
 		where assetData.assetId=".$self->session->db->quote($self->getId));
         while (my ($date,$by,$tag,$tagId) = $sth->array) {
-                $output .= '<tr><td>'.WebGUI::Icon::deleteIcon("func=purgeRevision;revisionDate=".$date,$self->get("url"),$i18n->get("purge revision prompt")).'</td>
+                $output .= '<tr><td>'.$self->session->icon->delete("func=purgeRevision;revisionDate=".$date,$self->get("url"),$i18n->get("purge revision prompt")).'</td>
 			<td><a href="'.$self->getUrl("func=viewRevision;revisionDate=".$date).'">'.$self->session->datetime->epochToHuman($date).'</a></td>
 			<td>'.$by.'</td>
 			<td><a href="'.$self->getUrl("func=manageRevisionsInTag;tagId=".$tagId).'">'.$tag.'</a></td>
@@ -496,7 +496,7 @@ sub www_manageVersions {
 	while (my ($id,$name,$date,$by) = $sth->array) {
 		my $u = WebGUI::User->new($by);
 		$output .= '<tr>
-			<td>'.WebGUI::Icon::deleteIcon("func=rollbackVersionTag;tagId=".$id,$self->get("url"),$rollbackPrompt).'</td>
+			<td>'.$self->session->icon->delete("func=rollbackVersionTag;tagId=".$id,$self->get("url"),$rollbackPrompt).'</td>
 			<td><a href="'.$self->getUrl("func=manageRevisionsInTag;tagId=".$id).'">'.$name.'</a></td>
 			<td>'.$self->session->datetime->epochToHuman($date).'</td>
 			<td>'.$u->username.'</td>
@@ -529,7 +529,7 @@ sub www_manageRevisionsInTag {
 	foreach my $row (@{$p->getPageData}) {
         	my ($date,$by,$id, $class) = ($row->{revisionDate}, $row->{username}, $row->{assetId}, $row->{className});
 		my $asset = WebGUI::Asset->new($id,$class,$date);
-                $output .= '<tr><td>'.WebGUI::Icon::deleteIcon("func=purgeRevision;proceed=manageRevisionsInTag;tagId=".$self->session->form->process("tagId").";revisionDate=".$date,$asset->get("url"),$i18n->get("purge revision prompt")).'</td>
+                $output .= '<tr><td>'.$self->session->icon->delete("func=purgeRevision;proceed=manageRevisionsInTag;tagId=".$self->session->form->process("tagId").";revisionDate=".$date,$asset->get("url"),$i18n->get("purge revision prompt")).'</td>
 			<td>'.$asset->getTitle.'</td>
 			<td><img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" />'.$asset->getName.'</td>
 			<td><a href="'.$asset->getUrl("func=viewRevision;revisionDate=".$date).'">'.$self->session->datetime->epochToHuman($date).'</a></td>
diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm
index e8b1c7e68..9da5d76aa 100644
--- a/lib/WebGUI/Auth/LDAP.pm
+++ b/lib/WebGUI/Auth/LDAP.pm
@@ -368,9 +368,9 @@ sub editUserSettingsForm {
    my $ldapConnectionLabel = WebGUI::International::get("ldapConnection",'AuthLDAP'); 
    my $buttons = "";
    if($self->session->setting->get("ldapConnection")) {
-      $buttons = editIcon("op=editLDAPLink;returnUrl=".$self->session->url->escape($self->session->url->page("op=editSettings")).";llid=".$self->session->setting->get("ldapConnection"));
+      $buttons = $self->session->icon->edit("op=editLDAPLink;returnUrl=".$self->session->url->escape($self->session->url->page("op=editSettings")).";llid=".$self->session->setting->get("ldapConnection"));
    }
-   $buttons .= manageIcon("op=listLDAPLinks;returnUrl=".$self->session->url->escape($self->session->url->page("op=editSettings")));
+   $buttons .= $self->session->icon->manage("op=listLDAPLinks;returnUrl=".$self->session->url->escape($self->session->url->page("op=editSettings")));
    $f->raw(qq|<tr><td class="formDescription" valign="top" style="width: 25%;">$ldapConnectionLabel</td><td class="tableData" style="width: 75%;">$ldapConnection&nbsp;$buttons</td></tr>|);
    return $f->printRowsOnly;
 }
diff --git a/lib/WebGUI/Form/DatabaseLink.pm b/lib/WebGUI/Form/DatabaseLink.pm
index 087051916..18ea87e95 100644
--- a/lib/WebGUI/Form/DatabaseLink.pm
+++ b/lib/WebGUI/Form/DatabaseLink.pm
@@ -124,9 +124,9 @@ sub toHtmlWithWrapper {
 	if ($self->session->user->isInGroup(3)) {
 		my $subtext;
 		if ($self->get("afterEdit")) {
-			$subtext = editIcon("op=editDatabaseLink;lid=".$self->get("value").";afterEdit=".$self->session->url->escape($self->get("afterEdit")));
+			$subtext = $self->session->icon->edit("op=editDatabaseLink;lid=".$self->get("value").";afterEdit=".$self->session->url->escape($self->get("afterEdit")));
 		}
-		$subtext .= manageIcon("op=listDatabaseLinks");
+		$subtext .= $self->session->icon->manage("op=listDatabaseLinks");
 		$self->get("subtext") = $subtext . $self->get("subtext");
 	}
 	return $self->SUPER::toHtmlWithWrapper;
diff --git a/lib/WebGUI/Form/Group.pm b/lib/WebGUI/Form/Group.pm
index b995a996e..21f49b53c 100644
--- a/lib/WebGUI/Form/Group.pm
+++ b/lib/WebGUI/Form/Group.pm
@@ -141,7 +141,7 @@ Renders the form field to HTML as a table row complete with labels, subtext, hov
 sub toHtmlWithWrapper {
         my $self = shift;
         if ($self->session->user->isInGroup(3)) {
-                my $subtext = manageIcon("op=listGroups");
+                my $subtext = $self->session->icon->manage("op=listGroups");
                 $self->get("subtext") = $subtext . $self->get("subtext");
         }
         return $self->SUPER::toHtmlWithWrapper;
diff --git a/lib/WebGUI/Form/LdapLink.pm b/lib/WebGUI/Form/LdapLink.pm
index 208b29b0c..6882dc0ac 100644
--- a/lib/WebGUI/Form/LdapLink.pm
+++ b/lib/WebGUI/Form/LdapLink.pm
@@ -147,9 +147,9 @@ sub toHtmlWithWrapper {
 	if ($self->session->user->isInGroup(3)) {
 		my $subtext;
 		if ($self->get("afterEdit")) {
-			$subtext = editIcon("op=editLDAPLink;llid=".$self->get("value").";afterEdit=".$self->session->url->escape($self->get("afterEdit")));
+			$subtext = $self->session->icon->edit("op=editLDAPLink;llid=".$self->get("value").";afterEdit=".$self->session->url->escape($self->get("afterEdit")));
 		}
-         	$subtext .= manageIcon("op=listLDAPLinks");
+         	$subtext .= $self->session->icon->manage("op=listLDAPLinks");
 		$self->get("subtext") = $subtext . $self->get("subtext");
 	}
 	return $self->SUPER::toHtmlWithWrapper;
diff --git a/lib/WebGUI/Form/Template.pm b/lib/WebGUI/Form/Template.pm
index 780028649..7b54575db 100644
--- a/lib/WebGUI/Form/Template.pm
+++ b/lib/WebGUI/Form/Template.pm
@@ -138,8 +138,8 @@ sub setManageIcons {
                 if (exists $self->session->asset) {
                         $returnUrl = ";proceed=goBackToPage;returnUrl=".$self->session->url->escape($self->session->asset->getUrl);
                 }
-                my $buttons = editIcon("func=edit".$returnUrl,$template->get("url"));
-                $buttons .= manageIcon("func=manageAssets",$template->getParent->get("url"));
+                my $buttons = $self->session->icon->edit("func=edit".$returnUrl,$template->get("url"));
+                $buttons .= $self->session->icon->manage("func=manageAssets",$template->getParent->get("url"));
 		$self->get("subtext") = $buttons . $self->get("subtext");
 	}
 }
diff --git a/lib/WebGUI/Operation/ActiveSessions.pm b/lib/WebGUI/Operation/ActiveSessions.pm
index f374a7585..ac2450d80 100644
--- a/lib/WebGUI/Operation/ActiveSessions.pm
+++ b/lib/WebGUI/Operation/ActiveSessions.pm
@@ -72,7 +72,7 @@ sub www_viewActiveSessions {
                 $row[$i] .= '<td>'$session->datetime->epochToHuman($data{expires}).'</td>';
                 $row[$i] .= '<td>'$session->datetime->epochToHuman($data{lastPageView}).'</td>';
                 $row[$i] .= '<td>'.$data{lastIP}.'</td>';
-		$row[$i] .= '<td align="center">'.deleteIcon("op=killSession;sid=$data{sessionId}").'</td></tr>';
+		$row[$i] .= '<td align="center">'.$session->icon->delete("op=killSession;sid=$data{sessionId}").'</td></tr>';
                 $i++;
 	}
 	$sth->finish;
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index 17c9e979b..a56bcfffc 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -144,7 +144,7 @@ sub www_checkoutConfirm {
 	($normal, $recurring) = $shoppingCart->getItems;
 
 	foreach (@$normal) {
-		$_->{deleteIcon} = deleteIcon('op=deleteCartItem;itemId='.$_->{item}->id.';itemType='.$_->{item}->type);
+		$_->{deleteIcon} = $session->icon->delete('op=deleteCartItem;itemId='.$_->{item}->id.';itemType='.$_->{item}->type);
 		$_->{'quantity.form'} = WebGUI::Form::integer({
 			name	=> 'quantity~'.$_->{item}->type.'~'.$_->{item}->id,
 			value	=> $_->{quantity},
@@ -153,7 +153,7 @@ sub www_checkoutConfirm {
 		$total += $_->{totalPrice};
 	}
 	foreach (@$recurring) {
-		$_->{deleteIcon} = deleteIcon('op=deleteCartItem;itemId='.$_->{item}->id.';itemType='.$_->{item}->type);
+		$_->{deleteIcon} = $session->icon->delete('op=deleteCartItem;itemId='.$_->{item}->id.';itemType='.$_->{item}->type);
 		$_->{'quantity.form'} = WebGUI::Form::integer({
 			name	=> 'quantity~'.$_->{item}->type.'~'.$_->{item}->id,
 			value	=> $_->{quantity},
@@ -639,7 +639,7 @@ sub www_listTransactions {
 	$output .= '<tr><th></th><th>Init Date</th><th>Completion Date</th><th>Amount</th><th>Shipping Cost</th><th>Status</th><th>Shipping Status</th></tr>';
 	foreach $transaction (@transactions) {
 		$output .= '<tr bgcolor="#ddd">';
-		$output .= '<td>'.deleteIcon('op=deleteTransaction;tid='.$transaction->get('transactionId')).'</td>';
+		$output .= '<td>'.$session->icon->delete('op=deleteTransaction;tid='.$transaction->get('transactionId')).'</td>';
 		$output .= '<td>'.$session->datetime->epochToHuman($transaction->get('initDate')).'</td>';
 		$output .= '<td>'.$session->datetime->epochToHuman($transaction->get('completionDate')).'</td>';
 		$output .= '<td>'.$transaction->get('amount').'</td>';
@@ -653,7 +653,7 @@ sub www_listTransactions {
 			$output .= '<tr>';
 			$output .= '<td></td>';
 			$output .= '<td colspan="3">'.
-				deleteIcon('op=deleteTransactionItem;tid='.$transaction->get('transactionId').';iid='.$_->{itemId}.';itype='.$_->{itemType}).
+				$session->icon->delete('op=deleteTransactionItem;tid='.$transaction->get('transactionId').';iid='.$_->{itemId}.';itype='.$_->{itemType}).
 				$_->{itemName}.'</td>';
 			$output .= '<td>'.$_->{quantity}.'</td>';
 			$output .= '<td> x </td>';
@@ -795,7 +795,7 @@ sub www_viewCart {
 	($normal, $recurring) = $shoppingCart->getItems;
 
 	foreach (@$normal) {
-		$_->{deleteIcon} = deleteIcon('op=deleteCartItem;itemId='.$_->{item}->id.';itemType='.$_->{item}->type);
+		$_->{deleteIcon} = $session->icon->delete('op=deleteCartItem;itemId='.$_->{item}->id.';itemType='.$_->{item}->type);
 		$_->{'quantity.form'} = WebGUI::Form::integer({
 			name	=> 'quantity~'.$_->{item}->type.'~'.$_->{item}->id,
 			value	=> $_->{quantity},
@@ -804,7 +804,7 @@ sub www_viewCart {
 		$total += $_->{totalPrice};
 	}
 	foreach (@$recurring) {
-		$_->{deleteIcon} = deleteIcon('op=deleteCartItem;itemId='.$_->{item}->id.';itemType='.$_->{item}->type);
+		$_->{deleteIcon} = $session->icon->delete('op=deleteCartItem;itemId='.$_->{item}->id.';itemType='.$_->{item}->type);
 		$_->{'quantity.form'} = WebGUI::Form::integer({
 			name	=> 'quantity~'.$_->{item}->type.'~'.$_->{item}->id,
 			value	=> $_->{quantity},
diff --git a/lib/WebGUI/Operation/DatabaseLink.pm b/lib/WebGUI/Operation/DatabaseLink.pm
index e1f1c2e06..858fe70b9 100644
--- a/lib/WebGUI/Operation/DatabaseLink.pm
+++ b/lib/WebGUI/Operation/DatabaseLink.pm
@@ -153,9 +153,9 @@ sub www_listDatabaseLinks {
 	foreach my $id (keys %{$links}) {
 		$output .= '<tr><td valign="top" class="tableData"></td><td valign="top" class="tableData">'.WebGUI::International::get(1076).'</td></tr>';
                 $output = '<tr><td valign="top" class="tableData">'
-			.deleteIcon('op=deleteDatabaseLink;dlid='.$id)
-			.editIcon('op=editDatabaseLink;dlid='.$id)
-			.copyIcon('op=copyDatabaseLink;dlid='.$id)
+			.$session->icon->delete('op=deleteDatabaseLink;dlid='.$id)
+			.$session->icon->edit('op=editDatabaseLink;dlid='.$id)
+			.$session->icon->copy('op=copyDatabaseLink;dlid='.$id)
 			.'</td>';
                 $output .= '<td valign="top" class="tableData">'.$links->{$id}.'</td></tr>';
         }
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index bd6a3bf00..0e77ed10a 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -150,8 +150,8 @@ sub walkGroups {
         my $sth = $session->db->read("select groups.groupId, groups.groupName from groupGroupings left join groups on groups.groupId=groupGroupings.groupId where groupGroupings.inGroup=".$session->db->quote($parentId));
         while (my ($id, $name) = $sth->array) {
 		$output .= $indent
-			.deleteIcon('op=deleteGroupGrouping;gid='.$parentId.';delete='.$id)
-			.editIcon('op=editGroup;gid='.$id)
+			.$session->icon->delete('op=deleteGroupGrouping;gid='.$parentId.';delete='.$id)
+			.$session->icon->edit('op=editGroup;gid='.$id)
 			.' '.$name.'<br />';
                 $output .= walkGroups($id,$indent."&nbsp; &nbsp; ");
         }
@@ -652,8 +652,8 @@ sub www_manageUsersInGroup {
 				name=>"uid",
 				value=>$row->{userId}
 				})
-                        .deleteIcon('op=deleteGrouping;uid='.$row->{userId}.';gid='.$session->form->process("gid"))
-                        .editIcon('op=editGrouping;uid='.$row->{userId}.';gid='.$session->form->process("gid"))
+                        .$session->icon->delete('op=deleteGrouping;uid='.$row->{userId}.';gid='.$session->form->process("gid"))
+                        .$session->icon->edit('op=editGrouping;uid='.$row->{userId}.';gid='.$session->form->process("gid"))
                         .'</td>';
                 $output .= '<td class="tableData"><a href="'.$session->url->page('op=editUser;uid='.$row->{userId}).'">'.$row->{username}.'</a></td>';
                 $output .= '<td class="tableData">'$session->datetime->epochToHuman($row->{expireDate},"%z").'</td></tr>';
diff --git a/lib/WebGUI/Operation/LDAPLink.pm b/lib/WebGUI/Operation/LDAPLink.pm
index 3b75fb91a..afd2f314e 100644
--- a/lib/WebGUI/Operation/LDAPLink.pm
+++ b/lib/WebGUI/Operation/LDAPLink.pm
@@ -225,9 +225,9 @@ sub www_listLDAPLinks {
    $i++;
    while ($data = $sth->hashRef) {
       $row[$i] = '<tr><td valign="top" class="tableData">'
-	        .deleteIcon('op=deleteLDAPLink;llid='.$data->{ldapLinkId},$session->url->page(),WebGUI::International::get("LDAPLink_988","AuthLDAP"))
-			.editIcon('op=editLDAPLink;llid='.$data->{ldapLinkId}.$returnUrl)
-			.copyIcon('op=copyLDAPLink;llid='.$data->{ldapLinkId}.$returnUrl)
+	        .$session->icon->delete('op=deleteLDAPLink;llid='.$data->{ldapLinkId},$session->url->page(),WebGUI::International::get("LDAPLink_988","AuthLDAP"))
+			.$session->icon->edit('op=editLDAPLink;llid='.$data->{ldapLinkId}.$returnUrl)
+			.$session->icon->copy('op=copyLDAPLink;llid='.$data->{ldapLinkId}.$returnUrl)
 			.'</td>';
       $row[$i] .= '<td valign="top" class="tableData">'.$data->{ldapLinkName}.'</td>';
 	  
diff --git a/lib/WebGUI/Operation/ProductManager.pm b/lib/WebGUI/Operation/ProductManager.pm
index 054334a40..cb3d78627 100755
--- a/lib/WebGUI/Operation/ProductManager.pm
+++ b/lib/WebGUI/Operation/ProductManager.pm
@@ -498,8 +498,8 @@ sub www_listProducts {
 	while ($row = $sth->hashRef) {
 		$output .= '<tr>';
 		$output .= '<td>';
-		$output .= deleteIcon('op=deleteProduct;productId='.$row->{productId});
-		$output .= editIcon('op=manageProduct;productId='.$row->{productId});
+		$output .= $session->icon->delete('op=deleteProduct;productId='.$row->{productId});
+		$output .= $session->icon->edit('op=manageProduct;productId='.$row->{productId});
 		$output .= '</td>';
 		$output .= '<td>'.$row->{title}.'</td>';
 		$output .= '</tr>';
@@ -562,7 +562,7 @@ sub www_listProductVariants {
 			name	=> 'available',
 			value	=> $_->{variantId},
 			checked	=> $_->{available},
-			}).editIcon('op=editProductVariant;variantId='.$_->{variantId})."</td>";
+			}).$session->icon->edit('op=editProductVariant;variantId='.$_->{variantId})."</td>";
 		$output .= "</tr>";
 	}
 	$output .= "</table>";
@@ -607,7 +607,7 @@ sub www_manageProduct {
 	$product = WebGUI::Product->new($productId);
 	
 	$output .= "<h1>".$product->get('title')."</h1>";
-	$output .= "<h2>".$i18n->get('properties').editIcon('op=editProduct;productId='.$productId)."</h2>";
+	$output .= "<h2>".$i18n->get('properties').$session->icon->edit('op=editProduct;productId='.$productId)."</h2>";
 	$output .= "<table>";
 	$output .= "<tr><td>".$i18n->get('price')."</td><td>".$product->get('price')."</td></tr>";
 	$output .= "<tr><td>".$i18n->get('weight')."</td><td>".$product->get('weight')."</td></tr>";
@@ -620,8 +620,8 @@ sub www_manageProduct {
 	$output .= '<a href="'.$session->url->page('op=editProductParameter;parameterId=new;productId='.$product->get('productId')).'">'.
 		$i18n->get('add parameter').'</a><br />';
 	foreach $parameter (@{$product->getParameter}) {
-		$output .= deleteIcon('op=deleteProductParameter;parameterId='.$parameter->{parameterId}).
-			editIcon('op=editProductParameter;parameterId='.$parameter->{parameterId});
+		$output .= $session->icon->delete('op=deleteProductParameter;parameterId='.$parameter->{parameterId}).
+			$session->icon->edit('op=editProductParameter;parameterId='.$parameter->{parameterId});
 		$output .= '<span style="margin-left: 10px"><b>'.$parameter->{name}.'</b></span><br />';
 		$output .= '<a style="margin-left: 20px" href="'.
 			$session->url->page('op=editProductParameterOption;optionId=new;parameterId='.$parameter->{parameterId}).'">'.
@@ -629,8 +629,8 @@ sub www_manageProduct {
 		foreach $optionId (@{$parameter->{options}}) {
 			$option = $product->getOption($optionId);
 			$output .= '<span style="margin-left: 20px">'.
-				deleteIcon('op=deleteProductParameterOption;optionId='.$option->{optionId}).
-				editIcon('op=editProductParameterOption;parameterId='.$parameter->{parameterId}.';optionId='.$option->{optionId}).$option->{value}.'</span><br />';
+				$session->icon->delete('op=deleteProductParameterOption;optionId='.$option->{optionId}).
+				$session->icon->edit('op=editProductParameterOption;parameterId='.$parameter->{parameterId}.';optionId='.$option->{optionId}).$option->{value}.'</span><br />';
 		}
 		$output .= '<br />';
 	}
diff --git a/lib/WebGUI/Operation/ProfileSettings.pm b/lib/WebGUI/Operation/ProfileSettings.pm
index 34288a919..b41bb93dd 100644
--- a/lib/WebGUI/Operation/ProfileSettings.pm
+++ b/lib/WebGUI/Operation/ProfileSettings.pm
@@ -267,18 +267,18 @@ sub www_editProfileSettings {
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $output = "";
 	foreach my $category (@{WebGUI::ProfileCategory->getCategories}) {
-		$output .= deleteIcon('op=deleteProfileCategoryConfirm;cid='.$category->getId,'',WebGUI::International::get(466,"WebGUIProfile")); 
-		$output .= editIcon('op=editProfileCategory;cid='.$category->getId); 
-		$output .= moveUpIcon('op=moveProfileCategoryUp;cid='.$category->getId); 
-		$output .= moveDownIcon('op=moveProfileCategoryDown;cid='.$category->getId); 
+		$output .= $session->icon->delete('op=deleteProfileCategoryConfirm;cid='.$category->getId,'',WebGUI::International::get(466,"WebGUIProfile")); 
+		$output .= $session->icon->edit('op=editProfileCategory;cid='.$category->getId); 
+		$output .= $session->icon->moveUp('op=moveProfileCategoryUp;cid='.$category->getId); 
+		$output .= $session->icon->moveDown('op=moveProfileCategoryDown;cid='.$category->getId); 
 		$output .= ' <b>'.$category->getLabel.'</b><br />';
 		foreach my $field (@{$category->getFields}) {
 			next if $field->getId =~ /contentPositions/;
 			$output .= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-                        $output .= deleteIcon('op=deleteProfileFieldConfirm;fid='.$field->getId,'',WebGUI::International::get(467,"WebGUIProfile"));
-       	                $output .= editIcon('op=editProfileField;fid='.$field->getId);
-               	        $output .= moveUpIcon('op=moveProfileFieldUp;fid='.$field->getId);
-                       	$output .= moveDownIcon('op=moveProfileFieldDown;fid='.$field->getId);
+                        $output .= $session->icon->delete('op=deleteProfileFieldConfirm;fid='.$field->getId,'',WebGUI::International::get(467,"WebGUIProfile"));
+       	                $output .= $session->icon->edit('op=editProfileField;fid='.$field->getId);
+               	        $output .= $session->icon->moveUp('op=moveProfileFieldUp;fid='.$field->getId);
+                       	$output .= $session->icon->moveDown('op=moveProfileFieldDown;fid='.$field->getId);
                        	$output .= ' '.$field->getLabel.'<br />';
 		}
 	}
diff --git a/lib/WebGUI/Operation/Replacements.pm b/lib/WebGUI/Operation/Replacements.pm
index ee6d1291a..4dff7702e 100644
--- a/lib/WebGUI/Operation/Replacements.pm
+++ b/lib/WebGUI/Operation/Replacements.pm
@@ -99,8 +99,8 @@ sub www_listReplacements {
 	$output .= '<tr><td></td><td class="tableHeader">'.WebGUI::International::get(1050).'</td><td class="tableHeader">'.WebGUI::International::get(1051).'</td></tr>';
 	my $sth = $session->db->read("select replacementId,searchFor,replaceWith from replacements order by searchFor");
 	while (my $data = $sth->hashRef) {
-		$output .= '<tr><td>'.deleteIcon("op=deleteReplacement;replacementId=".$data->{replacementId})
-			.editIcon("op=editReplacement;replacementId=".$data->{replacementId}).'</td>';
+		$output .= '<tr><td>'.$session->icon->delete("op=deleteReplacement;replacementId=".$data->{replacementId})
+			.$session->icon->edit("op=editReplacement;replacementId=".$data->{replacementId}).'</td>';
 		$data->{replaceWith} =~ s/\&/\&amp\;/g;
 		$data->{replaceWith} =~ s/\</\&lt\;/g;
         	$data->{replaceWith} =~ s/\>/\&gt\;/g;
diff --git a/lib/WebGUI/Operation/Subscription.pm b/lib/WebGUI/Operation/Subscription.pm
index 42ec5550a..d9fe43aa9 100644
--- a/lib/WebGUI/Operation/Subscription.pm
+++ b/lib/WebGUI/Operation/Subscription.pm
@@ -293,7 +293,7 @@ sub www_listSubscriptionCodeBatches {
 	$output .= '<table border="1" cellpadding="5" cellspacing="0" align="center">';
 	foreach (@{$batches}) {
 		$output .= '<tr><td>';		
-		$output .= deleteIcon('op=deleteSubscriptionCodeBatch;bid='.$_->{batchId}, undef, $i18n->get('delete batch confirm'));
+		$output .= $session->icon->delete('op=deleteSubscriptionCodeBatch;bid='.$_->{batchId}, undef, $i18n->get('delete batch confirm'));
 		$output .= '<td>'.$_->{description}.'</td>';
 		$output .= '<td><a href="'.$session->url->page('op=listSubscriptionCodes;selection=b;bid='.$_->{batchId}).'">'.$i18n->get('list codes in batch').'</a></td>';
 		$output .= '</tr>';
@@ -404,8 +404,8 @@ sub www_listSubscriptions {
 	$output .= '<table border="1" cellpadding="5" cellspacing="0" align="center">';
 	foreach (@{$subscriptions}) {
 		$output .= '<tr>';
-		$output .= '<td>'.editIcon('op=editSubscription;sid='.$_->{subscriptionId});
-		$output .= deleteIcon('op=deleteSubscription;sid='.$_->{subscriptionId}, undef, $i18n->get('delete subscription confirm')).'</td>';
+		$output .= '<td>'.$session->icon->edit('op=editSubscription;sid='.$_->{subscriptionId});
+		$output .= $session->icon->delete('op=deleteSubscription;sid='.$_->{subscriptionId}, undef, $i18n->get('delete subscription confirm')).'</td>';
 		$output .= '<td>'.$_->{name}.'</td>';
 		$output .= '</tr>';
 	}
diff --git a/lib/WebGUI/Operation/WebGUI.pm b/lib/WebGUI/Operation/WebGUI.pm
index a2225940a..35e446582 100644
--- a/lib/WebGUI/Operation/WebGUI.pm
+++ b/lib/WebGUI/Operation/WebGUI.pm
@@ -214,7 +214,7 @@ sub www_theWg {
 
 <br>).moveBottomI</font><font COLOR="#180204">c</font><font COLOR="#9C3E19">o</font><font COLOR="#D44C14">n</font><font COLOR="#E4460A">(</font><font COLOR="#EC4404">"</font><font COLOR="#EC4B0A">f</font><font COLOR="#CF5425">u</font><font COLOR="#FCECD6">n</font><font COLOR="#FCFDFA">c=m</font><font COLOR="#ECB49C">o</font><font COLOR="#FCAC89">v</font><font COLOR="#DC4A14">e</font><font COLOR="#F44304">B</font><font COLOR="#EC4404">o</font><font COLOR="#F44304">tt</font><font COLOR="#EC4404">o</font><font COLOR="#F44304">m</font><font COLOR="#FC6B29">&</font><font COLOR="#FC733B">w</font><font COLOR="#FCE4B7">i</font><font COLOR="#FCF5ED">d</font><font COLOR="#FCFDFA">=".${$wobje</font><font COLOR="#ECB49C">c</font><font COLOR="#FCAC89">t</font><font COLOR="#E14A0C">}</font><font COLOR="#EC4404">{w</font><font COLOR="#F44304">o</font><font COLOR="#EC4404">b</font><font COLOR="#F44304">j</font><font COLOR="#EC4404">e</font><font COLOR="#FC6323">c</font><font COLOR="#FC6B34">t</font><font COLOR="#FCE4C8">I</font><font COLOR="#FCF5E2">d</font><font COLOR="#FCFDFA">})</font><font COLOR="#DCCAC4">.</font><font COLOR="#F6C4B6">c</font><font COLOR="#B45833">u</font><font COLOR="#DC460A">t</font><font COLOR="#F44304">I</font><font COLOR="#EC3E04">c</font><font COLOR="#A01604">o</font><font COLOR="#872404">n</font><font COLOR="#280204">(</font><font COLOR="#0B0204">"fu
 
-<br>nc=cut&wid=".</font><font COLOR="#180204">$</font><font COLOR="#C04D1F">{</font><font COLOR="#E4460A">$</font><font COLOR="#EC4404">w</font><font COLOR="#E4460A">o</font><font COLOR="#F46227">b</font><font COLOR="#D46D41">j</font><font COLOR="#FCF5E2">e</font><font COLOR="#FCFDFA">ct</font><font COLOR="#FCF5ED">}</font><font COLOR="#EC9B79">{</font><font COLOR="#FC8E60">w</font><font COLOR="#E4460A">o</font><font COLOR="#F44304">b</font><font COLOR="#EC4404">j</font><font COLOR="#F44304">e</font><font COLOR="#EC4404">c</font><font COLOR="#F44304">t</font><font COLOR="#EC4404">I</font><font COLOR="#FC8450">d</font><font COLOR="#FC9367">}</font><font COLOR="#FCEBCC">)</font><font COLOR="#FCF5ED">.</font><font COLOR="#FCFDFA">copyIcon("</font><font COLOR="#FCF5ED">f</font><font COLOR="#EC9B79">u</font><font COLOR="#FC8E60">n</font><font COLOR="#E14A0C">c</font><font COLOR="#EC3E04">=</font><font COLOR="#EC4404">c</font><font COLOR="#F44304">o</font><font COLOR="#EC4404">p</font><font COLOR="#F44304">y</font><font COLOR="#EC4404">&</font><font COLOR="#FC7B43">w</font><font COLOR="#FC8E60">i</font><font COLOR="#FCEBCC">d</font><font COLOR="#FCF5ED">=</font><font COLOR="#FCFDFA">".</font><font COLOR="#CCB4AC">$</font><font COLOR="#ECAB91">{</font><font COLOR="#C04D1F">$</font><font COLOR="#E4460A">w</font><font COLOR="#EC4404">ob</font><font COLOR="#880204">j</font><font COLOR="#581004">e</font><font COLOR="#180204">c</font><font COLOR="#0B0204">t}{
+<br>nc=cut&wid=".</font><font COLOR="#180204">$</font><font COLOR="#C04D1F">{</font><font COLOR="#E4460A">$</font><font COLOR="#EC4404">w</font><font COLOR="#E4460A">o</font><font COLOR="#F46227">b</font><font COLOR="#D46D41">j</font><font COLOR="#FCF5E2">e</font><font COLOR="#FCFDFA">ct</font><font COLOR="#FCF5ED">}</font><font COLOR="#EC9B79">{</font><font COLOR="#FC8E60">w</font><font COLOR="#E4460A">o</font><font COLOR="#F44304">b</font><font COLOR="#EC4404">j</font><font COLOR="#F44304">e</font><font COLOR="#EC4404">c</font><font COLOR="#F44304">t</font><font COLOR="#EC4404">I</font><font COLOR="#FC8450">d</font><font COLOR="#FC9367">}</font><font COLOR="#FCEBCC">)</font><font COLOR="#FCF5ED">.</font><font COLOR="#FCFDFA">$session->icon->copy("</font><font COLOR="#FCF5ED">f</font><font COLOR="#EC9B79">u</font><font COLOR="#FC8E60">n</font><font COLOR="#E14A0C">c</font><font COLOR="#EC3E04">=</font><font COLOR="#EC4404">c</font><font COLOR="#F44304">o</font><font COLOR="#EC4404">p</font><font COLOR="#F44304">y</font><font COLOR="#EC4404">&</font><font COLOR="#FC7B43">w</font><font COLOR="#FC8E60">i</font><font COLOR="#FCEBCC">d</font><font COLOR="#FCF5ED">=</font><font COLOR="#FCFDFA">".</font><font COLOR="#CCB4AC">$</font><font COLOR="#ECAB91">{</font><font COLOR="#C04D1F">$</font><font COLOR="#E4460A">w</font><font COLOR="#EC4404">ob</font><font COLOR="#880204">j</font><font COLOR="#581004">e</font><font COLOR="#180204">c</font><font COLOR="#0B0204">t}{
 
 <br>wobjectId});</font><font COLOR="#36190F">i</font><font COLOR="#581004">f</font><font COLOR="#D44C14">(</font><font COLOR="#EC4404">${</font><font COLOR="#E14A0C">$</font><font COLOR="#FC9C6A">w</font><font COLOR="#F4A68A">o</font><font COLOR="#FCF5ED">b</font><font COLOR="#FCFDFA">je</font><font COLOR="#FCF5ED">c</font><font COLOR="#CC6D44">t</font><font COLOR="#F46227">}</font><font COLOR="#E4460A">{</font><font COLOR="#F44304">n</font><font COLOR="#EC4404">a</font><font COLOR="#EC3E04">m</font><font COLOR="#F44304">e</font><font COLOR="#EC4404">sp</font><font COLOR="#FCBC8A">a</font><font COLOR="#FCCCA8">c</font><font COLOR="#FCF5E2">e</font><font COLOR="#FCFDFA">}ne"Wobject</font><font COLOR="#FCF5ED">P</font><font COLOR="#CC5D30">r</font><font COLOR="#EC5418">o</font><font COLOR="#EC4404">x</font><font COLOR="#F44304">y</font><font COLOR="#EC4404">"&</font><font COLOR="#F44304">&i</font><font COLOR="#EC3E04">s</font><font COLOR="#FCC491">I</font><font COLOR="#FCCCA8">n</font><font COLOR="#FCF5ED">(</font><font COLOR="#FCFDFA">"Wo</font><font COLOR="#A48674">b</font><font COLOR="#CC6D44">j</font><font COLOR="#D14E1C">e</font><font COLOR="#E4460A">c</font><font COLOR="#F44304">t</font><font COLOR="#E23D04">P</font><font COLOR="#590304">r</font><font COLOR="#280204">o</font><font COLOR="#0B0204">xy",
 
diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index f64991421..587ad0a74 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -24,6 +24,7 @@ use WebGUI::Session::Env;
 use WebGUI::Session::ErrorHandler;
 use WebGUI::Session::Form;
 use WebGUI::Session::Http;
+use WebGUI::Session::Icon;
 use WebGUI::Session::Os;
 use WebGUI::Session::Privilege;
 use WebGUI::Session::Scratch;
@@ -242,7 +243,7 @@ sub getId {
 
 =head2 http ( )
 
-Returns a reference to the WebGUI::HTTP object.
+Returns a reference to the WebGUI::Session::Http object.
 
 =cut
 
@@ -255,6 +256,23 @@ sub http {
 }
 
 
+#-------------------------------------------------------------------
+
+=head2 icon ( )
+
+Returns a WebGUI::Session::Icon object.
+
+=cut
+
+sub icon {
+	my $self = shift;
+	unless ($self->{_icon}) {
+		$self->{_icon} = WebGUI::Session::Icon->new($session);
+	}
+	return $self->{_icon};
+}
+
+
 #-------------------------------------------------------------------
 
 =head2 open ( webguiRoot, configFile [, requestObject, serverObject, sessionId ] )
diff --git a/lib/WebGUI/Icon.pm b/lib/WebGUI/Session/Icon.pm
similarity index 53%
rename from lib/WebGUI/Icon.pm
rename to lib/WebGUI/Session/Icon.pm
index 254d5024d..ce693024a 100644
--- a/lib/WebGUI/Icon.pm
+++ b/lib/WebGUI/Session/Icon.pm
@@ -1,4 +1,4 @@
-package WebGUI::Icon;
+package WebGUI::Session::Icon;
 
 =head1 LEGAL
 
@@ -14,20 +14,13 @@ package WebGUI::Icon;
 
 =cut
 
-use Exporter;
 use strict;
 use WebGUI::International;
-use WebGUI::Session;
-use WebGUI::URL;
 
-our @ISA = qw(Exporter);
-our @EXPORT = qw(&helpIcon &becomeIcon &cutIcon &copyIcon &deleteIcon &editIcon &manageIcon
-	&moveBottomIcon &moveDownIcon &moveLeftIcon &moveRightIcon &moveTopIcon &moveUpIcon &lockedIcon
-	&pageIcon &dragIcon &shortcutIcon &pasteIcon &wobjectIcon &viewIcon &exportIcon);
 
 =head1 NAME
 
-Package WebGUI::Icon
+Package WebGUI::Session::Icon
 
 =head1 DESCRIPTION
 
@@ -35,27 +28,25 @@ A package for generating user interface buttons. The subroutines found herein do
 
 =head1 SYNOPSIS
 
- use WebGUI::Icon;
- $html = copyIcon('op=something');
- $html = cutIcon('op=something');
- $html = deleteIcon('op=something');
- $html = dragIcon();
- $html = editIcon('op=something');
- $html = helpIcon(1,"MyNamespace");
- $html = manageIcon('op=something');
- $html = moveBottomIcon('op=something');
- $html = moveDownIcon('op=something');
- $html = moveLeftIcon('op=something');
- $html = moveRightIcon('op=something');
- $html = moveTopIcon('op=something');
- $html = moveUpIcon('op=something');
- $html = pageIcon();
- $html = pasteIcon('op=something');
- $html = shortcutIcon('op=something');
- $html = viewIcon('op=something');
- $html = wobjectIcon();
+ use WebGUI::Session::Icon;
+ $html = $self->session->icon->copy('op=something');
+ $html = $self->session->icon->cut('op=something');
+ $html = $self->session->icon->delete('op=something');
+ $html = $self->session->icon->drag();
+ $html = $self->session->icon->edit('op=something');
+ $html = $self->session->icon->help(1,"MyNamespace");
+ $html = $self->session->icon->manage('op=something');
+ $html = $self->session->icon->moveBottom('op=something');
+ $html = $self->session->icon->moveDown('op=something');
+ $html = $self->session->icon->moveLeft('op=something');
+ $html = $self->session->icon->moveRight('op=something');
+ $html = $self->session->icon->moveTop('op=something');
+ $html = $self->session->icon->moveUp('op=something');
+ $html = $self->session->icon->paste('op=something');
+ $html = $self->session->icon->shortcut('op=something');
+ $html = $self->session->icon->view('op=something');
 
- $hashRef = getToolbarOptions();
+ $hashRef = $self->session->icon->getToolbarOptions();
 
 =head1 METHODS
 
@@ -67,11 +58,12 @@ These subroutines are available from this package:
 
 =head2 _getBaseURL ( )
 
-Returns the base URL for this user's toolbar.
+Returns the base URL for this user's toolbar icon set.
 
 =cut
 
 sub _getBaseURL {
+	my $self = shift;
 	my $url = $self->session->config->get("extrasURL").'/toolbar/';
 	if ($self->session->user->profileField("toolbar") ne "useLanguageDefault") {
 		$url .= $self->session->user->profileField("toolbar");
@@ -85,7 +77,7 @@ sub _getBaseURL {
 
 #-------------------------------------------------------------------
 
-=head2 copyIcon ( urlParameters [, pageURL ] )
+=head2 copy ( urlParameters [, pageURL ] )
 
 Generates a button with the word "Copy" printed on it.
 
@@ -99,17 +91,18 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub copyIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'copy.gif" align="middle" border="0" alt="'.WebGUI::International::get('Copy','Icon').'" title="'.WebGUI::International::get('Copy','Icon').'" /></a>';
+sub copy {
+	my $self = shift;
+	my $urlParams = shift;
+	my $pageURL = shift || $self->session->url->getRequestedUrl;
+        my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'copy.gif" align="middle" border="0" alt="'.WebGUI::International::get('Copy','Icon').'" title="'.WebGUI::International::get('Copy','Icon').'" /></a>';
         return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 cutIcon ( urlParameters [, pageURL ] )
+=head2 cut ( urlParameters [, pageURL ] )
 
 Generates a button with the word "Cut" printed on it.
 
@@ -123,17 +116,18 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub cutIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'cut.gif" align="middle" border="0" alt="'.WebGUI::International::get('Cut','Icon').'" title="'.WebGUI::International::get('Cut','Icon').'" /></a>';
+sub cut {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'cut.gif" align="middle" border="0" alt="'.WebGUI::International::get('Cut','Icon').'" title="'.WebGUI::International::get('Cut','Icon').'" /></a>';
         return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 deleteIcon ( urlParameters [, pageURL, confirmText ] )
+=head2 delete ( urlParameters [, pageURL, confirmText ] )
 
 Generates a button that represents a delete operation.
 
@@ -151,35 +145,34 @@ If defined, a confirm box will popup to ask the user if they want to delete.
 
 =cut
 
-sub deleteIcon {
-        my ($output, $pageURL, $confirmText);
-	$confirmText = $_[2];
+sub delete {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+	$confirmText = shift; 
 	if($confirmText) {
 		$confirmText = qq| onclick="return confirm('$confirmText')" |;
 	}
-	
-        $pageURL = $_[1] || $session{requestedUrl};
-	
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'" '.$confirmText.'>';
-	$output .= '<img src="'._getBaseURL().'delete.gif" align="middle" border="0" alt="'.WebGUI::International::get('Delete','Icon').'" title="'.WebGUI::International::get('Delete','Icon').'" /></a>';
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'" '.$confirmText.'>';
+	$output .= '<img src="'.$self->_getBaseURL().'delete.gif" align="middle" border="0" alt="'.WebGUI::International::get('Delete','Icon').'" title="'.WebGUI::International::get('Delete','Icon').'" /></a>';
 	return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 dragIcon ( )
+=head2 drag ( )
 
 Generates an icon that can be used to drag content.
 
 =cut
 
-sub dragIcon {
-        return '<img id="dragTrigger" class="dragTrigger" src="'._getBaseURL().'drag.gif" align="middle" border="0" alt="'.WebGUI::International::get('Drag','Icon').'" title="'.WebGUI::International::get('Drag','Icon').'" />';
+sub drag {
+        return '<img id="dragTrigger" class="dragTrigger" src="'.$self->_getBaseURL().'drag.gif" align="middle" border="0" alt="'.WebGUI::International::get('Drag','Icon').'" title="'.WebGUI::International::get('Drag','Icon').'" />';
 }
 
 #-------------------------------------------------------------------
 
-=head2 editIcon ( urlParameters [, pageURL ] )
+=head2 edit ( urlParameters [, pageURL ] )
 
 Generates a button with the word "Edit" printed on it.
 
@@ -193,17 +186,18 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub editIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'edit.gif" align="middle" border="0" alt="'.WebGUI::International::get('Edit','Icon').'" title="'.WebGUI::International::get('Edit','Icon').'" /></a>';
+sub edit {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'edit.gif" align="middle" border="0" alt="'.WebGUI::International::get('Edit','Icon').'" title="'.WebGUI::International::get('Edit','Icon').'" /></a>';
         return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 exportIcon ( urlParameters [, pageURL ] )
+=head2 export ( urlParameters [, pageURL ] )
 
 Generates an export button.
 
@@ -217,12 +211,12 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub exportIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-	# TODO Change icon to Jeffs export icon
-        $output .= '<img src="'._getBaseURL().'export.gif" align="middle" border="0" alt="'.WebGUI::International::get('Export','Icon').'" title="'.WebGUI::International::get('Export','Icon').'" /></a>';
+sub export {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'export.gif" align="middle" border="0" alt="'.WebGUI::International::get('Export','Icon').'" title="'.WebGUI::International::get('Export','Icon').'" /></a>';
         return $output;
 }
 
@@ -252,7 +246,7 @@ sub getToolbarOptions {
 
 #-------------------------------------------------------------------
 
-=head2 helpIcon ( helpId [, namespace ] )
+=head2 help ( helpId [, namespace ] )
 
 Generates a button with the word "Help" printed on it.
 
@@ -266,17 +260,19 @@ If your help documentation is not in the WebGUI namespace, then you must specify
 
 =cut
 
-sub helpIcon {
+sub help {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my ($output, $namespace);
-	$namespace = $_[1] || "WebGUI";
-	$output = '<a href="'.$self->session->url->page('op=viewHelp;hid='.$_[0].';namespace='.$namespace).
-		'" target="_blank"><img src="'._getBaseURL().'help.gif" border="0" align="right" title="'.WebGUI::International::get('Help','Icon').'" Alt="'.WebGUI::International::get('Help','Icon').'"></a>';
+	$output = '<a href="'.$self->session->url->page('op=viewHelp;hid='.$urlParams.';namespace='.$namespace).
+		'" target="_blank"><img src="'.$self->_getBaseURL().'help.gif" border="0" align="right" title="'.WebGUI::International::get('Help','Icon').'" Alt="'.WebGUI::International::get('Help','Icon').'"></a>';
 	return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 lockedIcon ( urlParameters [, pageURL ] )
+=head2 locked ( urlParameters [, pageURL ] )
 
 Generates a button that represents a management function. Is toggled out in place of the edit icon when an asset is locked.
 
@@ -290,17 +286,18 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub lockedIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'locked.gif" align="middle" border="0" alt="'.WebGUI::International::get('locked','Icon').'" title="'.WebGUI::International::get('locked','Icon').'" /></a>';
+sub locked {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'locked.gif" align="middle" border="0" alt="'.WebGUI::International::get('locked','Icon').'" title="'.WebGUI::International::get('locked','Icon').'" /></a>';
         return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 manageIcon ( urlParameters [, pageURL ] )
+=head2 manage ( urlParameters [, pageURL ] )
 
 Generates a button that represents a management function.
 
@@ -314,17 +311,18 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub manageIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'manage.gif" align="middle" border="0" alt="'.WebGUI::International::get('Manage','Icon').'" title="'.WebGUI::International::get('Manage','Icon').'" /></a>';
+sub manage {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'manage.gif" align="middle" border="0" alt="'.WebGUI::International::get('Manage','Icon').'" title="'.WebGUI::International::get('Manage','Icon').'" /></a>';
         return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 moveBottomIcon ( urlParameters [, pageURL ] )
+=head2 moveBottom ( urlParameters [, pageURL ] )
 
 Generates a button with a double down arrow printed on it.
 
@@ -338,17 +336,18 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub moveBottomIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'moveBottom.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move To Bottom','Icon').'" title="'.WebGUI::International::get('Move To Bottom','Icon').'" /></a>';
+sub moveBottom {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'moveBottom.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move To Bottom','Icon').'" title="'.WebGUI::International::get('Move To Bottom','Icon').'" /></a>';
         return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 moveDownIcon ( urlParameters [, pageURL ] )
+=head2 moveDown ( urlParameters [, pageURL ] )
 
 Generates a button with a down arrow printed on it.
 
@@ -362,17 +361,18 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub moveDownIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'moveDown.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move Down','Icon').'" title="'.WebGUI::International::get('Move Down','Icon').'" /></a>';
+sub moveDown {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'moveDown.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move Down','Icon').'" title="'.WebGUI::International::get('Move Down','Icon').'" /></a>';
         return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 moveLeftIcon ( urlParameters [, pageURL ] )
+=head2 moveLeft ( urlParameters [, pageURL ] )
 
 Generates a button with a left arrow printed on it.
 
@@ -386,17 +386,18 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub moveLeftIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'moveLeft.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move Left','Icon').'" title="'.WebGUI::International::get('Move Left','Icon').'" /></a>';
+sub moveLeft {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'moveLeft.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move Left','Icon').'" title="'.WebGUI::International::get('Move Left','Icon').'" /></a>';
         return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 moveRightIcon ( urlParameters [, pageURL ] )
+=head2 moveRight ( urlParameters [, pageURL ] )
 
 Generates a button with a right arrow printed on it.
 
@@ -410,17 +411,18 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub moveRightIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'moveRight.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move Right','Icon').'" title="'.WebGUI::International::get('Move Right','Icon').'" /></a>';
+sub moveRight {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'moveRight.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move Right','Icon').'" title="'.WebGUI::International::get('Move Right','Icon').'" /></a>';
         return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 moveTopIcon ( urlParameters [, pageURL ] )
+=head2 moveTop ( urlParameters [, pageURL ] )
 
 Generates a button with a double up arrow printed on it.
 
@@ -434,17 +436,18 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub moveTopIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'moveTop.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move To Top','Icon').'" title="'.WebGUI::International::get('Move To Top','Icon').'" /></a>';
+sub moveTop {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'moveTop.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move To Top','Icon').'" title="'.WebGUI::International::get('Move To Top','Icon').'" /></a>';
         return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 moveUpIcon ( urlParameters [, pageURL ] )
+=head2 moveUp ( urlParameters [, pageURL ] )
 
 Generates a button with an up arrow printed on it.
 
@@ -458,29 +461,19 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub moveUpIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'moveUp.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move Up','Icon').'" title="'.WebGUI::International::get('Move Up','Icon').'" /></a>';
+sub moveUp {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'moveUp.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move Up','Icon').'" title="'.WebGUI::International::get('Move Up','Icon').'" /></a>';
         return $output;
 }
 
-#-------------------------------------------------------------------
-
-=head2 pageIcon ( )
-
-Generates an icon that looks like a page. It's purpose is to represent whether you're looking at page properties or Wobject properties. 
-
-=cut
-
-sub pageIcon {
-        return '<img src="'._getBaseURL().'page.gif" align="middle" border="0" alt="'.WebGUI::International::get('Page Settings','Icon').'" title="'.WebGUI::International::get('Page Settings','Icon').'" />';
-}
 
 #-------------------------------------------------------------------
 
-=head2 pasteIcon ( urlParameters [, pageURL ] )
+=head2 paste ( urlParameters [, pageURL ] )
 
 Generates a button with the word "Paste" printed on it.
 
@@ -494,17 +487,18 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub pasteIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'paste.gif" align="middle" border="0" alt="'.WebGUI::International::get('Paste','Icon').'" title="'.WebGUI::International::get('Paste','Icon').'" /></a>';
+sub paste {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'paste.gif" align="middle" border="0" alt="'.WebGUI::International::get('Paste','Icon').'" title="'.WebGUI::International::get('Paste','Icon').'" /></a>';
         return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 shortcutIcon ( urlParameters [, pageURL ] )
+=head2 shortcut ( urlParameters [, pageURL ] )
 
 Generates a button with a shortcut symbol printed on it, similar to the shortcut icon in Microsoft Windows or the link Icon in Gnome.
 
@@ -518,17 +512,18 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub shortcutIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'shortcut.gif" align="middle" border="0" alt="'.WebGUI::International::get('Create Shortcut','Icon').'" title="'.WebGUI::International::get('Create Shortcut','Icon').'" /></a>';
+sub shortcut {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'shortcut.gif" align="middle" border="0" alt="'.WebGUI::International::get('Create Shortcut','Icon').'" title="'.WebGUI::International::get('Create Shortcut','Icon').'" /></a>';
         return $output;
 }
 
 #-------------------------------------------------------------------
 
-=head2 viewIcon ( urlParameters [, pageURL ] )
+=head2 view ( urlParameters [, pageURL ] )
 
 Generates a button with the word "View" printed on it.
 
@@ -542,26 +537,15 @@ The URL to any page. Defaults to the current page.
 
 =cut
 
-sub viewIcon {
-        my ($output, $pageURL);
-        $pageURL = $_[1] || $session{requestedUrl};
-        $output = '<a href="'.$self->session->url->gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'._getBaseURL().'view.gif" align="middle" border="0" alt="'.WebGUI::International::get('View','Icon').'" title="'.WebGUI::International::get('View','Icon').'" /></a>';
+sub view {
+	 my $self = shift;
+        my $urlParams = shift;
+        my $pageURL = shift || $self->session->url->getRequestedUrl;
+        $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
+        $output .= '<img src="'.$self->_getBaseURL().'view.gif" align="middle" border="0" alt="'.WebGUI::International::get('View','Icon').'" title="'.WebGUI::International::get('View','Icon').'" /></a>';
         return $output;
 }
 
-#-------------------------------------------------------------------
-
-=head2 wobjectIcon ( )
-
-Generates an icon that looks like a wobject. It's purpose is to represent whether you're looking at page properties or Wobject properties.
-
-=cut
-
-sub wobjectIcon {
-        return '<img src="'._getBaseURL().'wobject.gif" align="middle" border="0" alt="'.WebGUI::International::get('Wobject Settings','Icon').'" title="'.WebGUI::International::get('Wobject Settings','Icon').'" />';
-}
-
 
 
 1;
diff --git a/www/extras/toolbar/metal/page.gif b/www/extras/toolbar/metal/page.gif
deleted file mode 100644
index 44959ea71..000000000
Binary files a/www/extras/toolbar/metal/page.gif and /dev/null differ
diff --git a/www/extras/toolbar/metal/wobject.gif b/www/extras/toolbar/metal/wobject.gif
deleted file mode 100644
index de88292f8..000000000
Binary files a/www/extras/toolbar/metal/wobject.gif and /dev/null differ