diff --git a/admin/browse.php b/admin/browse.php
index 63d3ff3a282..8529e60f8ef 100644
--- a/admin/browse.php
+++ b/admin/browse.php
@@ -236,13 +236,13 @@
 		."\t<tr bgcolor='#999999'><td colspan='2'>\n"
 		."\t\t\t<img src='$imagefiles/blank.gif' width='31' height='20' border='0' hspace='0' align='left' alt=''>\n"
 		."\t\t\t<img src='$imagefiles/seperator.gif' border='0' hspace='0' align='left' alt=''>\n"
-		."\t\t\t<input type='image' align='left' src='$imagefiles/edit.gif' title='"
+		."\t\t\t<input type='image' align='left' src='$imagefiles/edit.png' title='"
 		. _BR_EDITRESPONSE."' alt='"._BR_EDITRESPONSE."' onClick=\"window.open('dataentry.php?action=edit&amp;id=$id&amp;sid=$surveyid&amp;surveytable=$surveytable','_top')\" />\n"
 		."\t\t\t<a href='dataentry.php?action=delete&amp;id=$id&amp;sid=$surveyid&amp;surveytable=$surveytable'>"
 		."<img align='left' hspace='0' border='0' src='$imagefiles/delete.png' alt='"
 		. _BR_DELRESPONSE."' title='"
 		. _BR_DELRESPONSE."' onClick=\"return confirm('"._DR_RUSURE."')\" /></a>\n"
-        . "\t\t\t<input type='image' name='Export' src='$imagefiles/export.gif' title='"
+        . "\t\t\t<input type='image' name='Export' src='$imagefiles/export.png' title='"
         . _S_EXPORT_BT_SINGLE."' alt='". _S_EXPORT_BT_SINGLE."'align='left'  onclick=\"window.open('export.php?sid=$surveyid&id=$id', '_blank')\">\n"
 		."\t\t\t<img src='$imagefiles/seperator.gif' border='0' hspace='0' align='left' alt=''>\n"
 		."\t\t\t<img src='$imagefiles/blank.gif' width='20' height='20' border='0' hspace='0' align='left' alt=''>\n"
diff --git a/admin/export.php b/admin/export.php
index 7a5ebdf139d..2d427af6401 100644
--- a/admin/export.php
+++ b/admin/export.php
@@ -211,13 +211,13 @@
 		."\t\t<td>$setfont\n";
 	if ($afieldcount > 255)
 		{
-		echo "\t\t\t<img src='$imagefiles/showhelp.gif' alt='"._HELP."' align='right' onclick='javascript:alert(\""
+		echo "\t\t\t<img src='$imagefiles/showhelp.png' alt='"._HELP."' align='right' onclick='javascript:alert(\""
 			._EX_COLNOTOK
 			."\")'>";
 		}
 	else
 		{
-		echo "\t\t\t<img src='$imagefiles/showhelp.gif' alt='"._HELP."' align='right' onclick='javascript:alert(\""
+		echo "\t\t\t<img src='$imagefiles/showhelp.png' alt='"._HELP."' align='right' onclick='javascript:alert(\""
 			._EX_COLOK
 			."\")'>";
 		}
@@ -268,7 +268,7 @@
  			."\t</tr>\n"
  			."\t<tr>\n"
  			."\t\t<td>$setfont<font size='1'>"
- 			."<img src='$imagefiles/showhelp.gif' alt='"._HELP."' align='right' onclick='javascript:alert(\""
+ 			."<img src='$imagefiles/showhelp.png' alt='"._HELP."' align='right' onclick='javascript:alert(\""
  			._EX_TOKENMESSAGE
  			."\")'><br /><br />\n"
  			."<input type='checkbox' name='first_name' id='first_name'>"
diff --git a/admin/html.php b/admin/html.php
index 9184f964dc7..d071df63ee1 100644
--- a/admin/html.php
+++ b/admin/html.php
@@ -243,9 +243,9 @@
 						. "\t\t\t\t<tr bgcolor='#999999'><td align='right' height='22'>\n";
 		if ($activated == "N" && $sumcount3>0) 
 			{
-			$surveysummary .= "\t\t\t\t\t<img src='$imagefiles/inactive.gif' "
+			$surveysummary .= "\t\t\t\t\t<img src='$imagefiles/inactive.png' "
 							. "title='"._S_INACTIVE_BT."' alt='"._S_INACTIVE_BT."' border='0' hspace='0' align='left'>\n"
-							. "\t\t\t\t\t<input type='image' src='$imagefiles/activate.gif' name='ActivateSurvey' "
+							. "\t\t\t\t\t<input type='image' src='$imagefiles/activate.png' name='ActivateSurvey' "
 							. "title='"._S_ACTIVATE_BT."' alt='"._S_ACTIVATE_BT."' align='left' "
 							. "onClick=\"window.open('$scriptname?action=activate&amp;sid=$surveyid', '_top')\">\n";
 			}
@@ -253,29 +253,29 @@
 			{
 			$surveysummary .= "\t\t\t\t\t<img src='$imagefiles/active.gif' title='"._S_ACTIVE_BT."' "
 							. "alt='"._S_ACTIVE_BT."' align='left'>\n"
-							. "\t\t\t\t\t<input type='image' src='$imagefiles/deactivate.gif' name='DeactivateSurvey' "
+							. "\t\t\t\t\t<input type='image' src='$imagefiles/deactivate.png' name='DeactivateSurvey' "
 							. "alt='"._S_DEACTIVATE_BT."' title='"._S_DEACTIVATE_BT."' align='left' "
 							. "onClick=\"window.open('$scriptname?action=deactivate&amp;sid=$surveyid', '_top')\">\n";
 			}
 		elseif ($activated == "N")
 			{
-			$surveysummary .= "\t\t\t\t\t<img src='$imagefiles/inactive.gif' title='"._S_INACTIVE_BT."' "
+			$surveysummary .= "\t\t\t\t\t<img src='$imagefiles/inactive.png' title='"._S_INACTIVE_BT."' "
 							. "alt='"._S_INACTIVE_BT."' border='0' hspace='0' align='left'>\n"
 							. "\t\t\t\t\t<img src='$imagefiles/blank.gif' width='11' title='"._S_CANNOTACTIVATE_BT."' "
 							. "alt='"._S_CANNOTACTIVATE_BT."' border='0' align='left' hspace='0'>\n";
 			}
 		$surveysummary .= "\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' align='left' border='0' hspace='0'>\n"
-						. "\t\t\t\t\t<input type='image' accesskey='d' src='$imagefiles/do.gif' title='"._S_DOSURVEY_BT."' "
+						. "\t\t\t\t\t<input type='image' accesskey='d' src='$imagefiles/do.png' title='"._S_DOSURVEY_BT."' "
 						. "name='DoSurvey' align='left' alt='"._S_DOSURVEY_BT."' "
 						. "onclick=\"window.open('".$publicurl."/index.php?sid=$surveyid&amp;newtest=Y', '_blank')\">\n"
-						. "\t\t\t\t\t<input type='image' src='$imagefiles/dataentry.gif' "
+						. "\t\t\t\t\t<input type='image' src='$imagefiles/dataentry.png' "
 						. "title='"._S_DATAENTRY_BT."' align='left' alt='"._S_DATAENTRY_BT."'"
 						. "name='DoDataentry' onclick=\"window.open('".$homeurl."/dataentry.php?sid=$surveyid', '_blank')\">\n"
-						. "\t\t\t\t\t<input type='image' src='$imagefiles/print.gif' title='"._S_PRINTABLE_BT."' "
+						. "\t\t\t\t\t<input type='image' src='$imagefiles/print.png' title='"._S_PRINTABLE_BT."' "
 						. "name='ShowPrintableSurvey' align='left' alt='"._S_PRINTABLE_BT."' "
 						. "onclick=\"window.open('".$homeurl."/printablesurvey.php?sid=$surveyid', '_blank')\">\n"
 						. "\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' align='left' border='0' hspace='0'>\n"
-						. "\t\t\t\t\t<input type='image' src='$imagefiles/edit.gif' title='"._S_EDIT_BT."' "
+						. "\t\t\t\t\t<input type='image' src='$imagefiles/edit.png' title='"._S_EDIT_BT."' "
 						. "name='EditSurvey' align='left' alt='"._S_EDIT_BT."'"
 						. "onclick=\"window.open('$scriptname?action=editsurvey&amp;sid=$surveyid', '_top')\">\n";
 		if ($sumcount3 == 0 && $sumcount2 == 0)
@@ -288,10 +288,10 @@
 			{
 			$surveysummary .= "\t\t\t\t\t<img src='$imagefiles/blank.gif' alt='' width='20' align='left' border='0' hspace='0'>\n";
 			}
-		$surveysummary .= "\t\t\t\t\t<input type='image' src='$imagefiles/export.gif' title='". _S_EXPORT_BT."' alt='". _S_EXPORT_BT."' align='left' name='ExportSurvey' "
+		$surveysummary .= "\t\t\t\t\t<input type='image' src='$imagefiles/export.png' title='". _S_EXPORT_BT."' alt='". _S_EXPORT_BT."' align='left' name='ExportSurvey' "
 						. "onclick=\"window.open('".$homeurl."/dumpsurvey.php?sid=$surveyid', '_top')\">\n";
 		$surveysummary .= "\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' align='left' border='0' hspace='0'>\n"
-						. "<input type='image' src='$imagefiles/assessments.gif' title='". _S_ASSESSMENT_BT."' alt='". _S_ASSESSMENT_BT."' align='left' name='SurveyAssessment' "
+						. "<input type='image' src='$imagefiles/assessments.png' title='". _S_ASSESSMENT_BT."' alt='". _S_ASSESSMENT_BT."' align='left' name='SurveyAssessment' "
 						. "onclick=\"window.open('".$homeurl."/assessments.php?sid=$surveyid', '_top')\">\n";		
 		
 		if ($activated == "Y")
@@ -500,7 +500,7 @@
 					   . "\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' border='0' hspace='0' align='left'>\n"
 					   . "\t\t\t\t\t<img src='$imagefiles/blank.gif' alt='' width='60' height='20' border='0' hspace='0' align='left'>\n"
 					   . "\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' border='0' hspace='0' align='left'>\n"
-					   . "\t\t\t\t\t<input type='image' src='$imagefiles/edit.gif' title='". _G_EDIT_BT."' alt='". _G_EDIT_BT."' name='EditGroup' "
+					   . "\t\t\t\t\t<input type='image' src='$imagefiles/edit.png' title='". _G_EDIT_BT."' alt='". _G_EDIT_BT."' name='EditGroup' "
 					   . "align='left'  onclick=\"window.open('$scriptname?action=editgroup&amp;sid=$surveyid&amp;gid=$gid', "
 					   . "'_top')\">";
 		if (($sumcount4 == 0 && $activated != "Y") || $activated != "Y") 
@@ -515,7 +515,7 @@
 			{
 			$groupsummary .= "\t\t\t\t\t<img src='$imagefiles/blank.gif' alt='' width='20' align='left' border='0' hspace='0'>\n";
 			}
-		$groupsummary .= "\t\t\t\t\t<input type='image' src='$imagefiles/export.gif' title='"
+		$groupsummary .= "\t\t\t\t\t<input type='image' src='$imagefiles/export.png' title='"
 					   . _G_EXPORT_BT."' alt='". _G_EXPORT_BT."'name='ExportGroup' "
 					   . "align='left' "
 					   . "onclick=\"window.open('dumpgroup.php?sid=$surveyid&amp;gid=$gid', '_top')\">"
@@ -597,7 +597,7 @@
 						  . "\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' border='0' hspace='0' align='left'>\n"
 						  . "\t\t\t\t\t<img src='$imagefiles/blank.gif' alt='' width='60' height='20' border='0' hspace='0' align='left'>\n"
 						  . "\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' border='0' hspace='0' align='left'>\n"
-						  . "\t\t\t\t\t<input type='image' src='$imagefiles/edit.gif' title='". _Q_EDIT_BT."' alt='". _Q_EDIT_BT."' align='left' name='EditQuestion' "
+						  . "\t\t\t\t\t<input type='image' src='$imagefiles/edit.png' title='". _Q_EDIT_BT."' alt='". _Q_EDIT_BT."' align='left' name='EditQuestion' "
 						  . "onclick=\"window.open('$scriptname?action=editquestion&amp;sid=$surveyid&amp;gid=$gid&amp;qid=$qid', '_top')\">\n";
 		if (($qct == 0 && $activated != "Y") || $activated != "Y") 
 			{
@@ -607,7 +607,7 @@
 							  . "onclick=\"return confirm('"._DQ_RUSURE."')\"></a>\n";
 			}
 		else {$questionsummary .= "\t\t\t\t\t<img src='$imagefiles/blank.gif' alt='' width='20' align='left' border='0' hspace='0'>\n";}
-		$questionsummary .= "\t\t\t\t\t<input type='image' src='$imagefiles/export.gif' title='"
+		$questionsummary .= "\t\t\t\t\t<input type='image' src='$imagefiles/export.png' title='"
 						  . _Q_EXPORT_BT."' alt='". _Q_EXPORT_BT."'align='left' name='ExportQuestion' "
 						  . "onclick=\"window.open('dumpquestion.php?qid=$qid', '_top')\">\n"
 						  . "\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' border='0' hspace='0' align='left'>\n"
diff --git a/admin/images/activate.png b/admin/images/activate.png
new file mode 100644
index 00000000000..1fa7c2813fd
Binary files /dev/null and b/admin/images/activate.png differ
diff --git a/admin/images/assessments.gif b/admin/images/assessments.gif
deleted file mode 100644
index 9bcceb61bcb..00000000000
Binary files a/admin/images/assessments.gif and /dev/null differ
diff --git a/admin/images/assessments.png b/admin/images/assessments.png
new file mode 100644
index 00000000000..179de7d06e9
Binary files /dev/null and b/admin/images/assessments.png differ
diff --git a/admin/images/dataentry.png b/admin/images/dataentry.png
new file mode 100644
index 00000000000..b546979d8ea
Binary files /dev/null and b/admin/images/dataentry.png differ
diff --git a/admin/images/do.gif b/admin/images/do.gif
deleted file mode 100644
index 90665792aca..00000000000
Binary files a/admin/images/do.gif and /dev/null differ
diff --git a/admin/images/do.png b/admin/images/do.png
new file mode 100644
index 00000000000..8544cd44683
Binary files /dev/null and b/admin/images/do.png differ
diff --git a/admin/images/dol.png b/admin/images/dol.png
new file mode 100644
index 00000000000..8544cd44683
Binary files /dev/null and b/admin/images/dol.png differ
diff --git a/admin/images/edit.gif b/admin/images/edit.gif
deleted file mode 100644
index 0a1d6eee28b..00000000000
Binary files a/admin/images/edit.gif and /dev/null differ
diff --git a/admin/images/edit.png b/admin/images/edit.png
new file mode 100644
index 00000000000..1378a3ee7da
Binary files /dev/null and b/admin/images/edit.png differ
diff --git a/admin/images/export.gif b/admin/images/export.gif
deleted file mode 100644
index 3f6df1ad74e..00000000000
Binary files a/admin/images/export.gif and /dev/null differ
diff --git a/admin/images/export.png b/admin/images/export.png
new file mode 100644
index 00000000000..79ca6d7e742
Binary files /dev/null and b/admin/images/export.png differ
diff --git a/admin/images/inactive.gif b/admin/images/inactive.gif
deleted file mode 100644
index 2b359412883..00000000000
Binary files a/admin/images/inactive.gif and /dev/null differ
diff --git a/admin/images/inactive.png b/admin/images/inactive.png
new file mode 100644
index 00000000000..e912842106f
Binary files /dev/null and b/admin/images/inactive.png differ
diff --git a/admin/images/print.png b/admin/images/print.png
new file mode 100644
index 00000000000..6aa487f0f44
Binary files /dev/null and b/admin/images/print.png differ
diff --git a/admin/images/showhelp.gif b/admin/images/showhelp.gif
deleted file mode 100644
index 950a58938af..00000000000
Binary files a/admin/images/showhelp.gif and /dev/null differ
diff --git a/admin/images/showhelp.png b/admin/images/showhelp.png
new file mode 100644
index 00000000000..f5c6c0ad39c
Binary files /dev/null and b/admin/images/showhelp.png differ
diff --git a/admin/index.php b/admin/index.php
index 1de2ce0c05b..92969a7f962 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -403,7 +403,7 @@ function adminmenu() {
 			   <table align='center' width='100%' cellspacing='0' cellpadding='0'>
 			    <tr>
 				 <td height='26' valign='bottom'>
-			      <img src='{$imagefiles}/showhelp.gif' align='right' alt='Show Help'>
+			      <img src='{$imagefiles}/showhelp.png' align='right' alt='Show Help'>
 			      <img src='$imagefiles/blank.gif' width='5' height='1' alt=''>
 			      <a href='$scriptname' title='"._A_HOME_BT."'><img src='{$imagefiles}/home.png' alt='"._A_HOME_BT."' border='0'></a>
 				 </td>
diff --git a/admin/labels.php b/admin/labels.php
index 94f88d12df8..8ef9ba4b896 100644
--- a/admin/labels.php
+++ b/admin/labels.php
@@ -91,7 +91,7 @@
     ."\t\t\t\t\t<img src='$imagefiles/seperator.gif' border='0' hspace='0' align='left' alt=''>\n"
     ."\t\t\t\t\t</td>\n"
     ."\t\t\t\t\t<td align='right' width='620'>\n"
-    ."\t\t\t\t\t<input type='image' src='$imagefiles/showhelp.gif' title='"
+    ."\t\t\t\t\t<input type='image' src='$imagefiles/showhelp.png' title='"
     ._A_HELP_BT."' alt='"._A_HELP_BT."' align='right'  "
     ."onClick=\"showhelp('show')\">\n"
     ."\t\t\t\t\t<img src='$imagefiles/blank.gif' width='42' height='20' align='right' hspace='0' border='0'  alt=''>\n"
@@ -222,14 +222,14 @@
             ."\t\t\t\t\t<img src='$imagefiles/seperator.gif' border='0' hspace='0' align='left' alt=''>\n"
             ."\t\t\t\t\t<img src='$imagefiles/blank.gif' width='60' height='20' border='0' hspace='0' align='left' alt=''>\n"
             ."\t\t\t\t\t<img src='$imagefiles/seperator.gif' border='0' hspace='0' align='left' alt=''>\n"
-            ."\t\t\t\t\t<input type='image' src='$imagefiles/edit.gif' title='"
+            ."\t\t\t\t\t<input type='image' src='$imagefiles/edit.png' title='"
             ._L_EDIT_BT."' align='left' "
             ."onclick=\"window.open('labels.php?action=editset&amp;lid=$lid', '_top')\">\n"
             ."\t\t\t\t\t<a href='labels.php?action=delset&amp;lid=$lid'>"
             ."<img src='$imagefiles/delete.png' border='0' alt='"._L_DEL_BT."' title='"
             ._L_DEL_BT."' align='left' "
             ."onClick=\"return confirm('Are you sure?')\"></a>\n"
-            ."\t\t\t\t\t<input type='image' src='$imagefiles/export.gif' alt='"._EXPORTLABEL."' title='"
+            ."\t\t\t\t\t<input type='image' src='$imagefiles/export.png' alt='"._EXPORTLABEL."' title='"
             ._EXPORTLABEL."' align='left' "
             ."onClick=\"window.open('dumplabel.php?lid=$lid', '_top')\">\n"
             ."\t\t\t\t\t</td>\n"
diff --git a/admin/navigator.php b/admin/navigator.php
index 9dd688dafd8..36bc7737a55 100644
--- a/admin/navigator.php
+++ b/admin/navigator.php
@@ -377,7 +377,7 @@ function surveyDetails($surveyid, $gid, $qid) {
 	if ($thissurvey['active'] == "Y") {
 	    $surveystatus="<img src='$imagefiles/blank.gif' width='50' height='1' alt=''><a href='#' ".$navigation['dropdownaction']."=\"return dropdownmenu(this, event, surveyactivation, '180px')\"><img src='{$imagefiles}/active.gif' border='0' hspace='0' alt='"._S_ACTIVE_BT."'>"._S_ACTIVE_BT."</a>";
 	} else {
-		$surveystatus="<img src='$imagefiles/blank.gif' width='195' height='1' alt=''><a href='#' ".$navigation['dropdownaction']."=\"return dropdownmenu(this, event, surveyactivation, '180px')\"><img src='{$imagefiles}/inactive.gif' border='0' hspace='0' alt='"._S_INACTIVE_BT."'>"._S_INACTIVE_BT."</a>";
+		$surveystatus="<img src='$imagefiles/blank.gif' width='195' height='1' alt=''><a href='#' ".$navigation['dropdownaction']."=\"return dropdownmenu(this, event, surveyactivation, '180px')\"><img src='{$imagefiles}/inactive.png' border='0' hspace='0' alt='"._S_INACTIVE_BT."'>"._S_INACTIVE_BT."</a>";
 	}
 	
 	$contents = buildSummaryRows($fields, 'surveysummary', $display, $pages);
@@ -440,7 +440,7 @@ function surveyEdit($surveyid) {
 
 	if ($action == "editsurvey") {
 		$thissurvey=getSurveyInfo($surveyid);
-		$title="<img src='$imagefiles/edit.gif' align='left' border='0'>"._S_EDIT_BT;
+		$title="<img src='$imagefiles/edit.png' align='left' border='0'>"._S_EDIT_BT;
 		$button=_UPDATE;
 	} elseif ($action == "addsurvey") {
 		//Set defaults for a new survey
@@ -610,7 +610,7 @@ function groupEdit($surveyid, $gid) {
 	global $publicurl, $imagefiles, $scriptname, $action;
 	if ($action == "editgroup") {
 		$thisgroup=getGroupInfo($surveyid, $gid);
-		$title="<img src='$imagefiles/edit.gif' align='left' border='0'>"._G_EDIT_BT;
+		$title="<img src='$imagefiles/edit.png' align='left' border='0'>"._G_EDIT_BT;
 		$button=_UPDATE;
 	} elseif ($action == "addgroup") {
 		//Set defaults for a new survey
@@ -706,7 +706,7 @@ function questionEdit($surveyid, $gid, $qid) {
 	if ($action == "editquestion") {
 		$thissurvey = getSurveyInfo($surveyid);
 	    $thisquestion = getQuestionInfo($qid);
-		$title="<img src='$imagefiles/edit.gif' align='left' border='0'>"._Q_EDIT_BT;
+		$title="<img src='$imagefiles/edit.png' align='left' border='0'>"._Q_EDIT_BT;
 		$button = _UPDATE;
 	} elseif ($action == "copyquestion") {
 		$thissurvey = getSurveyInfo($surveyid);
@@ -1877,24 +1877,24 @@ function javadropdown($surveyid, $gid, $qid) {
 	}
 
 	
-	$menu['surveyactions']["0"]="<a href='{$publicurl}/$scriptname?sid=$surveyid&amp;newtest=Y' target='_blank'><img src='$imagefiles/do.gif' align='left' border='0' height='15' width='15'>"._S_DOSURVEY_BT."<\/a><br />";
-	$menu['surveyactions']["1"]="<a href='{$homeurl}/dataentry.php?sid=$surveyid' target='_blank'><img src='$imagefiles/dataentry.gif' align='left' border='0' height='15' width='15'>"._S_DATAENTRY_BT."<\/a><br />";
-	$menu['surveyactions']["2"]="<a href='{$homeurl}/printablesurvey.php?sid=$surveyid' target='_blank'><img src='$imagefiles/print.gif' align='left' border='0' height='15' width='15'>"._S_PRINTABLE_BT."<\/a><br />";
+	$menu['surveyactions']["0"]="<a href='{$publicurl}/$scriptname?sid=$surveyid&amp;newtest=Y' target='_blank'><img src='$imagefiles/do.png' align='left' border='0' height='15' width='15'>"._S_DOSURVEY_BT."<\/a><br />";
+	$menu['surveyactions']["1"]="<a href='{$homeurl}/dataentry.php?sid=$surveyid' target='_blank'><img src='$imagefiles/dataentry.png' align='left' border='0' height='15' width='15'>"._S_DATAENTRY_BT."<\/a><br />";
+	$menu['surveyactions']["2"]="<a href='{$homeurl}/printablesurvey.php?sid=$surveyid' target='_blank'><img src='$imagefiles/print.png' align='left' border='0' height='15' width='15'>"._S_PRINTABLE_BT."<\/a><br />";
 	$menu['surveyactions']["3"]="<a onClick='rusurelink(\\\""._S_RENUMBERSURVEYWARNING."\\\", \\\"$homeurl/$scriptname?sid=$surveyid&dbaction=renumbersurvey\\\")' href='#'><img src='$imagefiles/renumber.gif' align='left' border='0' height='15' width='15'>"._S_RENUMBER_BT."<\/a><br />";
 
 	
 	if ($thissurvey['active'] == "Y") {
-	    $menu['surveyactivation']["0"]="<a href='{$homeurl}/$scriptname?action=deactivate&amp;sid=$surveyid'><img src='$imagefiles/deactivate.gif' align='left' border='0' height='15' width='15'>"._S_DEACTIVATE_BT."<\/a><br />";
+	    $menu['surveyactivation']["0"]="<a href='{$homeurl}/$scriptname?action=deactivate&amp;sid=$surveyid'><img src='$imagefiles/deactivate.png' align='left' border='0' height='15' width='15'>"._S_DEACTIVATE_BT."<\/a><br />";
 	} else {
-		$menu['surveyactivation']["0"]="<a href='{$homeurl}/$scriptname?action=activate&amp;sid=$surveyid'><img src='$imagefiles/activate.gif' align='left' border='0' height='15' width='15'>"._S_ACTIVATE_BT."<\/a><br />";
+		$menu['surveyactivation']["0"]="<a href='{$homeurl}/$scriptname?action=activate&amp;sid=$surveyid'><img src='$imagefiles/activate.png' align='left' border='0' height='15' width='15'>"._S_ACTIVATE_BT."<\/a><br />";
 	}
 
-	$menu['surveyoptions']["0"]="<a href='{$homeurl}/$scriptname?sid=$surveyid&action=editsurvey'><img src='$imagefiles/edit.gif' align='left' border='0' height='15' width='15'>"._S_EDIT_BT."<\/a><br />";
-	$menu['surveyoptions']["2"]="<a href='{$homeurl}/dumpsurvey.php?sid=$surveyid'><img src='$imagefiles/export.gif' align='left' border='0' height='15' width='15'>"._S_EXPORT_BT."<\/a><br />";
+	$menu['surveyoptions']["0"]="<a href='{$homeurl}/$scriptname?sid=$surveyid&action=editsurvey'><img src='$imagefiles/edit.png' align='left' border='0' height='15' width='15'>"._S_EDIT_BT."<\/a><br />";
+	$menu['surveyoptions']["2"]="<a href='{$homeurl}/dumpsurvey.php?sid=$surveyid'><img src='$imagefiles/export.png' align='left' border='0' height='15' width='15'>"._S_EXPORT_BT."<\/a><br />";
 	if ($thissurvey['active'] != "Y") {
 		$menu['surveyoptions']["1"]="<a href='{$homeurl}/$scriptname?sid=$surveyid&action=delsurvey' onclick=\\\"return confirm('"._DS_DELMESSAGE1." "._DS_DELMESSAGE2."')\\\"><img src='$imagefiles/delete.png' align='left' border='0' height='15' width='15'>"._S_DELETE_BT."<\/a><br />";
 	}
-	$menu['surveyoptions']["3"]="<a href='{$homeurl}/$scriptname?sid=$surveyid&action=showassessments'><img src='$imagefiles/assessments.gif' align='left' border='0' height='15' width='15'>"._S_ASSESSMENT_BT."<\/a><br />";
+	$menu['surveyoptions']["3"]="<a href='{$homeurl}/$scriptname?sid=$surveyid&action=showassessments'><img src='$imagefiles/assessments.png' align='left' border='0' height='15' width='15'>"._S_ASSESSMENT_BT."<\/a><br />";
 	
 	if ($thissurvey['active'] == "Y") {
 		$menu['surveyactive']["0"]="<a href='{$homeurl}/browse.php?sid=$surveyid'><img src='$imagefiles/browse.gif' align='left' border='0' height='15' width='15'>"._S_BROWSE_BT."<\/a><br />";
@@ -1906,21 +1906,21 @@ function javadropdown($surveyid, $gid, $qid) {
 	}
 	
 	if (!empty($gid)) {
-	    $menu['groupoptions']["0"]="<a href='{$homeurl}/$scriptname?sid=$surveyid&amp;gid=$gid&action=editgroup'><img src='$imagefiles/edit.gif' align='left' border='0' height='15' width='15'>"._G_EDIT_BT."<\/a><br />";
+	    $menu['groupoptions']["0"]="<a href='{$homeurl}/$scriptname?sid=$surveyid&amp;gid=$gid&action=editgroup'><img src='$imagefiles/edit.png' align='left' border='0' height='15' width='15'>"._G_EDIT_BT."<\/a><br />";
 		if ($thissurvey['active'] != "Y") {
 			$menu['groupoptions']["1"] = "<a href='{$homeurl}/$scriptname?sid=$surveyid&amp;gid=$gid&action=delgroup'><img src='$imagefiles/delete.png' align='left' border='0' height='15' width='15'>"._G_DELETE_BT."<\/a><br />";
 		}
-		$menu['groupoptions']["2"]="<a href='{$homeurl}/dumpgroup.php?sid=$surveyid&amp;gid=$gid'><img src='$imagefiles/export.gif' align='left' border='0' height='15' width='15'>"._G_EXPORT_BT."<\/a><br />";
+		$menu['groupoptions']["2"]="<a href='{$homeurl}/dumpgroup.php?sid=$surveyid&amp;gid=$gid'><img src='$imagefiles/export.png' align='left' border='0' height='15' width='15'>"._G_EXPORT_BT."<\/a><br />";
 	
 		$menu['groupactions']["0"]="<a href='$homeurl/$scriptname?sid=$surveyid&amp;gid=$gid&dbaction=renumbergroup'><img src='$imagefiles/renumber.gif' align='left' border='0' height='15' width='15'>"._G_RENUMBER_BT."<\/a><br />";
 	}
 
 	if (!empty($qid)) {
-	    $menu['questionoptions']["0"]="<a href='{$homeurl}/$scriptname?sid=$surveyid&amp;gid=$gid&amp;qid=$qid&action=editquestion'><img src='$imagefiles/edit.gif' align='left' border='0' height='15' width='15'>"._Q_EDIT_BT."<\/a><br />";
+	    $menu['questionoptions']["0"]="<a href='{$homeurl}/$scriptname?sid=$surveyid&amp;gid=$gid&amp;qid=$qid&action=editquestion'><img src='$imagefiles/edit.png' align='left' border='0' height='15' width='15'>"._Q_EDIT_BT."<\/a><br />";
 	    if ($thissurvey['active'] != "Y") {
 			$menu['questionoptions']["1"]="<a href='{$homeurl}/$scriptname?sid=$surveyid&amp;gid=$gid&amp;qid=$qid&action=delquestion'><img src='$imagefiles/delete.png' align='left' border='0' height='15' width='15'>"._Q_DELETE_BT."<\/a><br />";
 	    }
-	    $menu['questionoptions']["2"]="<a href='{$homeurl}/dumpgroup.php?sid=$surveyid&amp;gid=$gid&amp;qid=$qid'><img src='$imagefiles/export.gif' align='left' border='0' height='15' width='15'>"._Q_EXPORT_BT."<\/a><br />";
+	    $menu['questionoptions']["2"]="<a href='{$homeurl}/dumpgroup.php?sid=$surveyid&amp;gid=$gid&amp;qid=$qid'><img src='$imagefiles/export.png' align='left' border='0' height='15' width='15'>"._Q_EXPORT_BT."<\/a><br />";
 	    $menu['questionoptions']["3"]="<a href='{$homeurl}/$scriptname?sid=$surveyid&amp;gid=$gid&amp;qid=$qid&action=copyquestion'><img src='{$imagefiles}/copy.gif' align='left' border='0' height='15' width='15' alt='". _Q_COPY_BT."'>"._Q_COPY_BT."<\/a><br />";
 
 		$thisquestion=getQuestionInfo($qid);
diff --git a/admin/templates.php b/admin/templates.php
index de6b1482868..c3d695940a0 100644
--- a/admin/templates.php
+++ b/admin/templates.php
@@ -539,12 +539,12 @@ function doreplacement($file) { //Produce sample page from template file
 	."\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' border='0' hspace='0' align='left'>\n"
 	."\t\t\t\t\t<img src='$imagefiles/blank.gif' alt='' width='60' height='10' border='0' hspace='0' align='left'>\n"
 	."\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' border='0' hspace='0' align='left'>\n"
-	."\t\t\t\t\t<input type='image' name='EditName' src='$imagefiles/edit.gif' align='left' title='"._TP_RENAME."'"
+	."\t\t\t\t\t<input type='image' name='EditName' src='$imagefiles/edit.png' align='left' title='"._TP_RENAME."'"
 	." onClick=\"javascript: copyprompt('"._TP_RENAMETO."', '$templatename', '$templatename', 'rename')\"";
 if ($templatename == "default") {echo " disabled";}
 echo ">";
 echo "\t\t\t\t\t<img src='$imagefiles/blank.gif' alt='' width='20' height='10' border='0' hspace='0' align='left'>\n"
-	."\t\t\t\t\t<input type='image' name='Export' src='$imagefiles/export.gif' align='left' title='"._TP_EXPORT."'"
+	."\t\t\t\t\t<input type='image' name='Export' src='$imagefiles/export.png' align='left' title='"._TP_EXPORT."'"
 	." onClick='javascript:window.open(\"templates.php?action=zip&amp;editfile=$editfile&amp;screenname=$screenname&amp;templatename=$templatename\", \"_top\")'>\n"
 	."\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' border='0' hspace='0' align='left'>\n"
 	."\t\t\t\t\t<input type='image' name='MakeCopy' src='$imagefiles/copy.gif' align='left' title='"._TP_COPY."'"
diff --git a/admin/tokens.php b/admin/tokens.php
index 95c6e365d3b..32c8bac81af 100644
--- a/admin/tokens.php
+++ b/admin/tokens.php
@@ -225,7 +225,7 @@
 // IF WE MADE IT THIS FAR, THEN THERE IS A TOKENS TABLE, SO LETS DEVELOP THE MENU ITEMS
 echo "\t<tr bgcolor='#999999'>\n"
 	."\t\t<td>\n"
-	."\t\t\t<input type='image' name='HelpButton' src='$imagefiles/showhelp.gif' title='"
+	."\t\t\t<input type='image' name='HelpButton' src='$imagefiles/showhelp.png' title='"
 	._A_HELP_BT."' align='right'  onClick=\"showhelp('show')\">\n"
 	."\t\t\t<input type='image' name='HomeButton' src='$imagefiles/home.png' title='"
 	._B_ADMIN_BT."' align='left' onClick=\"window.open('$scriptname?sid=$surveyid', '_top')\">\n"
@@ -239,7 +239,7 @@
 	."\t\t\t<img src='$imagefiles/seperator.gif' alt='' border='0' hspace='0' align='left'>\n"
 	."\t\t\t<input type='image' name='AddNewButton' src='$imagefiles/add.png' title='"
 	._T_ADD_BT."' align='left' onClick=\"window.open('$homeurl/tokens.php?sid=$surveyid&amp;action=addnew', '_top')\">\n"
-	."\t\t\t<input type='image' name='ExportButton' src='$imagefiles/export.gif' title='"
+	."\t\t\t<input type='image' name='ExportButton' src='$imagefiles/export.png' title='"
 	._T_EXPORT_BT."' align='left' onClick=\"window.open('$homeurl/tokens.php?sid=$surveyid&amp;action=export', '_top')\">\n"
 	."\t\t\t<input type='image' name='ImportButton' src='$imagefiles/import.gif' title='"
 	._T_IMPORT_BT."' align='left' onClick=\"window.open('$homeurl/tokens.php?sid=$surveyid&amp;action=import', '_top')\">\n"
diff --git a/common.php b/common.php
index a1fbb8d9a59..5989f49d0b1 100644
--- a/common.php
+++ b/common.php
@@ -251,7 +251,7 @@ function showadminmenu()
                     . "onClick=\"window.open('templates.php', '_top')\">"
                     . "\t\t\t\t</td>\n";
         $adminmenu .= "\t\t\t\t<td align='right' width='400'>\n"
-                    . "\t\t\t\t\t<input type='image' src='$imagefiles/showhelp.gif' name='ShowHelp' title='"
+                    . "\t\t\t\t\t<input type='image' src='$imagefiles/showhelp.png' name='ShowHelp' title='"
                     . _A_HELP_BT."' alt='". _A_HELP_BT."' align='right' onClick=\"showhelp('show')\">\n"
                     . "\t\t\t\t\t<img src='$imagefiles/blank.gif' alt='' width='42' height='20' align='right' >\n"
                     . "\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' align='right' >\n"
@@ -906,14 +906,14 @@ function browsemenubar()
                     . _B_ALL_BT."' align='left' onClick=\"window.open('browse.php?sid=$surveyid&amp;action=all', '_top')\">\n"
                     . "\t\t\t<input type='image' name='ViewLast' src='$imagefiles/viewlast.gif' title='"
                     . _B_LAST_BT."' align='left' onClick=\"window.open('browse.php?sid=$surveyid&amp;action=all&amp;limit=50&amp;order=desc', '_top')\">\n"
-                    . "\t\t\t<input type='image' name='DataEntry' src='$imagefiles/dataentry.gif' title='"
+                    . "\t\t\t<input type='image' name='DataEntry' src='$imagefiles/dataentry.png' title='"
                     . _S_DATAENTRY_BT."' align='left'  onclick=\"window.open('dataentry.php?sid=$surveyid', '_top')\">\n"
-                    . "\t\t\t<input type='image' name='Printable' src='$imagefiles/print.gif' title='"
+                    . "\t\t\t<input type='image' name='Printable' src='$imagefiles/print.png' title='"
                     . _S_PRINTABLE_BT."' align='left'  onclick=\"window.open('printablesurvey.php?sid=$surveyid', '_blank')\">\n"
                     . "\t\t\t<input type='image' name='Statistics' src='$imagefiles/statistics.gif' title='"
                     . _B_STATISTICS_BT."' align='left'  onclick=\"window.open('statistics.php?sid=$surveyid', '_top')\">\n"
                     . "\t\t\t<img src='$imagefiles/seperator.gif' alt=''  align='left'>\n"
-                    . "\t\t\t<input type='image' name='Export' src='$imagefiles/export.gif' title='"
+                    . "\t\t\t<input type='image' name='Export' src='$imagefiles/export.png' title='"
                     . _B_EXPORT_BT."' alt='". _B_EXPORT_BT."'align='left'  onclick=\"window.open('export.php?sid=$surveyid', '_blank')\">\n"
                     . "\t\t\t<a href='spss.php?sid=$surveyid'><img src='$imagefiles/export2.gif' align='left' title='"
                     . _SPSS_EXPORTFILE."' border='0' alt='". _SPSS_EXPORTFILE."'></a>\n"
@@ -929,7 +929,7 @@ function browsemenubar()
                     . "\t\t\t<a href='vvexport.php?sid=$surveyid'>\n"
                     . "\t\t\t<a href='vvimport.php?sid=$surveyid'><img src='$imagefiles/vvimport.gif' align='left' title='"
                     . _VV_IMPORTFILE."' border='0' alt='". _VV_IMPORTFILE."'></a>\n"
-                    . "\t\t\t<a href='vvexport.php?sid=$surveyid'><img src='$imagefiles/vvexport.gif' align='left' title='"
+                    . "\t\t\t<a href='vvexport.php?sid=$surveyid'><img src='$imagefiles/vvexport.png' align='left' title='"
                     . _VV_EXPORTFILE."' alt='". _VV_EXPORTFILE."' border='0'></a>\n"
                     . "\t\t</td>\n"
                     . "\t</tr>\n";