2 files changed, 11 insertions, 50 deletions
diff --git a/views/default/graphics/ajax_loader.php b/views/default/graphics/ajax_loader.php
index 2d2da30b7..d5ce87ea9 100644
--- a/views/default/graphics/ajax_loader.php
+++ b/views/default/graphics/ajax_loader.php
@@ -6,21 +6,26 @@
  * @subpackage Core
  *
  * @uses $vars['id']     CSS id
+ * @uses $vars['class']  Optional additional CSS class
  * @uses $vars['hidden'] Begin hidden? (true)
  */
 
-if (isset($vars['internalid'])) {
-	$id = "id=\"{$vars['internalid']}\"";
+if (isset($vars['id'])) {
+	$id = "id=\"{$vars['id']}\"";
 }
 
-$hidden = 'hidden';
-if (isset($vars['hidden']) && $vars['hidden'] == false) {
-	$hidden = '';
+$class = 'elgg-ajax-loader';
+if (isset($vars['class'])) {
+	$class = "$class {$vars['class']}";
+}
+
+if (elgg_extract('hidden', $vars, true)) {
+	$class = "$class hidden";
 }
 
 $loader = <<< END
 
-<div class="elgg-ajax-loader $hidden" $id></div>
+<div class="$class" $id></div>
 
 END;
 
diff --git a/views/default/graphics/icon.php b/views/default/graphics/icon.php
deleted file mode 100644
index 06e866d33..000000000
--- a/views/default/graphics/icon.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Generic icon view.
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['entity'] The entity the icon represents - uses getIcon() method
- * @uses $vars['js'] Any JavaScript to add to img tag
- * @uses $vars['size'] topbar, tiny, small, medium (default), large, master
- * @uses $vars['link'] Optional link for the image
- * @uses $vars['align'] Align attribute of the img tag
- */
-
-$entity = $vars['entity'];
-
-$sizes = array('small','medium','large','tiny','master','topbar');
-// Get size
-if (!in_array($vars['size'], $sizes)) {
-	$vars['size'] = "medium";
-}
-
-// Get any align and js
-if (!empty($vars['align'])) {
-	$align = " align=\"{$vars['align']}\" ";
-} else {
-	$align = "";
-}
-
-
-?>
-<div class="icon">
-<?php
-if ($vars['link']) {
-	?><a href="<?php echo $vars['link'] ?>"><?php
-}
-?>
-<img src="<?php echo $entity->getIcon($vars['size']); ?>" <?php echo $align; ?> <?php echo $vars['js']; ?> />
-<?php
-if ($vars['link']) {
-	?></a><?php
-}
-?>
-</div>
-\ No newline at end of file