diff --git a/themes/blueprint/templates/search/controls/view.phtml b/themes/blueprint/templates/search/controls/view.phtml
index f245bb2b3c51a66814dafbf9362c0b679e791c5b..f7565b6571831d50e789c7b4b35f15bdb7f6aaee 100644
--- a/themes/blueprint/templates/search/controls/view.phtml
+++ b/themes/blueprint/templates/search/controls/view.phtml
@@ -4,7 +4,11 @@
     <? if (!$viewData['selected']): ?>
       <a href="<?=$this->results->getUrlQuery()->setViewParam($viewType)?>" title="<?=$this->transEsc('Switch view to')?> <?=$this->transEsc($viewData['desc'])?>" >
     <? endif; ?>
-    <img <? if ($viewData['selected']): ?>class="selected" <? endif; ?>src="<?=$this->imageLink('view_' . $viewType . '.png')?>"<?=$viewData['selected'] ? ' title="' . $this->transEsc($viewData['desc']) . ' ' . $this->transEsc('view already selected') . '"' : ''?> alt="<?=$this->transEsc($viewData['desc'])?>" />
+    <? $src = $this->imageLink('view_'.$viewType.'.png'); if (!empty($src)): ?>
+      <img <? if ($viewData['selected']): ?>class="selected" <? endif; ?>src="<?=$src?>"<?=$viewData['selected'] ? ' title="' . $this->transEsc($viewData['desc']) . ' ' . $this->transEsc('view already selected') . '"' : ''?> alt="<?=$this->transEsc($viewData['desc'])?>" />
+    <? else: ?>
+      <?=$this->transEsc($viewData['desc'])?>
+    <? endif; ?>
     <? if (!$viewData['selected']): ?>
       </a>
     <? endif; ?>
diff --git a/themes/bootprint/templates/search/controls/view.phtml b/themes/bootprint/templates/search/controls/view.phtml
index ab1e6380cfdc3b82faa44bd25456aa7e0eccd717..ba7d2c101d3875f5219a0bdc20cd7c18c3ddd349 100644
--- a/themes/bootprint/templates/search/controls/view.phtml
+++ b/themes/bootprint/templates/search/controls/view.phtml
@@ -4,8 +4,10 @@
     <? if (!$viewData['selected']): ?>
       <a href="<?=$this->results->getUrlQuery()->setViewParam($viewType)?>" title="<?=$this->transEsc('Switch view to')?> <?=$this->transEsc($viewData['desc'])?>" >
     <? endif; ?>
-    <img src="<?=$this->imageLink('view_'.$viewType.'.png') ?>"<? if($viewData['selected']): ?> title="<?=$this->transEsc($viewData['desc']) ?> <?=$this->transEsc('view already selected') ?>" <? endif ?> alt="<?=$this->transEsc($viewData['desc'])?>"/>
-    <?=ucfirst($this->transEsc($viewType)) ?> <?=$this->transEsc('view') ?><? if (!$viewData['selected']): ?></a><? endif; ?>&nbsp;
+    <? $src = $this->imageLink('view_'.$viewType.'.png'); if (!empty($src)): ?>
+      <img src="<?=$src?>"<? if($viewData['selected']): ?> title="<?=$this->transEsc($viewData['desc']) ?> <?=$this->transEsc('view already selected') ?>" <? endif ?> alt="<?=$this->transEsc($viewData['desc'])?>"/>
+    <? endif; ?>
+    <?=$this->transEsc($viewData['desc']) ?><? if (!$viewData['selected']): ?></a><? endif; ?>&nbsp;
   <? endforeach; ?>
 <? endif; ?>
 </div>
diff --git a/themes/bootstrap/templates/search/controls/view.phtml b/themes/bootstrap/templates/search/controls/view.phtml
index 374a593d1f0189cd2deddfeddc626b79f3784819..818229fa4e9448e27e644f8e42fc2b05dfc61e32 100644
--- a/themes/bootstrap/templates/search/controls/view.phtml
+++ b/themes/bootstrap/templates/search/controls/view.phtml
@@ -5,7 +5,7 @@
       <a href="<?=$this->results->getUrlQuery()->setViewParam($viewType)?>" title="<?=$this->transEsc('Switch view to')?> <?=$this->transEsc($viewData['desc'])?>" >
     <? endif; ?>
     <i class="icon-<?=$viewType ?>"<? if($viewData['selected']): ?> title="<?=$this->transEsc($viewData['desc']) ?> <?=$this->transEsc('view already selected') ?>" <? endif ?> alt="<?=$this->transEsc($viewData['desc'])?>"></i>
-    <?=ucfirst($this->transEsc($viewType)) ?> <?=$this->transEsc('view') ?><? if (!$viewData['selected']): ?></a><? endif; ?>&nbsp;
+    <?=$this->transEsc($viewData['desc']) ?><? if (!$viewData['selected']): ?></a><? endif; ?>&nbsp;
   <? endforeach; ?>
 <? endif; ?>
 </div>