diff --git a/doc/license.txt b/doc/license.txt
index 70acd2e5..39cf1434 100644
--- a/doc/license.txt
+++ b/doc/license.txt
@@ -171,7 +171,7 @@ List of third party components:
 				License : Creative Commons BY 3.0
 				Author  : Yusuke Kamiyamane
 
-		27. gears and gps-device icons
+		27. gears and gps-device icons, watched icon
 			  Path    : htdocs/resource2/ocstyle/images/misc/
 			            htdocs/resource2/ocstyle/images/viewcache/
 			  URI     : http://www.softicons.com/free-icons/toolbar-icons/fatcow-hosting-icons-by-fatcow/gear-in-icon
@@ -184,3 +184,9 @@ List of third party components:
 				URI     : http://www.softicons.com/free-icons/web-icons/bremen-icons-by-pc.de/check-icon
 				License : Creative Commons BY 3.0
 				Author  : PC.DE
+
+		29. search icon
+				Path    : htdocs/resource2/ocstyle/images/misc/
+				URI     : http://www.softicons.com/free-icons/toolbar-icons/24x24-free-pixel-icons-by-aha-soft/search-icon
+				License : Creative Commons BY-SA 3.0
+				Author  : Aha-Soft
diff --git a/htdocs/lang/de/ocstyle/search.tpl.php b/htdocs/lang/de/ocstyle/search.tpl.php
index 61fad984..aac64a47 100644
--- a/htdocs/lang/de/ocstyle/search.tpl.php
+++ b/htdocs/lang/de/ocstyle/search.tpl.php
@@ -268,7 +268,7 @@ function switchAttributeCat2()
 //-->
 </script>
 
-		  <div class="content2-pagetitle"><img src="resource2/ocstyle/images/cacheicon/traditional.gif" style="align: left; margin-right: 10px;" width="32" height="32" alt="{t}Search for caches{/t}" />{t}Search for caches{/t}</div>
+<div class="content2-pagetitle"><img src="resource2/ocstyle/images/misc/32x32-search.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="{t}Search for caches{/t}" />{t}Search for caches{/t}</div>
 
 <form name="optionsform" style="display:inline;">
 
@@ -464,7 +464,7 @@ function switchAttributeCat2()
 	<div class="buffer" style="width: 500px;">&nbsp;</div>
 	<div class="content2-container bg-blue02">
 		<p class="content-title-noshade-size2">
-			<img src="resource2/ocstyle/images/misc/32x32-searchresults.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" /> 
+			<img src="resource2/ocstyle/images/misc/32x32-search.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" /> 
 			{t}Search by cachename{/t}
 		</p>
 	</div>
@@ -512,7 +512,7 @@ function switchAttributeCat2()
 	<div class="buffer" style="width: 500px;">&nbsp;</div>
 	<div class="content2-container bg-blue02">
 		<p class="content-title-noshade-size2">
-			<img src="resource2/ocstyle/images/misc/32x32-searchresults.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" /> 
+			<img src="resource2/ocstyle/images/misc/32x32-search.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" /> 
 			{t}Search by distance{/t}
 		</p>
 	</div>
@@ -561,7 +561,7 @@ function switchAttributeCat2()
 <div class="buffer" style="width: 500px;">&nbsp;</div>
 <div class="content2-container bg-blue02">
 	<p class="content-title-noshade-size2">
-		<img src="resource2/ocstyle/images/misc/32x32-searchresults.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" /> 
+		<img src="resource2/ocstyle/images/misc/32x32-search.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" /> 
 		{t}Search for city{/t}
 	</p>
 </div>
@@ -689,7 +689,7 @@ function switchAttributeCat2()
 	<div class="buffer" style="width: 500px;">&nbsp;</div>
 	<div class="content2-container bg-blue02">
   	<p class="content-title-noshade-size2">
-			<img src="resource2/ocstyle/images/misc/32x32-searchresults.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" /> 
+			<img src="resource2/ocstyle/images/misc/32x32-search.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" /> 
 			{t}Search for text{/t}
 		</p>
 	</div>
@@ -753,7 +753,7 @@ function switchAttributeCat2()
 	<div class="buffer" style="width: 500px;">&nbsp;</div>
 	<div class="content2-container bg-blue02">
 		<p class="content-title-noshade-size2">
-			<img src="resource2/ocstyle/images/misc/32x32-searchresults.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" /> 
+			<img src="resource2/ocstyle/images/misc/32x32-search.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" /> 
 			{t}Search for Owner{/t}
 		</p>
 	</div>
@@ -801,7 +801,7 @@ function switchAttributeCat2()
 	<div class="buffer" style="width: 500px;">&nbsp;</div>
 	<div class="content2-container bg-blue02">
 		<p class="content-title-noshade-size2">
-			<img src="resource2/ocstyle/images/misc/32x32-searchresults.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" /> 
+			<img src="resource2/ocstyle/images/misc/32x32-search.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" /> 
 			{t}Search for Logs{/t}
 		</p>
 	</div>
diff --git a/htdocs/resource2/ocstyle/images/misc/32x32-ignore.png b/htdocs/resource2/ocstyle/images/misc/32x32-ignore.png
index 7c776edf..c4e39cdd 100644
Binary files a/htdocs/resource2/ocstyle/images/misc/32x32-ignore.png and b/htdocs/resource2/ocstyle/images/misc/32x32-ignore.png differ
diff --git a/htdocs/resource2/ocstyle/images/misc/32x32-search.png b/htdocs/resource2/ocstyle/images/misc/32x32-search.png
new file mode 100644
index 00000000..4ca09776
Binary files /dev/null and b/htdocs/resource2/ocstyle/images/misc/32x32-search.png differ
diff --git a/htdocs/resource2/ocstyle/images/misc/32x32-watched.png b/htdocs/resource2/ocstyle/images/misc/32x32-watched.png
new file mode 100644
index 00000000..33f37c7e
Binary files /dev/null and b/htdocs/resource2/ocstyle/images/misc/32x32-watched.png differ
diff --git a/htdocs/resource2/ocstyle/images/misc/32x32-winner.png b/htdocs/resource2/ocstyle/images/misc/32x32-winner.png
index 871d959b..a64ba813 100644
Binary files a/htdocs/resource2/ocstyle/images/misc/32x32-winner.png and b/htdocs/resource2/ocstyle/images/misc/32x32-winner.png differ
diff --git a/htdocs/templates2/ocstyle/mywatches.tpl b/htdocs/templates2/ocstyle/mywatches.tpl
index 5bb1e0e3..319a2e7d 100644
--- a/htdocs/templates2/ocstyle/mywatches.tpl
+++ b/htdocs/templates2/ocstyle/mywatches.tpl
@@ -39,7 +39,7 @@
 		<input type="hidden" name="action" value="edit" />
 
 		<div class="content2-pagetitle">
-			<img src="resource2/{$opt.template.style}/images/misc/32x32-searchresults.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="Watched Caches" />
+			<img src="resource2/{$opt.template.style}/images/misc/32x32-watched.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="Watched Caches" />
 			{t}Watched Geocaches - Settings{/t}
 		</div>
 
@@ -111,7 +111,7 @@
 {else}
 
 	<div class="content2-pagetitle">
-		<img src="resource2/{$opt.template.style}/images/misc/32x32-searchresults.png" style="align: left; margin-right: 10px;" width="32" height="32" />
+		<img src="resource2/{$opt.template.style}/images/misc/32x32-watched.png" style="align: left; margin-right: 10px;" width="32" height="32" />
 		{t}Watched Geocaches{/t}
 	</div>
 
diff --git a/htdocs/templates2/ocstyle/query.tpl b/htdocs/templates2/ocstyle/query.tpl
index 49832ab6..7eb43d22 100644
--- a/htdocs/templates2/ocstyle/query.tpl
+++ b/htdocs/templates2/ocstyle/query.tpl
@@ -6,7 +6,7 @@
 {* OCSTYLE *} 
 {if $action=='view'}
 	<div class="content2-pagetitle">
-		<img src="resource2/{$opt.template.style}/images/misc/32x32-searchresults.png" style="align: left; margin-right: 10px;" width="32" height="32" />
+		<img src="resource2/{$opt.template.style}/images/misc/32x32-search.png" style="align: left; margin-right: 10px;" width="32" height="32" />
 		{t}Stored queries{/t}
 	</div>
 
@@ -54,7 +54,7 @@
 		<input type="hidden" name="submit" value="1" />
 
 		<div class="content2-pagetitle">
-			<img src="resource2/{$opt.template.style}/images/misc/32x32-searchresults.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="{t}Store query{/t}" />
+			<img src="resource2/{$opt.template.style}/images/misc/32x32-search.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="{t}Store query{/t}" />
 			{t}Store query{/t}
 		</div>
 
diff --git a/htdocs/templates2/ocstyle/recommendations.tpl b/htdocs/templates2/ocstyle/recommendations.tpl
index 249ec2f0..5c3cfda9 100644
--- a/htdocs/templates2/ocstyle/recommendations.tpl
+++ b/htdocs/templates2/ocstyle/recommendations.tpl
@@ -5,7 +5,7 @@
  ***************************************************************************}
 {* OCSTYLE *}
 <div class="content2-pagetitle">
-	<img src="resource2/{$opt.template.style}/images/misc/32x32-searchresults.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="{t}Cache-Recommendations{/t}" />
+	<img src="resource2/{$opt.template.style}/images/misc/32x32-winner.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="{t}Cache-Recommendations{/t}" />
 	{t}Cache-Recommendations{/t}
 </div>