diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 6197438179..f626af8864 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -958,6 +958,10 @@ nav.navbar a, nav.navbar .btn-link {
     color: #fff!important;
     background-color: $menu_background_hover_color !important;
 }
+#photo-edit-link-wrap {
+    color: #555;
+    margin-bottom: 15px;
+}
 .nav-pills.preferences .dropdown .dropdown-toggle,
 .nav-pills.preferences > li > .btn {
     color: #bebebe;
diff --git a/view/theme/frio/templates/like_noshare.tpl b/view/theme/frio/templates/like_noshare.tpl
index d22804dcda..deb2383f4b 100644
--- a/view/theme/frio/templates/like_noshare.tpl
+++ b/view/theme/frio/templates/like_noshare.tpl
@@ -1,8 +1,13 @@
 
 <div class="wall-item-actions" id="wall-item-like-buttons-{{$id}}">
-	<button type="button" class="btn-link button-likes" id="like-{{$id}}" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false;" data-toggle="button"><i class="fa fa-thumbs-up" aria-hidden="true"></i>&nbsp;</button>
+	<button type="button" class="btn-link button-likes" id="like-{{$id}}" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false;" data-toggle="button">
+		<i class="faded-icon page-action fa fa-thumbs-up" aria-hidden="true"></i>
+	</button>
 	{{if $nolike}}
-	<button type="button" class="btn-link button-likes" id="dislike-{{$id}}" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false;" data-toggle="button"><i class="fa fa-thumbs-down" aria-hidden="true"></i>&nbsp;</button>
+	<span class="icon-padding"> </span>
+	<button type="button" class="btn-link button-likes" id="dislike-{{$id}}" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false;" data-toggle="button">
+		<i class="faded-icon page-action fa fa-thumbs-down" aria-hidden="true"></i>
+	</button>
 	{{/if}}
 	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 </div>
diff --git a/view/theme/frio/templates/photo_view.tpl b/view/theme/frio/templates/photo_view.tpl
index ce058f507e..e610926d4c 100644
--- a/view/theme/frio/templates/photo_view.tpl
+++ b/view/theme/frio/templates/photo_view.tpl
@@ -4,16 +4,30 @@
 <div id="live-photos"></div>
 
 <div id="photo-view-{{$id}}" class="generic-page-wrapper">
-	<h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
-
-	<div id="photo-edit-link-wrap">
-		{{if $tools}}
-		<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
-		|
-		<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}}
+	<div class="pull-left" id="photo-edit-link-wrap">
+		<a class="page-action faded-icon" id="photo-album-link" href="{{$album.0}}" title="{{$album.1}}" data-toggle="tooltip">
+			<i class="fa fa-folder-open"></i>&nbsp;{{$album.1}}
+		</a>
 	</div>
+	<div class="pull-right" id="photo-edit-link-wrap">
+		{{if $tools}}
+		<span class="icon-padding"> </span>
+		<a id="photo-edit-link" href="{{$tools.edit.0}}" title="{{$tools.edit.1}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-pencil"></i>
+		</a>
+		<span class="icon-padding"> </span>
+		<a id="photo-toprofile-link" href="{{$tools.profile.0}}" title="{{$tools.profile.1}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-user"></i>
+		</a>
+		{{/if}}
+		{{if $lock}}
+		<span class="icon-padding"> </span>
+		<a id="photo-lock-link" onclick="lockview(event,'photo/{{$id}}');" title="{{$lock}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-lock"></i>
+		</a>
+		{{/if}}
+	</div>
+	<div class="clear"></div>
 
 	<div id="photo-view-wrapper">
 		<div id="photo-photo">