diff --git a/mozilla/webtools/addons/public/htdocs/search-engines.php b/mozilla/webtools/addons/public/htdocs/search-engines.php
index 4c9683b3f76..3032a73d16c 100644
--- a/mozilla/webtools/addons/public/htdocs/search-engines.php
+++ b/mozilla/webtools/addons/public/htdocs/search-engines.php
@@ -11,7 +11,7 @@
 
 $currentTab = 'search-engines';
 
-startProcessing('search-engines.tpl','searchEngines',$compileId,'nonav');
+startProcessing('search-engines.tpl','searchEngines',$compileId,'rustico');
 require_once('includes.php');
 
 // Assign template variables.
diff --git a/mozilla/webtools/addons/public/tpl/inc/wrappers/rustico-header.tpl b/mozilla/webtools/addons/public/tpl/inc/wrappers/rustico-header.tpl
index 9fcd0a43743..06fdd8ecb5a 100644
--- a/mozilla/webtools/addons/public/tpl/inc/wrappers/rustico-header.tpl
+++ b/mozilla/webtools/addons/public/tpl/inc/wrappers/rustico-header.tpl
@@ -64,7 +64,11 @@
 {else}
 				<li><a href="{$config.webpath}/firefox/themes/">Themes</a></li>
 {/if}
+{if $currentTab eq "search-engines"}
+        <li><span>Search Engines</span></li>
+{else}
         <li><a href="{$config.webpath}/firefox/search-engines/">Search Engines</a></li>
+{/if}
 				<li><a href="{$config.webpath}/firefox/plugins/">Plugins</a></li>
 				<li><a href="http://developer.mozilla.org/en/docs/Extensions">Build Your Own</a></li>
 			</ul>
diff --git a/mozilla/webtools/addons/public/tpl/search-engines.tpl b/mozilla/webtools/addons/public/tpl/search-engines.tpl
index cce32f6f59e..012292572ca 100644
--- a/mozilla/webtools/addons/public/tpl/search-engines.tpl
+++ b/mozilla/webtools/addons/public/tpl/search-engines.tpl
@@ -1,3 +1,4 @@
+{if $app eq "firefox"}
 <div id="mBody">
 
 <h1 class="first">Search Engines</h1>
@@ -52,3 +53,59 @@
 <p>Special thanks to the Mycroft Project for their work on Firefox Search Engines.</p>
 
 </div>
+{else}
+<div id="mBody">
+
+<h1 class="first">Search Engines</h1>
+<p>We've put a few popular search sites in the Search Bar in the upper-right corner of Firefox.  If you'd like to add more, there are hundreds to choose from.  Click on a Search Engine to add it to your Firefox Search Bar:</p>
+
+<div class="front-section">
+<dl>
+<dt><img src="{$config.webpath}/search-engines-static/a9.png" alt=""/> <a href="javascript:addEngine('a9','png','General','0')">A9</a></dt><dd>Amazon's A9 search engine.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/ask.gif" alt=""/> <a href="javascript:addEngine('ask','gif','General','0')">Ask.com</a></dt><dd>Better tools get you better results.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/bbcnews.png" alt=""/> <a href="javascript:addEngine('bbcnews','png','News','0')">BBC News</a></dt><dd>Search for the latest news on BBC.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/businesscom.gif" alt=""/>
+<a href="javascript:addEngine('businesscom','gif','General','0')">Business.com</a></dt><dd>Find information to help manage and grow your business.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/del.icio.us.png" alt=""/> <a href="javascript:addEngine('del.icio.us','png','General','1091')">del.icio.us</a></dt><dd>Search through most bookmarked sites.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/espn.png" alt=""/> <a href="javascript:addEngine('espn','png','Recreation','0')">ESPN</a></dt><dd>Get the latest sports news, scores, and highlights.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/expediadotcom.png" alt=""/> <a href="javascript:addEngine('expediadotcom','png','Travel','0')">Expedia</a></dt><dd>Search for hotels by destination with Expedia's Best Price Guarantee.</dd>
+</dl>
+</div>
+
+<div class="front-section">
+<dl>
+<dt><img src="{$config.webpath}/search-engines-static/flickr-tags.png" alt=""/> <a href="javascript:addEngine('flickr-tags','png','Arts','0')">Flickr Tags</a></dt><dd>Search for photos on Flickr.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/foodnetwork.png" alt=""/> <a href="javascript:addEngine('foodtv','png','Undefined','4003')">Food Network Recipes</a></dt><dd>Find recipes from your favorite chefs.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/hollywood.gif" alt=""> <a href="javascript:addEngine('hollywood','gif','Hollywood Search','0')">Hollywood</a></dt><dd>Search for movies and movie listings</dd>
+<dt><img src="{$config.webpath}/search-engines-static/IMDB.png" alt=""/> <a href="javascript:addEngine('IMDB','png','Arts','0')">IMDB</a></dt><dd>The Internet Movie Database.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/linkedin.png" alt=""/> <a href="javascript:addEngine('linkedin','png','Web Services','0')">LinkedIn</a></dt><dd>Search your LinkedIn network for the people you need when you are on any Web site.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/lonelyplanet.png" alt=""/> <a href="javascript:addEngine('lonelyplanet','png','Travel','0')">Lonely Planet Online</a></dt><dd>Search through Lonely Planet's travel guides.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/marketwatch.gif" alt=""/> <a href="javascript:addEngine('marketwatch','gif','Business and Economy','4897')">MarketWatch</a></dt><dd>Stock quote look-up and financial information.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/webster.gif" alt=""/> <a href="javascript:addEngine('webster','gif','Language dictionary','0')">Merriam-Webster</a></dt><dd>English dictionary search.</dd>
+</dl>
+</div>
+
+<div class="front-section">
+<dl>
+<dt><img src="{$config.webpath}/search-engines-static/msn.png" alt=""/> <a href="javascript:addEngine('MSN','png','General','3796')">MSN</a></dt><dd>MSN search engine.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/technorati.gif" alt=""/> <a href="javascript:addEngine('technorati-new','gif','Weblogs','2662')">Technorati</a></dt><dd>A real-time search engine that keeps track of what is going on in the blogosphere</dd>
+<dt><img src="{$config.webpath}/search-engines-static/usatoday.gif" alt=""/> <a href="javascript:addEngine('usatoday','gif','News','0')">USATODAY.com</a></dt><dd>Find the latest news from across the USA and around the world.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/weatherchannel.png" alt=""/> <a href="javascript:addEngine('weather','png','Weather','0')">Weather Channel</a></dt><dd>Enter city, state or zip code to find your weather information.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/wikipedia.png" alt=""/> <a href="javascript:addEngine('wikipedia','png','Reference','2286')">Wikipedia</a></dt><dd>The incredible free encyclopedia.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/yahooligans.png" alt=""/> <a href="javascript:addEngine('yahooligans','png','Kids and Teens','0')">Yahooligans</a></dt><dd>Search engine for kids and teens.</dd>
+<dt><img src="{$config.webpath}/search-engines-static/yanswers.gif" alt=""/> <a href="javascript:addEngine('yanswers','gif','General','0')">Yahoo! Answers</a></dt><dd>Search real answers to real questions from real people.</dd>
+</dl>
+</div>
+
+<h2 class="clear-both">Additional Resources</h2>
+<ul>
+<li><img src="{$config.webpath}/search-engines-static/rollyo.jpg" alt=""/> <a href="http://www.rollyo.com/firefox_search.html"><strong>Rollyo: Roll Your Own Firefox Search Engine!</strong><br/>Create a personal search engine that provides relevant results from a hand selected list of sites.</a></li>
+<li><a href="http://mycroft.mozdev.org/">Browse through more search engines at mycroft.mozdev.org.</a></li>
+<li><a href="{$config.webpath}/extensions/moreinfo.php?id=1563">Remove a Search Engine with the SearchPluginHacks extension.</a></li>
+</ul>
+
+
+<p>Special thanks to the Mycroft Project for their work on Firefox Search Engines.</p>
+
+</div>
+{/if}
\ No newline at end of file