diff --git a/app/search.apd b/app/search.apd
new file mode 100644
index 000000000..ed48909b4
--- /dev/null
+++ b/app/search.apd
@@ -0,0 +1,3 @@
+url: $baseurl/search
+name: Search
+photo: $baseurl/app/search.png
diff --git a/app/search.png b/app/search.png
new file mode 100644
index 000000000..e483280ec
Binary files /dev/null and b/app/search.png differ
diff --git a/include/apps.php b/include/apps.php
index ab09ff531..6897669d6 100644
--- a/include/apps.php
+++ b/include/apps.php
@@ -130,7 +130,8 @@ function translate_system_apps(&$arr) {
 		'Mail' => t('Mail'),
 		'Mood' => t('Mood'),
 		'Poke' => t('Poke'),
-		'Chat' => t('Chat')
+		'Chat' => t('Chat'),
+		'Search' => t('Search')
 	);
 
 	if(array_key_exists($arr['name'],$apps))
diff --git a/include/text.php b/include/text.php
index 0e136fe8e..b249c9767 100755
--- a/include/text.php
+++ b/include/text.php
@@ -810,9 +810,9 @@ function search($s,$id='search-box',$url='/search',$save = false) {
 	$o  = '<div id="' . $id . '">';
 	$o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >';
 	$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') . '" />'; 
+	$o .= '<input class="search-submit btn btn-default" type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />'; 
 	if(feature_enabled(local_user(),'savedsearch'))
-		$o .= '<input type="submit" name="save" id="search-save" value="' . t('Save') . '" />'; 
+		$o .= '<input class="search-save btn btn-default" type="submit" name="save" id="search-save" value="' . t('Save') . '" />'; 
 	$o .= '</form></div>';
 	return $o;
 }
diff --git a/view/css/widgets.css b/view/css/widgets.css
index f42ec65ee..8607cb562 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -45,8 +45,11 @@
 	margin: 10px 0 7px 0;
 }
 
-#search-save {
-	margin: 10px 0 7px 5px;
+#netsearch-box #search-save {
+	margin: 9px 0 7px 6px;
+}
+.search-save {
+	margin: 7px 0 7px 7px;
 }
 
 .saved-search-li {