diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php
index d8a91d020..4325ac783 100644
--- a/admin/survey/classes/class.SurveyList.php
+++ b/admin/survey/classes/class.SurveyList.php
@@ -906,6 +906,29 @@ class SurveyList {
 			echo '<div class="pagination top">';
 			$this->displayPagiantion();
 			echo '</div>';
+
+            // Filtri na desni
+            if($this->onlyPhone == false){
+
+                echo '<div class="filters">';
+
+                // Preklop na pogled s folderji (samo ce imamo nov vmesnik)
+                //echo '<div id="folderSwitch">';
+                $this->displayFolderSwitch();
+                //echo '</div>';
+
+                // Gumb za filtriranje
+                //echo '<div id="filterButton">';
+                $this->displayFilterButton();
+                //echo '</div>';
+            
+                // Gumb za sortiranje
+                echo '<div id="sortButton">';
+                $this->displaySortButton();
+                echo '</div>';
+
+                echo '</div>';
+            }
 		}
         else{
             // Okno z nastavitvami searcha
@@ -914,31 +937,6 @@ class SurveyList {
             echo '</div>';
         }
 
-        // Filtri na desni
-		if($this->onlyPhone == false){
-
-            echo '<div class="filters">';
-
-            // Preklop na pogled s folderji (samo ce imamo nov vmesnik)
-			if($this->isSearch != 1){
-				//echo '<div id="folderSwitch">';
-				$this->displayFolderSwitch();
-				//echo '</div>';
-			}
-
-		    // Gumb za filtriranje
-			//echo '<div id="filterButton">';
-			$this->displayFilterButton();
-			//echo '</div>';
-		
-            // Gumb za sortiranje
-		    echo '<div id="sortButton">';
-			$this->displaySortButton();
-			echo '</div>';
-
-            echo '</div>';
-		}
-
         echo '</div>';
 
 		
@@ -1587,90 +1585,97 @@ class SurveyList {
 		global $lang;
 		global $site_url;
 
-		// Posebej imamo skrito polje s parametri da jih ohranimo pri ajax klicih
-		echo '<input type="hidden" id="searchParams" name="searchParams" value="'.$this->getSearchParams().'" />';	
-		
-		echo '<span class="title">'.$lang['s_search_settings_my'].'</span>';
+        // NAPREDNE NASTAVITVE ISKANJA
+        $show_advanced_search = false;
+        if($this->searchSettings['sstatus'] != '0' 
+            || $this->searchSettings['sidatefrom'] != '' 
+            || $this->searchSettings['sidateto'] != '' 
+            || $this->searchSettings['sedatefrom'] != '' 
+            || $this->searchSettings['sedateto'] != ''){
 
-		echo '<form method="GET" id="1kasf2" action="'.$site_url.'admin/survey/index.php">';
+            $show_advanced_search = true;
+        }
+
+        echo '<form method="GET" id="1kasf2" action="'.$site_url.'admin/survey/index.php">';
+
+
+        // Zgornja vrstica z geslom in gumbom za iskanje
+        echo '<div class="search_settings_top">';
+
+        // Posebej imamo skrito polje s parametri da jih ohranimo pri ajax klicih
+		echo '<input type="hidden" id="searchParams" name="searchParams" value="'.$this->getSearchParams().'" />';	
 
 		// Iskano geslo
-		echo '<div>';
-        echo '	<span class="bold">'.$lang['s_search2'].':</span> <input type="text" name="search" id="searchMySurveyText" value="'.htmlentities($this->searchString).'" placeholder="' . $lang['s_search'] . '" />';
+		echo '<div class="search_text">';
+        echo '	<input type="text" name="search" id="searchMySurveyText" value="'.htmlentities($this->searchString).'" placeholder="'.$lang['s_search'].'" />';
 		echo '</div>';
 		
 		// Iskanje po naslovu ali avtorju ali besedilu
-		echo '<div>';
-		echo '	<span>'.$lang['s_thru'].': </span>';
-		echo '	<input type="radio" name="stype" id="stype_0" value="0" '.($this->searchSettings['stype'] == '0' ? ' checked="checked"' : '').' /><label for="stype_0">'.$lang['s_title'].'</label>';
-		echo '	<input type="radio" name="stype" id="stype_1" value="1" '.($this->searchSettings['stype'] == '1' ? ' checked="checked"' : '').' /><label for="stype_1">'.$lang['s_author'].'</label>';
-		echo '	<input type="radio" name="stype" id="stype_2" value="2" '.($this->searchSettings['stype'] == '2' ? ' checked="checked"' : '').' /><label for="stype_2">'.$lang['s_text'].'</label>';
+		echo '<div class="search_type">';
+		echo '	<select name="stype" id="stype">';
+		echo '	    <option value="0" '.($this->searchSettings['stype'] == '0' ? ' selected="selected"' : '').'>'.$lang['s_title'].'</option>';
+		echo '	    <option value="1" '.($this->searchSettings['stype'] == '1' ? ' selected="selected"' : '').'>'.$lang['s_author'].'</option>';
+		echo '	    <option value="2" '.($this->searchSettings['stype'] == '2' ? ' selected="selected"' : '').'>'.$lang['s_text'].'</option>';
+		echo '  </select>';
+		echo '</div>';
+        
+        // Gumb isci
+		echo '<div class="search_button">';
+		echo '	<a href="#" onclick="$(\'#1kasf2\').submit(); return false;"><button class="medium blue">'.$lang['s_search'].'</button></a>';
+		echo '</div>';
+
 		echo '</div>';
 		
 		
-		// NAPREDNE NASTAVITVE ISKANJA
-		$show_advanced_search = false;
-		if($this->searchSettings['sstatus'] != '0' 
-			|| $this->searchSettings['sidatefrom'] != '' 
-			|| $this->searchSettings['sidateto'] != '' 
-			|| $this->searchSettings['sedatefrom'] != '' 
-			|| $this->searchSettings['sedateto'] != ''){
+        // Gumba za napredne nastavitve
+        echo '<div class="search_settings_advanced_buttons">';		
 		
-			$show_advanced_search = true;
-		}
+		echo '  <button type="button" id="advanced_settings_button" class="white-black small '.($show_advanced_search ? 'active': '').'" onClick="showAdvancedSearch(); return false;">';
+        echo '      <span class="faicon search"></span>'.$lang['s_advanced'];
+        echo '  </button>';
+        
+        // Gumb nazaj na moje ankete
+        echo '  <a href="'.$site_url.'admin/survey/index.php?a=pregledovanje"><button type="button" class="white-black small">';
+        echo '      <span class="faicon clipboard_notes"></span>'.$lang['s_search_mySurvey_back'];
+        echo '  </button></a>';
+
+        echo '</div>';
+
 		
-		echo '<span class="advancedSearchButton clr bold spaceLeft">';
-		echo '	<a href="#" onClick="showAdvancedSearch(); return false;">';
-		echo '<span class="faicon '.($show_advanced_search ? ' minus': 'plus').'"></span> ' . $lang['s_advanced'];
-		echo '	</a>';
-		echo '</span>';
-		
-		echo '<div id="advancedSearch" '.($show_advanced_search ? '' : ' style="display:none;"').'>';		
-		
-		// Metaadmin lahko dodatno omeji search po avtorju
-		if(Dostop::isMetaAdmin()){
-			echo '<div>';
-			echo '	<span class="bold">'.$lang['s_search_metaadmin'].':</span> <input type="text" name="onlyAuthor" id="onlyAuthor" value="'.htmlentities($this->searchSettings['onlyAuthor']).'" placeholder="' . $lang['s_search'] . '" />';
-			echo '</div>';
-		}
+        // Okno z naprednimi nastavitvami
+		echo '<div id="advancedSearch" class="search_settings_advanced" '.($show_advanced_search ? '' : ' style="display:none;"').'>';		
 		
 		// Status ankete (aktivna, neaktivna, zakljucena)
-		echo '<div>';
-		echo '	<span>'.$lang['s_activity'].': </span>';
-		echo '	<label for="sstatus_0"><input type="radio" name="sstatus" id="sstatus_0" value="0" '.($this->searchSettings['sstatus'] == '0' ? ' checked="checked"' : '').' />'.$lang['s_all_surveys'].'</label>';
-		echo '	<label for="sstatus_1"><input type="radio" name="sstatus" id="sstatus_1" value="1" '.($this->searchSettings['sstatus'] == '1' ? ' checked="checked"' : '').' />'.$lang['s_active_surveys'].'</label>';
-		echo '	<label for="sstatus_2"><input type="radio" name="sstatus" id="sstatus_2" value="2" '.($this->searchSettings['sstatus'] == '2' ? ' checked="checked"' : '').' />'.$lang['s_nonactive_surveys'].'</label>';
+		echo '<div class="setting_holder">';
+		echo '	<span class="setting_title">'.$lang['s_activity'].': </span>';
+		echo '  <div class="setting_line"><input type="radio" name="sstatus" id="sstatus_0" value="0" '.($this->searchSettings['sstatus'] == '0' ? ' checked="checked"' : '').'><label for="sstatus_0">'.$lang['s_all_surveys'].'</label></div>';
+		echo '	<div class="setting_line"><input type="radio" name="sstatus" id="sstatus_1" value="1" '.($this->searchSettings['sstatus'] == '1' ? ' checked="checked"' : '').'><label for="sstatus_1">'.$lang['s_active_surveys'].'</label></div>';
+		echo '	<div class="setting_line"><input type="radio" name="sstatus" id="sstatus_2" value="2" '.($this->searchSettings['sstatus'] == '2' ? ' checked="checked"' : '').'><label for="sstatus_2">'.$lang['s_nonactive_surveys'].'</label></div>';
 		echo '</div>';
 		
 		// Datum ustvarjanja ankete
-		echo '<div>';
-		echo '	<span class="spaceRight">'.$lang['s_itime'].': </span>';
-		echo '	<span class="spaceRight">'.$lang['s_from2'].' <input type="text" id="sidatefrom" name="sidatefrom" value="'.$this->searchSettings['sidatefrom'].'" autocomplete="off" size="12" /></span>';
-		echo '	<span>'.$lang['s_to'].' <input type="text" id="sidateto" name="sidateto" value="'.$this->searchSettings['sidateto'].'" autocomplete="off" size="12" /></span>';
+		echo '<div class="setting_holder">';
+        echo '	<span class="setting_title">'.$lang['s_itime'].': </span>';
+		echo '	<div class="setting_line"><span>'.$lang['srv_activate_duration_manual_from'].' <input type="text" id="sidatefrom" name="sidatefrom" value="'.$this->searchSettings['sidatefrom'].'" autocomplete="off" size="12" /></span></div>';
+		echo '	<div class="setting_line"><span>'.$lang['srv_activate_duration_manual_to'].' <input type="text" id="sidateto" name="sidateto" value="'.$this->searchSettings['sidateto'].'" autocomplete="off" size="12" /></span></div>';
 		echo '</div>';
 		
 		// Datum zadnjega urejanja ankete
-		echo '<div>';
-		echo '	<span class="spaceRight">'.$lang['s_etime'].': </span>';
-		echo '	<span class="spaceRight">'.$lang['s_from2'].' <input type="text" id="sedatefrom" name="sedatefrom" value="'.$this->searchSettings['sedatefrom'].'" autocomplete="off" size="12" /></span>';
-		echo '	<span>'.$lang['s_to'].' <input type="text" id="sedateto" name="sedateto" value="'.$this->searchSettings['sedateto'].'" autocomplete="off" size="12" /></span>';
+		echo '<div class="setting_holder">';
+        echo '	<span class="setting_title">'.$lang['s_etime'].': </span>';
+		echo '	<div class="setting_line"><span>'.$lang['srv_activate_duration_manual_from'].' <input type="text" id="sedatefrom" name="sedatefrom" value="'.$this->searchSettings['sedatefrom'].'" autocomplete="off" size="12" /></span></div>';
+		echo '	<div class="setting_line"><span>'.$lang['srv_activate_duration_manual_to'].' <input type="text" id="sedateto" name="sedateto" value="'.$this->searchSettings['sedateto'].'" autocomplete="off" size="12" /></span></div>';
 		echo '</div>';
-		
-		echo '</div>';
-		
-		
-		// Gumba isci in zapri
-		echo '<div class="button_holder">';
-		echo '  <a href="'.$site_url.'admin/survey/index.php"><button class="medium white-black">'.$lang['s_search_mySurvey_back'].'</button></a>';
-		echo '	<a href="#" onclick="$(\'#1kasf2\').submit(); return false;"><button class="medium white-black">'.$lang['s_search'].'</button></a>';
-		echo '</div>';
-		
-		// Link na isci po knjiznici
-		echo '<div class="link"><a href="'.$site_url.'admin/survey/index.php?a=knjiznica&search='.$this->searchString.'">'.$lang['s_search_Library'].'</a></div>';
-		
-		echo '<input style="display: none;" value="Išči" type="submit">';
-		
-        echo '</form>';
+
+        // Metaadmin lahko dodatno omeji search po avtorju
+		if(Dostop::isMetaAdmin()){
+			echo '<div class="setting_holder">';
+            echo '	<span class="setting_title">'.$lang['s_search_metaadmin'].': </span>';
+			echo '	<div class="setting_line"><input type="text" name="onlyAuthor" id="onlyAuthor" value="'.htmlentities($this->searchSettings['onlyAuthor']).'" placeholder="'.$lang['s_search'].'"></div>';
+			echo '</div>';
+		}
+
+        echo '</div>';
 		
 				
 		// JS za koledar
@@ -1688,7 +1693,11 @@ class SurveyList {
 						buttonText: ""
 					});
 				});
-			</script>';			
+			</script>';		
+            
+        echo '<input style="display: none;" value="Išči" type="submit">';
+
+        echo '</form>';
 	}
 	
 	// Prikazemo search okno za iskanje po anketah
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 2b3dc503f..47f3041a3 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -3877,11 +3877,11 @@ function showAdvancedSearch(){
 	
 	if ($('#advancedSearch').is(":visible")) {
 		$('#advancedSearch').slideUp('slow');
-		$('#searchSettings').find('.minus').removeClass('minus').addClass('plus');
+		$('#advanced_settings_button').removeClass('active');
 	} 
 	else {
 		$('#advancedSearch').slideDown('slow');
-		$('#searchSettings').find('.plus').removeClass('plus').addClass('minus');
+		$('#advanced_settings_button').addClass('active');
 	}
 }
 
diff --git a/lang/1.php b/lang/1.php
index f27eb331a..6a451d7e5 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -783,11 +783,11 @@ $lang = array (
 	"s_any"					=>	"Katerakoli beseda",
 	"s_thru"				=>	"I&#353;&#269;i po",
 	"s_lookinto"			=>	"Preglej",
-	"s_title"				=>	"Naslovu",
+	"s_title"				=>	"Naslov",
 	"s_content"				=>	"Vsebini",
-	"s_author"				=>	"Avtorju",
+	"s_author"				=>	"Avtor",
 	"s_word"				=>	"Ključnih besedah",
-	"s_text"				=>	"Besedilu",
+	"s_text"				=>	"Besedilo",
 	"s_webcontent"			=>	"Vsebino strani",
 	"s_articles"			=>	"&#269;lanke, novice, obvestila",
 	"s_database"			=>	"Baze",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 13af2aa52..2096caaf5 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5465,6 +5465,11 @@ span.faicon.search::before {
   content: "";
 }
 
+span.faicon.clipboard_notes::before {
+  font-size: 20px;
+  content: "";
+}
+
 span.faicon.help2::before {
   font-size: 20px;
   content: "";
@@ -10941,43 +10946,143 @@ div#gdrp_requests_unresolved {
 }
 #survey_list .second_line #searchSettings,
 #survey_list .second_line #searchLibrarySettings {
-  width: 500px;
-  padding: 16px;
+  display: flex;
+  flex-direction: column;
+  max-width: 750px;
+  width: 100%;
+  background-color: #FFFFFF;
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+}
+#survey_list .second_line #searchSettings .search_settings_top,
+#survey_list .second_line #searchLibrarySettings .search_settings_top {
+  display: flex;
+  padding: 20px 32px;
+  background-color: #F8F8F8;
+}
+#survey_list .second_line #searchSettings .search_settings_top > div,
+#survey_list .second_line #searchLibrarySettings .search_settings_top > div {
+  padding-right: 8px;
+  margin-right: 8px;
+  border-right: 1px #E5E5E5 solid;
+}
+#survey_list .second_line #searchSettings .search_settings_top > div.search_text,
+#survey_list .second_line #searchLibrarySettings .search_settings_top > div.search_text {
+  width: 100%;
+}
+#survey_list .second_line #searchSettings .search_settings_top > div.search_text input[type=text],
+#survey_list .second_line #searchLibrarySettings .search_settings_top > div.search_text input[type=text] {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 12px 16px;
+  margin: 0;
   font-size: 16px;
   background: #FFFFFF;
   border: 1px solid #C4C4C4;
   border-radius: 2px;
 }
-#survey_list .second_line #searchSettings span.title,
-#survey_list .second_line #searchLibrarySettings span.title {
+#survey_list .second_line #searchSettings .search_settings_top > div.search_type select,
+#survey_list .second_line #searchLibrarySettings .search_settings_top > div.search_type select {
+  cursor: pointer;
+  width: 160px;
+  box-sizing: border-box;
+  padding: 12px 16px;
+  margin: 0;
+  font-size: 16px;
+  background: #FFFFFF;
+  border: 1px solid #C4C4C4;
+  border-radius: 2px;
+}
+#survey_list .second_line #searchSettings .search_settings_top > div.search_button,
+#survey_list .second_line #searchLibrarySettings .search_settings_top > div.search_button {
+  padding-right: 0px;
+  margin-right: 0px;
+  border: none;
+}
+#survey_list .second_line #searchSettings .search_settings_advanced_buttons,
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced_buttons {
+  display: flex;
+  justify-content: space-between;
+  padding: 8px 32px;
+}
+#survey_list .second_line #searchSettings .search_settings_advanced_buttons button,
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced_buttons button {
+  padding: 5px 16px;
+  font-size: 14px;
+  font-weight: 400;
+  border: 1px #E5E5E5 solid;
+  border-radius: 2px;
+}
+#survey_list .second_line #searchSettings .search_settings_advanced_buttons button.active,
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced_buttons button.active {
+  border: 1px #1E88E5 solid;
+}
+#survey_list .second_line #searchSettings .search_settings_advanced_buttons button .faicon::before,
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced_buttons button .faicon::before {
+  margin-right: 8px;
   color: #1E88E5;
+  font-size: 14px;
+}
+#survey_list .second_line #searchSettings .search_settings_advanced,
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced {
+  display: flex;
+  flex-wrap: wrap;
+  max-height: 250px;
+  box-sizing: border-box;
+  padding: 8px 32px 32px 32px;
+}
+#survey_list .second_line #searchSettings .search_settings_advanced .setting_holder,
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced .setting_holder {
+  display: flex;
+  flex-direction: column;
+  width: 218px;
+  box-sizing: border-box;
+  padding-right: 16px;
+  margin-right: 16px;
+  border-right: 1px #E5E5E5 solid;
+}
+#survey_list .second_line #searchSettings .search_settings_advanced .setting_holder:nth-child(3),
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced .setting_holder:nth-child(3) {
+  padding-right: 0px;
+  margin-right: 0px;
+  border: none;
+}
+#survey_list .second_line #searchSettings .search_settings_advanced .setting_holder:nth-child(4),
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced .setting_holder:nth-child(4) {
+  padding-right: 0px;
+  margin-right: 0px;
+  margin-top: 16px;
+  border: none;
+}
+#survey_list .second_line #searchSettings .search_settings_advanced .setting_holder:nth-child(4) .setting_line input[type=text],
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced .setting_holder:nth-child(4) .setting_line input[type=text] {
+  max-width: 220px;
+  margin: 0;
+}
+#survey_list .second_line #searchSettings .search_settings_advanced .setting_holder label,
+#survey_list .second_line #searchSettings .search_settings_advanced .setting_holder span,
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced .setting_holder label,
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced .setting_holder span {
+  font-size: 14px;
+}
+#survey_list .second_line #searchSettings .search_settings_advanced .setting_holder .setting_title,
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced .setting_holder .setting_title {
   font-weight: 600;
-  font-size: 13px;
 }
-#survey_list .second_line #searchSettings p,
-#survey_list .second_line #searchLibrarySettings p {
-  margin: 10px 0 12px 10px !important;
-  padding: 0 !important;
+#survey_list .second_line #searchSettings .search_settings_advanced .setting_holder .setting_line,
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced .setting_holder .setting_line {
+  padding-top: 8px;
 }
-#survey_list .second_line #searchSettings input[type=text],
-#survey_list .second_line #searchLibrarySettings input[type=text] {
-  padding: 2px 4px;
-}
-#survey_list .second_line #searchSettings input[type=submit],
-#survey_list .second_line #searchLibrarySettings input[type=submit] {
-  padding: 2px 4px;
-}
-#survey_list .second_line #searchSettings input[type=text]#searchMySurveyText,
-#survey_list .second_line #searchLibrarySettings input[type=text]#searchMySurveyText {
-  width: 200px;
-  font-size: 12px;
-  padding: 2px 5px;
-}
-#survey_list .second_line #searchSettings span.link,
-#survey_list .second_line #searchLibrarySettings span.link {
-  float: left;
-  margin-top: 20px;
-  font-weight: 500;
+#survey_list .second_line #searchSettings .search_settings_advanced .setting_holder .setting_line input[type=text],
+#survey_list .second_line #searchLibrarySettings .search_settings_advanced .setting_holder .setting_line input[type=text] {
+  box-sizing: border-box;
+  padding: 12px 8px;
+  margin: 0 8px;
+  max-width: 120px;
+  font-size: 14px;
+  background: #FFFFFF;
+  border: 1px solid #C4C4C4;
+  border-radius: 2px;
 }
 #survey_list .second_line .filters {
   display: flex;
@@ -11147,8 +11252,8 @@ div#gdrp_requests_unresolved {
   visibility: visible;
   opacity: 1;
 }
-#survey_list .second_line.advanced_search .filters {
-  align-self: baseline;
+#survey_list .second_line.advanced_search {
+  justify-content: center;
 }
 #survey_list .pagination_bottom_holder {
   display: flex;
diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss
index abec74d1f..f78205bf9 100644
--- a/resources/sass/admin_new/basic/icons/standard.scss
+++ b/resources/sass/admin_new/basic/icons/standard.scss
@@ -168,6 +168,10 @@ span.faicon.search::before{
         font-size: 20px;
         content: "\f002";
 }
+span.faicon.clipboard_notes::before{
+        font-size: 20px;
+        content: "\f46d";
+}
 span.faicon.help2::before{
         font-size: 20px;
         content: "\f059";
diff --git a/resources/sass/admin_new/pages/my_surveys/top_filters.scss b/resources/sass/admin_new/pages/my_surveys/top_filters.scss
index c8fd93cc2..cba7984e1 100644
--- a/resources/sass/admin_new/pages/my_surveys/top_filters.scss
+++ b/resources/sass/admin_new/pages/my_surveys/top_filters.scss
@@ -37,40 +37,166 @@
         // Search settings box
         #searchSettings,
         #searchLibrarySettings {
-            width: 500px;
-            padding: 16px;
+            display: flex;
+            flex-direction: column;
 
-            font-size: 16px;
+            max-width: 750px;
+            width: 100%;
 
-            background: $white;
-            border: 1px solid $dark-gray;
+            background-color: $white;
+            border: 1px solid $gray;
             border-radius: 2px;
 
-            span.title {
-                color: $blue;
-                font-weight: 600;
-                font-size: 13px;
+            .search_settings_top{
+                display: flex;
+
+                padding: 20px 32px;
+
+                background-color: $light-gray;
+
+                >div{
+                    padding-right: 8px;
+                    margin-right: 8px;
+
+                    border-right: 1px $gray solid;
+
+                    &.search_text{
+                        width: 100%;
+
+                        input[type="text"]{
+                            width: 100%;
+                            box-sizing: border-box;
+                            padding: 12px 16px;
+                            margin: 0;
+    
+                            font-size: 16px;
+    
+                            background: $white;
+                            border: 1px solid $dark-gray;
+                            border-radius: 2px;
+                        }
+                    }
+
+                    &.search_type{
+
+                        select{
+                            cursor: pointer;
+
+                            width: 160px;
+                            box-sizing: border-box;
+                            padding: 12px 16px;
+                            margin: 0;
+    
+                            font-size: 16px;
+    
+                            background: $white;
+                            border: 1px solid $dark-gray;
+                            border-radius: 2px;
+                        }
+                    }
+
+                    &.search_button{
+                        padding-right: 0px;
+                        margin-right: 0px;
+
+                        border: none;
+                    }
+                }
             }
-            p {
-                margin: 10px 0 12px 10px !important;
-                padding: 0 !important;
+
+            .search_settings_advanced_buttons{
+                display: flex;
+                justify-content: space-between;
+
+                padding: 8px 32px;
+
+                button{
+                    padding: 5px 16px;
+
+                    font-size: 14px;
+                    font-weight: 400;
+
+                    border: 1px $gray solid;
+                    border-radius: 2px;
+
+                    &.active{
+                        border: 1px $blue solid;
+                    }
+
+                    .faicon::before{
+                        margin-right: 8px;
+
+                        color: $blue;
+                        font-size: 14px;
+                    }
+                }
             }
-            input[type="text"] {
-                padding: 2px 4px;
-            }
-            input[type="submit"] {
-                padding: 2px 4px;
-            }
-            input[type="text"]#searchMySurveyText {
-                width: 200px;
-                font-size: 12px;
-                padding: 2px 5px;
-            }	
-            span.link{
-                float: left; 
-                margin-top: 20px;
-                
-                font-weight: 500;
+
+            .search_settings_advanced{
+                display: flex;
+                flex-wrap: wrap;
+
+                max-height: 250px;
+                box-sizing: border-box;
+                padding: 8px 32px 32px 32px;
+
+                .setting_holder{
+                    display: flex;
+                    flex-direction: column;
+
+                    width: 218px;
+                    box-sizing: border-box;
+                    padding-right: 16px;
+                    margin-right: 16px;
+
+                    border-right: 1px $gray solid;
+
+                    &:nth-child(3){
+                        padding-right: 0px;
+                        margin-right: 0px;
+
+                        border: none;
+                    }
+
+                    &:nth-child(4){
+                        padding-right: 0px;
+                        margin-right: 0px;
+                        margin-top: 16px;
+
+                        border: none;
+
+                        .setting_line input[type="text"]{
+                            max-width: 220px;
+                            margin: 0;
+                        }
+                    }
+
+                    label,
+                    span{
+                        font-size: 14px;
+                    }
+
+                    .setting_title{
+                        font-weight: 600;
+                    }
+
+                    .setting_line{
+                        padding-top: 8px;
+
+                        input[type="text"]{
+                            box-sizing: border-box;
+                            padding: 12px 8px;
+                            margin: 0 8px;
+                            max-width: 120px;
+    
+                            font-size: 14px;
+
+                            background: $white;
+                            border: 1px solid $dark-gray;
+                            border-radius: 2px;
+                        }
+                    }
+                }
             }
         }
 			
@@ -230,8 +356,8 @@
             }
         }
         
-        &.advanced_search .filters{
-            align-self: baseline;
+        &.advanced_search{
+            justify-content: center;
         }
     }