diff --git a/include/text.php b/include/text.php
index 956344d63d..c57af1feb9 100644
--- a/include/text.php
+++ b/include/text.php
@@ -975,6 +975,7 @@ function search($s,$id='search-box',$url='search',$save = false, $aside = true)
 			'$search_label' => t('Search'),
 			'$save_label' => t('Save'),
 			'$savedsearch' => feature_enabled(local_user(),'savedsearch'),
+			'$search_hint' => t('@name, !forum, #tags, content'),
 		);
 
 	if (!$aside) {
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 00d49b8a61..e6b51be298 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -138,6 +138,12 @@ a#item-delete-selected {
     padding: 4px 8px;
     font-size: 12px;
 }
+.btn-small {
+    padding: 6px 10px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 3px;
+}
 .btn-primary {
     background: $nav_bg;
     color: $btn_primary_color !important;
@@ -186,6 +192,13 @@ a#item-delete-selected {
     background: $link_hover_color;
 }
 
+.form-control-sm, .input-group-sm>.form-control, .input-group-sm>.input-group-addon, .input-group-sm>.input-group-btn>.btn {
+    padding: .275rem .75rem;
+    /*font-size: .875rem;*/
+    line-height: 1.5;
+    height: 30px;
+    border-radius: .2rem;
+}
 /* Bootstrap media class fix/hack
  * This is a test. I thought it does have some
  * issues in some corner cases. Maybe we remove
@@ -939,15 +952,18 @@ aside #follow-sidebar .form-group-search .form-button-search {
     padding: 2px 8px;
 }
 
-aside #group-sidebar .group-edit-tool {
+aside #group-sidebar .group-edit-tool,
+aside #saved-search-list .savedsearchdrop {
     opacity: 0.1;
     transition: all 0.25s ease-in-out;
 }
-aside #group-sidebar .sidebar-group-li:hover .group-edit-tool {
+aside #group-sidebar .sidebar-group-li:hover .group-edit-tool,
+aside #saved-search-list .saved-search-li:hover .savedsearchdrop {
     opacity: 0.8;
     transition: all 0.25s ease-in-out;
 }
-aside #group-sidebar .sidebar-group-li .group-edit-tool:hover {
+aside #group-sidebar .sidebar-group-li .group-edit-tool:hover,
+aside #saved-search-list .saved-search-li .savedsearchdrop:hover {
     opacity: 1;
 }
 
diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index 5138a4822d..34596166eb 100644
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -114,6 +114,9 @@ $(document).ready(function(){
 		}
 	});
 
+	// initialize the bootstrap-select
+	$('.selectpicker').selectpicker();
+
 
 });
 //function commentOpenUI(obj, id) {
diff --git a/view/theme/frio/templates/saved_searches_aside.tpl b/view/theme/frio/templates/saved_searches_aside.tpl
new file mode 100644
index 0000000000..ed32c79751
--- /dev/null
+++ b/view/theme/frio/templates/saved_searches_aside.tpl
@@ -0,0 +1,16 @@
+
+{{if $saved}}
+<div class="widget" id="saved-search-list">
+	<h3 id="search">{{$title}}</h3>
+	
+	<ul role="menu" id="saved-search-ul">
+		{{foreach $saved as $search}}
+		<li role="menuitem" class="saved-search-li clear">
+			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"><i class="fa fa-trash" aria-hidden="true"></i></a>
+			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.term}}</a>
+		</li>
+		{{/foreach}}
+	</ul>
+	<div class="clearfix"></div>
+</div>
+{{/if}}
diff --git a/view/theme/frio/templates/searchbox.tpl b/view/theme/frio/templates/searchbox.tpl
new file mode 100644
index 0000000000..cc39ba6dc5
--- /dev/null
+++ b/view/theme/frio/templates/searchbox.tpl
@@ -0,0 +1,46 @@
+
+<div id="{{$id}}" {{* class="input-group" *}}>
+	<div id="search-wrapper">
+		<form action="{{$action_url}}" method="get" >
+			<div class="row">
+				<div class="col-md-2"></div>
+				<div class="col-md-8 ">
+
+					<div class="form-group form-group-search">
+						<input type="text" name="search" id="search-text" class="search-input form-control form-search" data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$search_label}}" value="{{$s}}" />
+						<button id="search-submit" class="btn btn-default btn-sm form-button-search" type="submit" name="submit" value="{{$search_label}}">{{$search_label}}</button>
+					</div>
+
+					<div class="col-md-4"></div>
+					<div class="col-md-8">
+						{{* The button to save searches *}}
+						{{if $savedsearch}}
+						<button class="btn btn-primary btn-small pull-right" type="submit" name="save" id="search-save" value="{{$save_label}}">{{$save_label}}</button>
+						{{/if}}
+
+						{{* The select popup menu to select what kind of results the user would like to search for *}}
+						{{if $searchoption}}
+						<div class="col-md-6 pull-right">
+							<div class="form-group field select">
+								<select name="search-option" id="search-options" class="form-control form-control-sm">
+									<option value="fulltext">{{$searchoption.0}}</option>
+									<option value="tags">{{$searchoption.1}}</option>
+									<option value="contacts">{{$searchoption.2}}</option>
+									{{if $searchoption.3}}<option value="forums">{{$searchoption.3}}</option>{{/if}}
+								</select>
+
+							</div>
+						</div>
+						{{/if}}
+						
+					</div>
+				</div>
+				<div class="col-md-2"></div>
+
+				<div class="clearfix"></div>
+
+			</div>
+			
+		</form>
+	</div>
+</div>