diff --git a/include/text.php b/include/text.php
index 8efa1e925..8f700458c 100755
--- a/include/text.php
+++ b/include/text.php
@@ -726,7 +726,7 @@ function search($s,$id='search-box',$url='/search',$save = false) {
 	$a = get_app();
 	$o  = '<div id="' . $id . '">';
 	$o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >';
-	$o .= '<input type="text" name="search" id="search-text" placeholder="' . t('Search') . '" value="' . $s .'" onclick="this.submit();" />';
+	$o .= '<input type="text" class="icon-search" name="search" id="search-text" placeholder="&#xf002;" value="' . $s .'" onclick="this.submit();" />';
 	$o .= '<input type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />'; 
 	if($save)
 		$o .= '<input type="submit" name="save" id="search-save" value="' . t('Save') . '" />'; 
diff --git a/mod/photos.php b/mod/photos.php
index 45c8e67c6..f751d7d4f 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -975,7 +975,7 @@ function photos_content(&$a) {
 		}
 
 		if($prevlink)
-			$prevlink = array($prevlink, '<div class="icon prev"></div>') ;
+			$prevlink = array($prevlink, '<i class="icon-backward photo-icons""></i>') ;
 
 		$photo = array(
 			'href' => $a->get_baseurl() . '/photo/' . $hires['resource_id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
@@ -984,7 +984,7 @@ function photos_content(&$a) {
 		);
 
 		if($nextlink)
-			$nextlink = array($nextlink, '<div class="icon next"></div>');
+			$nextlink = array($nextlink, '<i class="icon-forward photo-icons"></i>');
 
 
 		// Do we have an item for this photo?
diff --git a/version.inc b/version.inc
index adcdb44e8..65354e8e8 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-10-09.461
+2013-10-10.462
diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl
index d2cf0f742..60ba14d8c 100755
--- a/view/tpl/like_noshare.tpl
+++ b/view/tpl/like_noshare.tpl
@@ -1,5 +1,5 @@
 <div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
-	<a href="#" class="icon like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
-	<a href="#" class="icon dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
+	<i class="icon-thumbs-up-alt item-tool" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i>
+	<i class="icon-thumbs-down-alt item-tool" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i>
 	<div id="like-rotator-{{$id}}" class="like-rotator"></div>
 </div>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index f825dcba6..cdaae67e4 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -7,12 +7,12 @@
 {{if $tools}}
 <a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
 {{/if}}
-{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
+{{if $lock}} | <i class="lockview icon-lock" title="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" ></i> {{/if}}
 </div>
 
-{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
+{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}}
 <div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" rel="prettyPhoto"><img src="{{$photo.src}}" /></a></div>
-{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
+{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}}
 <div id="photo-photo-end"></div>
 <div id="photo-caption">{{$desc}}</div>
 {{if $tags}}