diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index 54c849f..aff27c5 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -31,10 +31,6 @@
     <string id="button_find">Find</string>
     <string id="button_lucky">Instant Access</string>
     <string id="button_advanced">Advanced Search</string>
-
-    <string id="query_latestadditions">new videos</string>
-    <string id="query_mostdownloads">most downloaded</string>
-    <string id="query_mostviews">popular videos</string>
     
     <string id="search_frontpage_one">new videos</string>
     <string id="search_frontpage_two">most downloaded</string>
diff --git a/trunk/style/colors/tango.css b/trunk/style/colors/tango.css
index c960b1d..dc05a73 100644
--- a/trunk/style/colors/tango.css
+++ b/trunk/style/colors/tango.css
@@ -115,22 +115,23 @@ div.loginbox
             /* "Aluminium 5" */
             border-color:   #555753;
         }
-
-    li#latestadditions
+    
+    /* TODO: make images configureable (maybe via symlinks?) */
+    li#search_custom_one
     {
         list-style-image:       url(../../images/tango/16x16/actions/document-new.png)
     }
 
-    li#mostviews
-    {
-        list-style-image:       url(../../images/tango/16x16/emblems/emblem-favorite.png)
-    }
-
-    li#mostdownloads
+    li#search_custom_two
     {
         list-style-image:       url(../../images/tango/16x16/actions/document-save.png)
     }
 
+    li#search_custom_three
+    {
+        list-style-image:       url(../../images/tango/16x16/emblems/emblem-favorite.png)
+    }
+
     span.duration
     {
     }
diff --git a/trunk/style/decoration/bridget.css b/trunk/style/decoration/bridget.css
index 4c7cf1e..e1c602b 100644
--- a/trunk/style/decoration/bridget.css
+++ b/trunk/style/decoration/bridget.css
@@ -243,15 +243,15 @@ li
 {
 }
 
-    li#latestadditions
+    li#search_custom_one
     {
     }
 
-    li#mostviews
+    li#search_custom_two
     {
     }
 
-    li#mostdownloads
+    li#search_custom_three
     {
     }
 
diff --git a/trunk/style/structure/fake6.css b/trunk/style/structure/fake6.css
index ee35c10..d146932 100644
--- a/trunk/style/structure/fake6.css
+++ b/trunk/style/structure/fake6.css
@@ -226,15 +226,15 @@ li
 {
 }
 
-    li#latestadditions
+    li#search_custom_one
     {
     }
 
-    li#mostviews
+    li#search_custom_two
     {
     }
 
-    li#mostdownloads
+    li#search_custom_three
     {
     }
 
diff --git a/trunk/xsl/xhtml/searchbar.xsl b/trunk/xsl/xhtml/searchbar.xsl
index d00d467..bda063c 100644
--- a/trunk/xsl/xhtml/searchbar.xsl
+++ b/trunk/xsl/xhtml/searchbar.xsl
@@ -36,7 +36,7 @@
 
         <ul id="queries" role="navigation">
 
-            <li id="latestadditions">
+            <li id="search_custom_one">
                 <a>
                     <xsl:attribute name="href">
                         <xsl:value-of select="$site_strings[@id='path_query_custom_one']" />
@@ -45,7 +45,7 @@
                 </a>
             </li>
 
-            <li id="mostviews">
+            <li id="search_custom_two">
                 <a>
                     <xsl:attribute name="href">
                         <xsl:value-of select="$site_strings[@id='path_query_custom_two']" />
@@ -54,7 +54,7 @@
                 </a>
             </li>
 
-            <li id="mostdownloads">
+            <li id="search_custom_three">
                 <a>
                     <xsl:attribute name="href">
                         <xsl:value-of select="$site_strings[@id='path_query_custom_three']" />