diff --git a/admin/survey/classes/class.SurveyDataSettingProfiles.php b/admin/survey/classes/class.SurveyDataSettingProfiles.php
index fb2ca395e..f9f1f1575 100644
--- a/admin/survey/classes/class.SurveyDataSettingProfiles.php
+++ b/admin/survey/classes/class.SurveyDataSettingProfiles.php
@@ -617,7 +617,7 @@ class SurveyDataSettingProfiles {
         }
         
 
-        echo '<div clasS="popup_main">';
+        echo '<div class="popup_main with_menu">';
         
         echo '<div id="dsp_profiles_left" class="popup_left">';
         echo '<div id="dsp_profiles_holder">';
@@ -647,16 +647,20 @@ class SurveyDataSettingProfiles {
 		}
 		echo '</div>'; # dataSetting_profile
 
+        // Gumb za dodajanje novega profila
+        echo '<button class="small white-black" title="'.$lang['srv_create_new_profile'].'" onclick="dataSettingProfileAction(\'show_create\'); return false;">';
+        echo '  <span class="faicon plus_32"></span>'.$lang['srv_create_new_profile'];
+        echo '</button>';
+
 		echo '</div>'; # dsp_profiles_holder
 		echo '</div>'; # dsp_profiles_left
         
         
 		echo '<div id="dsp_profiles_right" class="popup_right">'."\n";
 		if ($current_pid == 0) {
-			echo '<div id="dsp_note">';
+			echo '<div id="dsp_note" class="popup_right_note">';
 			echo $lang['srv_change_default_profile'];
 			echo '</div>'; // dataSetting_profile_note
-			echo '<br class="clr" />'."\n";
 		}	
 		
 		echo '<div id="dsp_content">';
@@ -671,7 +675,6 @@ class SurveyDataSettingProfiles {
 		echo '<div id="dsp_button_holder" class="button_holder">'."\n";
 		if ((int)$current_pid <= 0 ) {
             
-            echo '<button class="medium white-blue" title="'.$lang['srv_create_new_profile'].'" onclick="dataSettingProfileAction(\'show_create\'); return false;">'.$lang['srv_create_new_profile'] . '</button>';
             echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="dataSettingProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
 			
             if ((int)$current_pid == 0) {
@@ -683,7 +686,6 @@ class SurveyDataSettingProfiles {
 			}
 		} 
         else  {
-            echo '<button class="medium white-blue" title="'.$lang['srv_create_new_profile'].'" onclick="dataSettingProfileAction(\'show_create\'); return false;">'.$lang['srv_create_new_profile'] . '</button>';
 			echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="dataSettingProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';		
             echo '<button class="medium blue" title="'.$lang['srv_save_run_profile'] . '" onclick="dataSettingProfileAction(\'run_profile\'); return false;">'.$lang['srv_run_profile'] . '</button>';
 		}
@@ -731,64 +733,64 @@ class SurveyDataSettingProfiles {
 		echo '<fieldset>';
 		echo '<legend>'.$lang['srv_results_filter_settings'].'</legend>';
 		
-		echo '<label><input id="showCategories" name="showCategories" type="checkbox" ' .
-		 (($cp['showCategories']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_analiza_kategorialneSpremenljivke'];
-        echo '</label>';
-        
-		echo '<label><input id="showOther" name="showOther" type="checkbox" ' .
-			  (($cp['showOther']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-			  #(($cp['showCategories']) ? '' : ' disabled="disabled" ')
-		echo  $lang['srv_analiza_ShowOthersText'] ;
-        echo '</label>';
-        
-		echo '<label><input id="showNumbers" name="showNumbers" type="checkbox" ' .
-		 (($cp['showNumbers']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_analiza_numericneSpremenljivke'];
-        echo '</label>';
-        
-		echo '<label><input id="showText" name="showText" type="checkbox" ' .
-		 (($cp['showText']) ? ' checked="checked" ' : ' ') . ' autocomplete="off"/>';
-        echo '</label>';
-        
-        echo $lang['srv_analiza_textovneSpremenljivke'];
-        
-		echo '<br />'.$lang['srv_analiza_link'].': ';
-		echo '<select id="analysisGoTo">';
-		echo '<option value="0"'.((int)$cp['analysisGoTo'] == 0 ? ' selected="selected"' : '').'>'.$lang['srv_analiza_charts'].'</option>';
-		echo '<option value="1"'.((int)$cp['analysisGoTo'] == 1 ? ' selected="selected"' : '').'>'.$lang['srv_sumarnik'].'</option>';
-        echo '</select>';
-        
-        echo '<br/>';
-        
-		echo '<label>';	
-		echo '<input id="analiza_legenda" name="analiza_legenda" type="checkbox" ' .(($cp['analiza_legenda'] == '1') ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_analiza_showLegend'];
-		echo '</label>';
 
-        echo '<br/>';
+        echo '<div class="setting_line">';
+
+        echo '  <input id="showCategories" name="showCategories" type="checkbox" '.(($cp['showCategories']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+		echo '  <label for="showCategories">'.$lang['srv_analiza_kategorialneSpremenljivke'].'</label>';
         
-		echo '<label>';
-		echo '<input id="hideEmpty" name="hideEmpty" type="checkbox" ' .
-			  (($cp['hideEmpty']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo  $lang['srv_analiza_hideEmpty'] ;
-        echo '</label>';
+        echo '  <input id="showOther" name="showOther" type="checkbox" '.(($cp['showOther']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+		echo '  <label for="showOther">'.$lang['srv_analiza_ShowOthersText'].'</label>';
         
-        echo '<br/>';
+        echo '  <input id="showNumbers" name="showNumbers" type="checkbox" '.(($cp['showNumbers']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+		echo '  <label for="showNumbers">'.$lang['srv_analiza_numericneSpremenljivke'].'</label>';
         
-		echo '<label>';
-		echo '<input id="hideAllSystem" name="hideAllSystem" type="checkbox" ' .
-			  (($cp['hideAllSystem']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo  $lang['srv_analiza_hideAllEmpty'] ;
-        echo '</label>';
+        echo '  <input id="showText" name="showText" type="checkbox" '.(($cp['showText']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+		echo '  <label for="showText">'.$lang['srv_analiza_textovneSpremenljivke'].'</label>';
         
-        echo '<br/>';
+        echo '</div>';
+ 
         
-		echo '<label>';
-		echo $lang['srv_analiza_defAnsCnt'].": ";
+        echo '<div class="setting_line">';
+
+		echo '  <label>'.$lang['srv_analiza_link'].':<label>';
+		echo '  <select id="analysisGoTo">';
+		echo '      <option value="0"'.((int)$cp['analysisGoTo'] == 0 ? ' selected="selected"' : '').'>'.$lang['srv_analiza_charts'].'</option>';
+		echo '      <option value="1"'.((int)$cp['analysisGoTo'] == 1 ? ' selected="selected"' : '').'>'.$lang['srv_sumarnik'].'</option>';
+        echo '  </select>';
+
+        echo '</div>';
+        
+
+        echo '<div class="setting_line">';
+
+		echo '  <input id="analiza_legenda" name="analiza_legenda" type="checkbox" ' .(($cp['analiza_legenda'] == '1') ? ' checked="checked" ' : '') . ' autocomplete="off" />';
+		echo '  <label for="analiza_legenda">'.$lang['srv_analiza_showLegend'].'</label>';
+
+        echo '</div>';
+
+        
+        echo '<div class="setting_line">';
+
+		echo '  <input id="hideEmpty" name="hideEmpty" type="checkbox" '.(($cp['hideEmpty']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+        echo '  <label for="hideEmpty">'.$lang['srv_analiza_hideEmpty'].'</label>';
+        
+        echo '</div>';
+
+        
+        echo '<div class="setting_line">';
+
+        echo '<input id="hideAllSystem" name="hideAllSystem" type="checkbox" '.(($cp['hideAllSystem']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+        echo '<label for="hideAllSystem">'.$lang['srv_analiza_hideAllEmpty'].'</label>';
+        
+        echo '</div>';
+
+        
+        echo '<div class="setting_line">';
+
+		echo '<label>'.$lang['srv_analiza_defAnsCnt'].":</label>";
 		echo '<select id="numOpenAnswers" name="numOpenAnswers" autocomplete="off">';
 		$lastElement = end(self::$textAnswersMore);
-		
 		foreach (self::$textAnswersMore AS $key => $values) {
 			echo '<option'.((int)$cp['numOpenAnswers'] == $values ? ' selected="selected"' : '').' value="'.$values.'">';
 			if ($values != $lastElement) {
@@ -799,80 +801,100 @@ class SurveyDataSettingProfiles {
 			echo '</option>';
 		}
 		echo '</select>';
-        echo '</label>';
+
+        echo '</div>';
         
 		echo '</fieldset>';
 		
 		
 		echo '<fieldset>';
 		echo '<legend>'.$lang['srv_results_base_settings'].'</legend>';
-		echo '<span class="dsp_sett_label">'.$lang['srv_results_num_digits'].'</span>';
-		echo '&nbsp;&nbsp;<span clsss="dsp_sett_label">'.$lang['srv_results_for_percents'].':&nbsp;</span><input type="text" id="dsp_ndp" name="dsp_ndp" value="'.$cp['dsp_ndp'].'" size="2" autocomplete="off">';
-		echo '&nbsp;&nbsp;<span class="dsp_sett_label">'.$lang['srv_results_for_average'].':&nbsp;</span><input type="text" id="dsp_nda" name="dsp_nda" value="'.$cp['dsp_nda'].'" size="2" autocomplete="off">';
-		echo '&nbsp;&nbsp;<span class="dsp_sett_label">'.$lang['srv_results_for_deviation'].':&nbsp;</span><input type="text" id="dsp_ndd" name="dsp_ndd" value="'.$cp['dsp_ndd'].'" size="2" autocomplete="off">';
-		
-		echo '<br/>'.$lang['srv_results_decimal_sign'].': ';
+
+
+        echo '<div class="setting_line">';
+		echo '  <label>'.$lang['srv_results_num_digits'].'</label>';
+        echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <label for="dsp_ndp">'.$lang['srv_results_for_percents'].':</label>';
+        echo '  <input type="text" id="dsp_ndp" name="dsp_ndp" value="'.$cp['dsp_ndp'].'" size="2" autocomplete="off">';
+        echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <label for="dsp_nda">'.$lang['srv_results_for_average'].':</label>';
+        echo '  <input type="text" id="dsp_nda" name="dsp_nda" value="'.$cp['dsp_nda'].'" size="2" autocomplete="off">';
+        echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <label for="dsp_ndd">'.$lang['srv_results_for_deviation'].':</label>';
+        echo '  <input type="text" id="dsp_ndd" name="dsp_ndd" value="'.$cp['dsp_ndd'].'" size="2" autocomplete="off">';
+		echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '<label>'.$lang['srv_results_decimal_sign'].':</label>';
 		foreach (self::$seperators AS $skey => $seperators) {
-			echo '<label>';
-			echo '<input type="radio" id="radio_dsp_sep_'.$skey.'" name="radio_dsp_sep" value="'.$skey.'"'.($cp['dsp_sep'] == $skey ? ' checked="checked"' : '').' autocomplete="off">';
-			echo self::formatNumber('1234.56',2,$seperators);
-			echo '</label>';
+            echo '<input type="radio" id="radio_dsp_sep_'.$skey.'" name="radio_dsp_sep" value="'.$skey.'"'.($cp['dsp_sep'] == $skey ? ' checked="checked"' : '').' autocomplete="off">';
+			echo '<label for="radio_dsp_sep_'.$skey.'">'.self::formatNumber('1234.56', 2, $seperators).'</label>';
 		}
+        echo '</div>';
+        
 		echo '</fieldset>';
 
 		
 		// Nastavitve za crosstabe - prikazemo samo v crosstabih
 		echo '<fieldset '.(isset($_POST['podstran']) && $_POST['podstran'] == 'crosstabs' ? '' : ' style="display:none;"').'>';
 		echo '<legend>'.$lang['srv_results_crostabs_settings'].'</legend>';
-		echo '<span class="dsp_sett_label">'.$lang['srv_results_num_digits'].'</span>';
-		echo '&nbsp;&nbsp;<span clsss="dsp_sett_label">'.$lang['srv_results_for_residual'].':&nbsp;</span><input type="text" id="dsp_res" name="dsp_res" value="'.$cp['dsp_res'].'" size="2" autocomplete="off">';
+
+        echo '<div class="setting_line">';
+		echo '  <label for="dsp_res">'.$lang['srv_results_num_digits'].' '.$lang['srv_results_for_residual'].':</label>';
+		echo '  <input type="text" id="dsp_res" name="dsp_res" value="'.$cp['dsp_res'].'" size="2" autocomplete="off">';
+		echo '</div>';
 		
-		echo '<div class="crossCheckHolder">' ;
-		echo '<div class="crossCheckHolder">' ;
-//		echo '<input id="crossCheck0" name="crossCheck0" type="checkbox" ' . ($cp['crossChk0'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span name="spn_residual" class="ctbChck_sp0">' . $lang['srv_analiza_crosstab_frekvence'] . '</span><br />';
-		echo '<label>';
-		echo '<input id="crossCheck1" name="crossCheck1" type="checkbox" ' . ($cp['crossChk1'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_sp1" class="ctbChck_sp1">' . $lang['srv_analiza_crosstab_odstotek_vrstice'] . '</span><br />';
-		echo '</label>';
-		echo '<label>';
-		echo '<input id="crossCheck2" name="crossCheck2" type="checkbox" ' . ($cp['crossChk2'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_sp2" class="ctbChck_sp2">' . $lang['srv_analiza_crosstab_odstotek_stolpci'] . '</span><br />';
-		echo '</label>';
-		echo '<label>';
-		echo '<input id="crossCheck3" name="crossCheck3" type="checkbox" ' . ($cp['crossChk3'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_sp3" class="ctbChck_sp3">' . $lang['srv_analiza_crosstab_odstotek_skupni'] . '</span><br />';
-		echo '</label>';
+		echo '<div class="setting_line">';
+		echo '  <input id="crossCheck1" name="crossCheck1" type="checkbox" ' . ($cp['crossChk1'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheck1">'.$lang['srv_analiza_crosstab_odstotek_vrstice'].'</label>';
 		echo '</div>';
 
-		echo '<div class="crossCheckHolder">' ;
-		echo '<label>';
-		echo '<input id="crossCheckEC" name="crossCheckEC" type="checkbox" ' . ($cp['crossChkEC'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_EC" class="crossCheck_EC">' . $lang['srv_analiza_crosstab_expected_count'] . '</span><br />';
-		echo '</label>';
-		echo '<label>';
-		echo '<input id="crossCheckRE" name="crossCheckRE" type="checkbox" ' . ($cp['crossChkRE'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_RE" class="crossCheck_RE">' . $lang['srv_analiza_crosstab_residual'] . '</span><br />';
-		echo '</label>';
-		echo '<label>';
-		echo '<input id="crossCheckSR" name="crossCheckSR" type="checkbox" ' . ($cp['crossChkSR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_SR" class="crossCheck_SR">' . $lang['srv_analiza_crosstab_stnd_residual'] . '</span><br />';
-		echo '</label>';
-		echo '<label>';
-		echo '<input id="crossCheckAR" name="crossCheckAR" type="checkbox" ' . ($cp['crossChkAR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_AR" class="crossCheck_AR">' . $lang['srv_analiza_crosstab_adjs_residual'] . '</span><br />';
-		echo '</label>';
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheck2" name="crossCheck2" type="checkbox" ' . ($cp['crossChk2'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheck2">'.$lang['srv_analiza_crosstab_odstotek_stolpci'].'</label>';
 		echo '</div>';
-		
-		echo '<div class="crossCheckHolder">' ;
-		echo '<label>';
-		echo '<input id="crossCheckColor" name="crossCheckColor" type="checkbox" ' . ($cp['doColor'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span class="crossCheckColor">' . $lang['srv_analiza_crosstab_color_residual1'] . '</span><br />';
-		echo '</label>';
-		echo '<label>';
-		echo '<input id="crossCheckValues" name="crossCheckValues" type="checkbox" ' . ($cp['doValues'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span class="crossCheckValues">' . $lang['srv_analiza_crosstab_doValues'] . '</span>';
-		echo '</label>';
-		/*
-		echo '<table id="tbl_color_ersidual" class="residual">';
-		echo '<tr><td>'.$lang['srv_analiza_crosstab_value'].'</td><th>+</th><th>-</th></tr>';
-		echo '<tr><td>1.1 - 2.0</td><td class="rsdl_bck1">&nbsp;</td><td class="rsdl_bck4">&nbsp;</td></tr>';
-		echo '<tr><td>2.1 - 3.0</td><td class="rsdl_bck2">&nbsp;</td><td class="rsdl_bck5">&nbsp;</td></tr>';
-		echo '<tr><td>3.1 '.$lang['srv_analiza_crosstab_and_more'].'</td><td class="rsdl_bck3">&nbsp;</td><td class="rsdl_bck6">&nbsp;</td></tr>';
-		echo '</table>';
-*/
+
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheck3" name="crossCheck3" type="checkbox" ' . ($cp['crossChk3'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheck3">'.$lang['srv_analiza_crosstab_odstotek_skupni'].'</label>';
 		echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheckEC" name="crossCheckEC" type="checkbox" ' . ($cp['crossChkEC'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheckEC">'.$lang['srv_analiza_crosstab_expected_count'].'</label>';
 		echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheckRE" name="crossCheckRE" type="checkbox" ' . ($cp['crossChkRE'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheckRE">'.$lang['srv_analiza_crosstab_residual'].'</label>';
+		echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheckSR" name="crossCheckSR" type="checkbox" ' . ($cp['crossChkSR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheckSR">'.$lang['srv_analiza_crosstab_stnd_residual'].'</label>';
+		echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheckAR" name="crossCheckAR" type="checkbox" ' . ($cp['crossChkAR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheckAR">'.$lang['srv_analiza_crosstab_adjs_residual'].'</label>';
+		echo '</div>';
+        
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheckColor" name="crossCheckColor" type="checkbox" ' . ($cp['doColor'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheckColor">'.$lang['srv_analiza_crosstab_color_residual1'].'</label>';
+		echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheckValues" name="crossCheckValues" type="checkbox" ' . ($cp['doValues'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheckValues">'.$lang['srv_analiza_crosstab_doValues'].'</label>';
+		echo '</div>';
+
 		echo '</fieldset>';
 		
 		
@@ -880,62 +902,90 @@ class SurveyDataSettingProfiles {
 		echo '<fieldset>';
 		echo '<legend>'.$lang['srv_results_charts_settings'].'</legend>';
 
+
 		// default poravnava tabel
-		echo $lang['srv_chart_table_defAlign'].': ';
-		echo '<label>';
-		echo '<input type="radio" id="chartTableAlign_0" name="chartTableAlign" value="0"'.($cp['chartTableAlign'] == 0 ? ' checked="checked"' : '').' autocomplete="off">'.$lang['srv_chart_table_defAlign_0'];
-		echo '</label>';
-		echo '<label>';
-		echo '<input type="radio" id="chartTableAlign_1" name="chartTableAlign" value="1"'.($cp['chartTableAlign'] == 1 ? ' checked="checked"' : '').' autocomplete="off">'.$lang['srv_chart_table_defAlign_1'];
-		echo '</label>';
+        echo '<div class="setting_line">';
+
+		echo '  <label>'.$lang['srv_chart_table_defAlign'].':</label>';
+
+		echo '  <input type="radio" id="chartTableAlign_0" name="chartTableAlign" value="0"'.($cp['chartTableAlign'] == 0 ? ' checked="checked"' : '').' autocomplete="off">';
+		echo '  <label for="chartTableAlign_0">'.$lang['srv_chart_table_defAlign_0'].'</label>';
+		
+        echo '  <input type="radio" id="chartTableAlign_1" name="chartTableAlign" value="1"'.($cp['chartTableAlign'] == 1 ? ' checked="checked"' : '').' autocomplete="off">';
+		echo '  <label for="chartTableAlign_1">'.$lang['srv_chart_table_defAlign_1'].'</label>';
+        
+        echo '</div>';
+
+
 		// velikost pisave v grafih
-		echo '<br /><label>' . $lang['srv_export_font'] . ': </label>';
-		echo '<select name="chartFontSize" id="chartFontSize" >';
+        echo '<div class="setting_line">';
+
+		echo '<label for="chartFontSize">'.$lang['srv_export_font'].':</label>';
+		echo '<select name="chartFontSize" id="chartFontSize">';
 		echo '	<option value="8"'.((int)$cp['chartFontSize'] == 8 ? ' selected="selected"' : '').'>8</option>';
 		echo '	<option value="9"'.((int)$cp['chartFontSize'] == 9 ? ' selected="selected"' : '').'>9</option>';
 		echo '	<option value="10"'.((int)$cp['chartFontSize'] == 10 ? ' selected="selected"' : '').'>10</option>';
 		echo '	<option value="11"'.((int)$cp['chartFontSize'] == 11 ? ' selected="selected"' : '').'>11</option>';
 		echo '	<option value="12"'.((int)$cp['chartFontSize'] == 12 ? ' selected="selected"' : '').'>12</option>';
 		echo '</select>';
+
+        echo '</div>';
+
 		
 		// prikaz texta ob numerusu
-		echo '<br /><label>' . $lang['srv_chart_numerusText'] . ': </label>';
-		echo '<select name="chartNumerusText" id="chartNumerusText" >';
+        echo '<div class="setting_line">';
+
+		echo '<label for="chartNumerusText">' . $lang['srv_chart_numerusText'] . ':</label>';
+		echo '<select name="chartNumerusText" id="chartNumerusText">';
 		echo '	<option value="0"'.((int)$cp['chartNumerusText'] == 0 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_0'] . '</option>';
 		echo '	<option value="1"'.((int)$cp['chartNumerusText'] == 1 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_1'] . '</option>';
 		echo '	<option value="2"'.((int)$cp['chartNumerusText'] == 2 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_2'] . '</option>';
 		echo '	<option value="3"'.((int)$cp['chartNumerusText'] == 3 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_3'] . '</option>';
 		echo '	<option value="4"'.((int)$cp['chartNumerusText'] == 4 ? ' selected="selected"' : '').'>' . $lang['without'] . '</option>';	
 		echo '</select>';
+
+        echo '</div>';
+
 		
 		// prikaz povprecja
-		echo '<br /><label>' . $lang['srv_chart_showAvg_long'] . ': </label>';
-		echo '<select name="chartAvgText" id="chartAvgText" >';
+        echo '<div class="setting_line">';
+
+		echo '<label for="chartAvgText">' . $lang['srv_chart_showAvg_long'] . ':</label>';
+		echo '<select name="chartAvgText" id="chartAvgText">';
 		echo '	<option value="1"'.((int)$cp['chartAvgText'] == 1 ? ' selected="selected"' : '').'>' . $lang['yes'] . '</option>';
 		echo '	<option value="0"'.((int)$cp['chartAvgText'] == 0 ? ' selected="selected"' : '').'>' . $lang['no'] . '</option>';
 		echo '</select>';
+
+        echo '</div>';
+
 		
 		// stevilcenje vprasanj
-		echo '<br />';
-		echo '<label>';
-		echo '<input id="chartNumbering" name="chartNumbering" type="checkbox" ' .
-		 (($cp['chartNumbering']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_nastavitveStevilcenje'];
-		echo '</label>';
+		echo '<div class="setting_line">';
+
+		echo '<input id="chartNumbering" name="chartNumbering" type="checkbox" '.(($cp['chartNumbering']) ? ' checked="checked" ' : '').' autocomplete="off"/>';
+		echo '<label for="chartNumbering">' . $lang['srv_nastavitveStevilcenje'] . ':</label>';
+
+        echo '</div>';
+
+
 		// uvodna stran v izvozu
-		echo '<br />';	
-		echo '<label>';
-		echo '<input id="chartFP" name="chartFP" type="checkbox" ' .
-			  (($cp['chartFP']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo  $lang['srv_chart_frontpage'] ;	
-		echo '</label>';
+		echo '<div class="setting_line">';
+
+		echo '<input id="chartFP" name="chartFP" type="checkbox" '.(($cp['chartFP']) ? ' checked="checked" ' : '').' autocomplete="off"/>';
+		echo '<label for="chartFP">' . $lang['srv_chart_frontpage'] . ':</label>';
+
+        echo '</div>';
+
+
 		// prikaz nicelnih vrednosti v kroznih grafih
-		echo '<br />';
-		echo '<label>';
-		echo '<input id="chartPieZeros" name="chartPieZeros" type="checkbox" ' .
-			  (($cp['chartPieZeros']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo  $lang['srv_chart_pieZeros'] ;
-		echo '</label>';
+        echo '<div class="setting_line">';
+
+		echo '<input id="chartPieZeros" name="chartPieZeros" type="checkbox" '.(($cp['chartPieZeros']) ? ' checked="checked" ' : '').' autocomplete="off"/>';
+		echo '<label for="chartPieZeros">' . $lang['srv_chart_pieZeros'] . ':</label>';
+
+        echo '</div>';
+
+
 		echo '</fieldset>';
 	}
 	
diff --git a/admin/survey/classes/class.SurveyInpect.php b/admin/survey/classes/class.SurveyInpect.php
index b8378fa91..d9529196f 100644
--- a/admin/survey/classes/class.SurveyInpect.php
+++ b/admin/survey/classes/class.SurveyInpect.php
@@ -542,50 +542,72 @@ class SurveyInspect {
 		echo '<h2>'.$lang['srv_inspect_setting'].'</h2>';
 		
 		if ( $this->enableInspect != SI_DEFAULT_PROFILE ) {
-			echo '<div id="not_default_setting">';
+			echo '<div id="not_default_setting" class="popup_note">';
 			echo $lang['srv_not_default_setting'];
-			echo '</div><br class="clr displayNone">';
+			echo '</div>';
 		}
 
+
+        echo '<div class="popup_main">';
+        
+
 		# Nastavitve za Inspect
-		echo '<p>'.$lang['srv_inspect_setting_link'].'</p>';
-		echo '<p>';
-		echo '<label>'.$lang['srv_inspect_setting_enabled'].'</label>';
-		echo '&nbsp;<input id="enableInspect0" name="enableInspect" type="radio" value="0"' .
-				(($this->enableInspect == false) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo '<label for="enableInspect0">'.$lang['no'].'</label>';
+        echo '<div class="setting_line">';
+		echo    $lang['srv_inspect_setting_link'];
+        echo '</div>';
+        
+
+        echo '<div class="setting_line">';
+
+		echo '  <label>'.$lang['srv_inspect_setting_enabled'].'</label>';
+		
+        echo '  <input id="enableInspect0" name="enableInspect" type="radio" value="0" '.(($this->enableInspect == false) ? ' checked="checked" ' : '').' autocomplete="off">';
+		echo '  <label for="enableInspect0">'.$lang['no'].'</label>';
+        
+		echo '  <input id="enableInspect1" name="enableInspect" type="radio" value="1" '.(($this->enableInspect == true) ? ' checked="checked" ' : '') . ' autocomplete="off">';
+		echo '  <label for="enableInspect1">'.$lang['yes'].' '.Help :: display('srv_crosstab_inspect').'</label>';
+        
+        echo '</div>';
+
+
+		echo '<div class="setting_line">';
+
+		echo '  <label>'.$lang['srv_inspect_goto_note'].'</label>';
+
+        echo '  <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_ANALIZE.'" value="'.SI_GOTO_ANALIZE.'"'.($this->inspect_goto == SI_GOTO_ANALIZE ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
+		echo '  <label>'.$lang['srv_inspect_goto_'.SI_GOTO_ANALIZE].'</label>';
+
+        echo '  <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_VPOGLED.'" value="'.SI_GOTO_VPOGLED.'"'.($this->inspect_goto == SI_GOTO_VPOGLED ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
+		echo '  <label>'.$lang['srv_inspect_goto_'.SI_GOTO_VPOGLED].'</label>';
+		
+        echo '  <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_PODATKI.'" value="'.SI_GOTO_PODATKI.'"'.($this->inspect_goto == SI_GOTO_PODATKI ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
+        echo '  <label>'.$lang['srv_inspect_goto_'.SI_GOTO_PODATKI].'</label>';
 
-		echo '&nbsp;<input id="enableInspect1" name="enableInspect" type="radio" value="1"' .
-				(($this->enableInspect == true) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo '<label for="enableInspect1">'.$lang['yes'].'</label>';
-		echo Help :: display('srv_crosstab_inspect');
-		echo '</p>';
-		echo '<p>';
-		echo '<div>';
-		echo '<span class="floatLeft">'.$lang['srv_inspect_goto_note'].'</span>&nbsp;';
-		echo '<span class="floatLeft">';
-		echo '<label><input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_ANALIZE.'" value="'.SI_GOTO_ANALIZE.'"'.($this->inspect_goto == SI_GOTO_ANALIZE ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off"/>'.$lang['srv_inspect_goto_'.SI_GOTO_ANALIZE].'</label><br/>';
-		echo '<label><input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_VPOGLED.'" value="'.SI_GOTO_VPOGLED.'"'.($this->inspect_goto == SI_GOTO_VPOGLED ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off"/>'.$lang['srv_inspect_goto_'.SI_GOTO_VPOGLED].'</label> <br/>';
-		echo '<label><input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_PODATKI.'" value="'.SI_GOTO_PODATKI.'"'.($this->inspect_goto == SI_GOTO_PODATKI ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off"/>'.$lang['srv_inspect_goto_'.SI_GOTO_PODATKI].'</label>';
-		echo '</span>';
 		echo '</div>';
-		echo'</p>';
-		echo'<br class="clr">';
-		echo '<p>';
-		echo '<div id="inspectListDiv" '.($this->inspect_goto != SI_GOTO_PODATKI ? ' class="displayNone"' : '').'>';
-		echo '<span>'.$lang['srv_inspect_setting_show_variables'].'</span>';
-		echo '<span id="inspectListSpr" class="as_link">';
+
+
+		echo '<div id="inspectListDiv" class="settings_block" '.($this->inspect_goto != SI_GOTO_PODATKI ? ' class="displayNone"' : '').'>';
+		echo '  <div class="setting_line">';
+		echo        $lang['srv_inspect_setting_show_variables'];
+		echo '      <span id="inspectListSpr" class="as_link">';
 		$this->displayInspectVars();
-		echo '</span>';
+		echo '      </span>';
+		echo '  </div>';
 		echo '</div>';
-		echo '</p>';
 
-		echo '<span class="floatRight" title="'.$lang['srv_save_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inspectSaveSettings(); return false;"><span>'.$lang['srv_save_profile'] . '</span></a></div></span>';
-		echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inspectCloseSettings(); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
 
 		// cover Div
 		echo '<div id="inspect_cover_div"></div>'."\n";
+        
 
+        echo '</div>';
+
+
+        // Gumbi
+        echo '<div class="button_holder">';
+		echo '  <button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="inspectCloseSettings(); return false;">'.$lang['srv_close_profile'] . '</button>';
+		echo '  <button class="medium blue" title="'.$lang['srv_save_profile'].'" onclick="inspectSaveSettings(); return false;">'.$lang['srv_save_profile'] . '</button>';
+        echo '</div>';
 	}
 
 	function displayInspectVars() {
diff --git a/admin/survey/classes/class.SurveyZoom.php b/admin/survey/classes/class.SurveyZoom.php
index 702ee2d77..94ed092f5 100644
--- a/admin/survey/classes/class.SurveyZoom.php
+++ b/admin/survey/classes/class.SurveyZoom.php
@@ -214,19 +214,24 @@ class SurveyZoom
         
         $currentFilterProfile = self::$profiles[$current_pid];
         if ( self::$currentProfileId != ZOOM_DEFAULT_PROFILE ) {
-	       	echo '<div id="not_default_setting">';
+	       	echo '<div id="not_default_setting" class="popup_note">';
 	        echo $lang['srv_not_default_setting'];
-	        echo '</div><br class="clr displayNone">';
+	        echo '</div>';
         }
       
-       	echo '<div id="zoom_profiles_left">';
-       	echo '<span id="zoom_profiles_holder">';
+
+        echo '<div class="popup_main with_menu">';
+
+
+       	echo '<div id="zoom_profiles_left" class="popup_left">';
+       	echo '<div id="zoom_profiles_holder">';
+
 		# zlistamo vse profile
-       	echo '<span id="zoom_profiles" class="select">';
+       	echo '<div id="zoom_profiles" class="list select">';
 		if (count(self::$profiles)) {
 			foreach (self::$profiles as $id => $profile) {
 				
-				echo '<div class="option' . ($current_pid == $id ? ' active' : '') . '" id="zoom_profile_' . $id . '" value="'.$id.'" '.($current_pid == $id ? '' : ' onclick="zoomChangeProfile(\''.$id.'\')"').'>';
+				echo '<div class="list-item option' . ($current_pid == $id ? ' active' : '') . '" id="zoom_profile_' . $id . '" value="'.$id.'" '.($current_pid == $id ? '' : ' onclick="zoomChangeProfile(\''.$id.'\')"').'>';
 
 				echo $profile['name'];
 				
@@ -245,18 +250,22 @@ class SurveyZoom
 				echo '</div>';
 			}
 		}
-		echo '</span>'; # zoom_profilea
-		echo '</span>'; # zoom_profiles_holder
-		
+		echo '</div>'; # zoom_profilea
+
+        // Gumb za dodajanje novega profila
+        echo '<button class="small white-black" title="'.$lang['srv_create_new_profile'].'" onclick="zoomProfileAction(\'newName\'); return false;">';
+        echo '  <span class="faicon plus_32"></span>'.$lang['srv_create_new_profile'];
+        echo '</button>';
+
+		echo '</div>'; # zoom_profiles_holder
 		echo '</div>'; # zoom_profiles_left
 
 		
-		echo '<div id="zoom_profiles_right">'."\n";
+		echo '<div id="zoom_profiles_right" class="popup_right">'."\n";
 		if ($current_pid == 0) {
-			echo '<div id="zoom_note">';
+			echo '<div id="zoom_note" class="popup_right_note">';
 			echo $lang['srv_change_default_profile'];
 			echo '</div>'; // zoom_profile_note
-			echo '<br class="clr" />'."\n";
 		}	
 		
 		echo '<div id="zoom_content">';
@@ -264,20 +273,23 @@ class SurveyZoom
 		echo '</div>'; // zoom_profile_content
 
 		echo '</div>'; // zoom_profile_right
+
+
+		echo '</div>';
 		
 		
-		echo '<div id="zoom_button_holder">'."\n";
+		echo '<div id="zoom_button_holder" class="button_holder">'."\n";
+
 		if ((int)$current_pid <= 0 ) {
-			echo '<span class="floatRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zoomProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'newName\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
-		} else  {
-			echo '<span class="floatRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zoomProfileAction(\'runProfile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'newName\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
-			
+			echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="zoomProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
+			echo '<button class="medium blue" title="'.$lang['srv_run_as_session_profile'] . '" onclick="zoomProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
+		} 
+        else  {
+			echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="zoomProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
+            echo '<button class="medium white-blue" title="'.$lang['srv_run_as_session_profile'] . '" onclick="zoomProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
+			echo '<button class="medium blue" title="'.$lang['srv_save_run_profile'] . '" onclick="zoomProfileAction(\'runProfile\'); return false;">'.$lang['srv_run_profile'] . '</button>';	
 		}
+
 		echo '</div>'."\n"; // zoom_button_holder
 		
 		
@@ -312,9 +324,11 @@ class SurveyZoom
 	 */
 	function DisplayProfileData($current_pid=null) {
 		global $lang;
+
 		if (isset($_POST['error'])) {
 			echo '<span class="red">* '.$lang[$_POST['error']].'</span><br/>';
 		}
+        
 		# podatki profila
 		if ($current_pid == null) {
 			$current_pid = self::$currentProfileId;
@@ -324,39 +338,44 @@ class SurveyZoom
 		
 		$all_spr = Cache::cache_all_srv_spremenljivka(self::$sid,true);
 		
-		echo '<span>'.$lang['srv_zoom_choose'].'</span>';
+
+        echo '<div class="setting_line">';
+		echo $lang['srv_zoom_choose'];
+        echo '</div>';
+
 		
 		if (count($all_spr) > 0)
 		foreach ($all_spr AS $id => $spremenljivka) {
 			if ( in_array($spremenljivka['tip'], array(1,2,3) ) ) {
-				echo '<div class="zoom_var">';
-				
-				echo '<label>';
-				echo '<input name="zoom_vars" id="zoom_var_'.$spremenljivka['id'].'" value="'.$spremenljivka['id'].'" type="checkbox"'
-				.(is_array($vars) && in_array($spremenljivka['id'],$vars) ? ' checked' : '').'>';
-				echo strip_tags($spremenljivka['variable']).' - '.strip_tags($spremenljivka['naslov']).'</label>';
-				
+				echo '<div class="settings_block">';
+
+				echo '  <div class="setting_line">';
+				echo '      <input name="zoom_vars" id="zoom_var_'.$spremenljivka['id'].'" value="'.$spremenljivka['id'].'" type="checkbox" '.(is_array($vars) && in_array($spremenljivka['id'],$vars) ? ' checked' : '').'>';
+				echo '      <label for="zoom_var_'.$spremenljivka['id'].'">'.strip_tags($spremenljivka['variable']).' - '.strip_tags($spremenljivka['naslov']).'</label>';
+				echo '  </div>';
+                
 				echo '</div>';
-			} else if ( in_array($spremenljivka['tip'], array(6,16,17))) {
-				echo '<div class="zoom_var">';
-				
+			} 
+            else if ( in_array($spremenljivka['tip'], array(6,16,17))) {
+                echo '<div class="settings_block">';
+                
 				# izpišemo glavno spremenljivko
-				echo '<label style="margin-left:20px;">';
-				echo strip_tags($spremenljivka['variable']).' - '.strip_tags($spremenljivka['naslov']).'</label>';
+                echo '  <div class="setting_line">';
+				echo '      <label>'.strip_tags($spremenljivka['variable']).' - '.strip_tags($spremenljivka['naslov']).'</label>';
+                echo '  </div>';
 				
 				# izpišemo gride (zamaknjeno)
 				$sql = sisplet_query("SELECT id, naslov, variable FROM srv_vrednost WHERE spr_id='$id' AND other = 0 ORDER BY vrstni_red");
 	            while ($row = mysqli_fetch_assoc($sql)) {
-					echo '<label style="margin-left:25px; margin-top:5px;">';
-					echo '<input name="zoom_vars" id="zoom_var_'.$spremenljivka['id'].'_'.$row['id'].'" value="'.$spremenljivka['id'].'_'.$row['id'].'" type="checkbox"'
-					.(is_array($vars) && in_array($spremenljivka['id'].'_'.$row['id'],$vars) ? ' checked' : '').'>';
-					echo strip_tags($row['variable']).' - '.strip_tags($row['naslov']).'</label>';
+                    echo '  <div class="setting_line indent">'; 
+					echo '      <input name="zoom_vars" id="zoom_var_'.$spremenljivka['id'].'_'.$row['id'].'" value="'.$spremenljivka['id'].'_'.$row['id'].'" type="checkbox" '.(is_array($vars) && in_array($spremenljivka['id'].'_'.$row['id'],$vars) ? ' checked' : '').'>';
+                    echo '      <label for="">'.strip_tags($row['variable']).' - '.strip_tags($row['naslov']).'</label>';
+                    echo '  </div>';
 	        	}
+
 				echo '</div>';
 			}
 		} 
-		
-		echo '<br class="clr"/>';
 	}
 	
 	/* Shranimo izbrane variable in resetiramo if na 0, ter pobrišemo morebitni pogoj če obstaja
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index faeb5a75f..6a6c81357 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -6855,11 +6855,15 @@ a.help {
 }
 .divPopUp .popup_main {
   display: flex;
+  flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+.divPopUp .popup_main.with_menu {
+  flex-direction: row;
+}
 .divPopUp .popup_main .popup_left {
   box-sizing: border-box;
-  width: 232px;
+  width: 216px;
   padding-right: 16px;
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
@@ -6882,11 +6886,30 @@ a.help {
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
+.divPopUp .popup_main .popup_left button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  font-weight: 400;
+}
+.divPopUp .popup_main .popup_left button .faicon {
+  font-size: 12px;
+  line-height: 14px;
+}
+.divPopUp .popup_main .popup_left button .faicon::before {
+  margin-right: 8px;
+  font-size: 14px;
+  color: #1E88E5;
+}
 .divPopUp .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
 }
-.divPopUp .popup_main .popup_right fieldset {
+.divPopUp .popup_main .popup_right .popup_right_note {
+  margin-bottom: 16px;
+  font-size: 16px;
+}
+.divPopUp .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -6894,13 +6917,30 @@ a.help {
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-.divPopUp .popup_main .popup_right fieldset legend {
+.divPopUp .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-.divPopUp .popup_main .popup_right fieldset .setting_line {
+.divPopUp .popup_main .setting_line {
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+.divPopUp .popup_main .setting_line:last-of-type {
+  margin-bottom: 0;
+}
+.divPopUp .popup_main .setting_line label,
+.divPopUp .popup_main .setting_line span {
+  font-size: 14px;
+}
+.divPopUp .popup_main .settings_block {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
 }
+.divPopUp .popup_main .settings_block label,
+.divPopUp .popup_main .settings_block span {
+  font-size: 14px;
+}
 .divPopUp .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
@@ -7264,11 +7304,15 @@ body.waitlong #loading {
 }
 #check_pogoji .popup_main {
   display: flex;
+  flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#check_pogoji .popup_main.with_menu {
+  flex-direction: row;
+}
 #check_pogoji .popup_main .popup_left {
   box-sizing: border-box;
-  width: 232px;
+  width: 216px;
   padding-right: 16px;
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
@@ -7291,11 +7335,30 @@ body.waitlong #loading {
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
+#check_pogoji .popup_main .popup_left button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  font-weight: 400;
+}
+#check_pogoji .popup_main .popup_left button .faicon {
+  font-size: 12px;
+  line-height: 14px;
+}
+#check_pogoji .popup_main .popup_left button .faicon::before {
+  margin-right: 8px;
+  font-size: 14px;
+  color: #1E88E5;
+}
 #check_pogoji .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
 }
-#check_pogoji .popup_main .popup_right fieldset {
+#check_pogoji .popup_main .popup_right .popup_right_note {
+  margin-bottom: 16px;
+  font-size: 16px;
+}
+#check_pogoji .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -7303,13 +7366,30 @@ body.waitlong #loading {
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-#check_pogoji .popup_main .popup_right fieldset legend {
+#check_pogoji .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-#check_pogoji .popup_main .popup_right fieldset .setting_line {
+#check_pogoji .popup_main .setting_line {
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+#check_pogoji .popup_main .setting_line:last-of-type {
+  margin-bottom: 0;
+}
+#check_pogoji .popup_main .setting_line label,
+#check_pogoji .popup_main .setting_line span {
+  font-size: 14px;
+}
+#check_pogoji .popup_main .settings_block {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
 }
+#check_pogoji .popup_main .settings_block label,
+#check_pogoji .popup_main .settings_block span {
+  font-size: 14px;
+}
 #check_pogoji .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
@@ -7371,11 +7451,15 @@ body.waitlong #loading {
 }
 #dropped_alert .popup_main {
   display: flex;
+  flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#dropped_alert .popup_main.with_menu {
+  flex-direction: row;
+}
 #dropped_alert .popup_main .popup_left {
   box-sizing: border-box;
-  width: 232px;
+  width: 216px;
   padding-right: 16px;
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
@@ -7398,11 +7482,30 @@ body.waitlong #loading {
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
+#dropped_alert .popup_main .popup_left button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  font-weight: 400;
+}
+#dropped_alert .popup_main .popup_left button .faicon {
+  font-size: 12px;
+  line-height: 14px;
+}
+#dropped_alert .popup_main .popup_left button .faicon::before {
+  margin-right: 8px;
+  font-size: 14px;
+  color: #1E88E5;
+}
 #dropped_alert .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
 }
-#dropped_alert .popup_main .popup_right fieldset {
+#dropped_alert .popup_main .popup_right .popup_right_note {
+  margin-bottom: 16px;
+  font-size: 16px;
+}
+#dropped_alert .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -7410,13 +7513,30 @@ body.waitlong #loading {
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-#dropped_alert .popup_main .popup_right fieldset legend {
+#dropped_alert .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-#dropped_alert .popup_main .popup_right fieldset .setting_line {
+#dropped_alert .popup_main .setting_line {
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+#dropped_alert .popup_main .setting_line:last-of-type {
+  margin-bottom: 0;
+}
+#dropped_alert .popup_main .setting_line label,
+#dropped_alert .popup_main .setting_line span {
+  font-size: 14px;
+}
+#dropped_alert .popup_main .settings_block {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
 }
+#dropped_alert .popup_main .settings_block label,
+#dropped_alert .popup_main .settings_block span {
+  font-size: 14px;
+}
 #dropped_alert .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
@@ -7487,11 +7607,15 @@ body.waitlong #loading {
 }
 #popup_user_access .popup_main {
   display: flex;
+  flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#popup_user_access .popup_main.with_menu {
+  flex-direction: row;
+}
 #popup_user_access .popup_main .popup_left {
   box-sizing: border-box;
-  width: 232px;
+  width: 216px;
   padding-right: 16px;
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
@@ -7514,11 +7638,30 @@ body.waitlong #loading {
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
+#popup_user_access .popup_main .popup_left button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  font-weight: 400;
+}
+#popup_user_access .popup_main .popup_left button .faicon {
+  font-size: 12px;
+  line-height: 14px;
+}
+#popup_user_access .popup_main .popup_left button .faicon::before {
+  margin-right: 8px;
+  font-size: 14px;
+  color: #1E88E5;
+}
 #popup_user_access .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
 }
-#popup_user_access .popup_main .popup_right fieldset {
+#popup_user_access .popup_main .popup_right .popup_right_note {
+  margin-bottom: 16px;
+  font-size: 16px;
+}
+#popup_user_access .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -7526,13 +7669,30 @@ body.waitlong #loading {
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-#popup_user_access .popup_main .popup_right fieldset legend {
+#popup_user_access .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-#popup_user_access .popup_main .popup_right fieldset .setting_line {
+#popup_user_access .popup_main .setting_line {
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+#popup_user_access .popup_main .setting_line:last-of-type {
+  margin-bottom: 0;
+}
+#popup_user_access .popup_main .setting_line label,
+#popup_user_access .popup_main .setting_line span {
+  font-size: 14px;
+}
+#popup_user_access .popup_main .settings_block {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
 }
+#popup_user_access .popup_main .settings_block label,
+#popup_user_access .popup_main .settings_block span {
+  font-size: 14px;
+}
 #popup_user_access .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
@@ -13439,11 +13599,15 @@ textarea#addusers, textarea#addusers_note {
 }
 #vrednost_edit .popup_main {
   display: flex;
+  flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#vrednost_edit .popup_main.with_menu {
+  flex-direction: row;
+}
 #vrednost_edit .popup_main .popup_left {
   box-sizing: border-box;
-  width: 232px;
+  width: 216px;
   padding-right: 16px;
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
@@ -13466,11 +13630,30 @@ textarea#addusers, textarea#addusers_note {
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
+#vrednost_edit .popup_main .popup_left button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  font-weight: 400;
+}
+#vrednost_edit .popup_main .popup_left button .faicon {
+  font-size: 12px;
+  line-height: 14px;
+}
+#vrednost_edit .popup_main .popup_left button .faicon::before {
+  margin-right: 8px;
+  font-size: 14px;
+  color: #1E88E5;
+}
 #vrednost_edit .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
 }
-#vrednost_edit .popup_main .popup_right fieldset {
+#vrednost_edit .popup_main .popup_right .popup_right_note {
+  margin-bottom: 16px;
+  font-size: 16px;
+}
+#vrednost_edit .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -13478,13 +13661,30 @@ textarea#addusers, textarea#addusers_note {
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-#vrednost_edit .popup_main .popup_right fieldset legend {
+#vrednost_edit .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-#vrednost_edit .popup_main .popup_right fieldset .setting_line {
+#vrednost_edit .popup_main .setting_line {
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+#vrednost_edit .popup_main .setting_line:last-of-type {
+  margin-bottom: 0;
+}
+#vrednost_edit .popup_main .setting_line label,
+#vrednost_edit .popup_main .setting_line span {
+  font-size: 14px;
+}
+#vrednost_edit .popup_main .settings_block {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
 }
+#vrednost_edit .popup_main .settings_block label,
+#vrednost_edit .popup_main .settings_block span {
+  font-size: 14px;
+}
 #vrednost_edit .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
@@ -13561,11 +13761,15 @@ textarea#addusers, textarea#addusers_note {
 }
 #calculation .popup_main {
   display: flex;
+  flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#calculation .popup_main.with_menu {
+  flex-direction: row;
+}
 #calculation .popup_main .popup_left {
   box-sizing: border-box;
-  width: 232px;
+  width: 216px;
   padding-right: 16px;
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
@@ -13588,11 +13792,30 @@ textarea#addusers, textarea#addusers_note {
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
+#calculation .popup_main .popup_left button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  font-weight: 400;
+}
+#calculation .popup_main .popup_left button .faicon {
+  font-size: 12px;
+  line-height: 14px;
+}
+#calculation .popup_main .popup_left button .faicon::before {
+  margin-right: 8px;
+  font-size: 14px;
+  color: #1E88E5;
+}
 #calculation .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
 }
-#calculation .popup_main .popup_right fieldset {
+#calculation .popup_main .popup_right .popup_right_note {
+  margin-bottom: 16px;
+  font-size: 16px;
+}
+#calculation .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -13600,13 +13823,30 @@ textarea#addusers, textarea#addusers_note {
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-#calculation .popup_main .popup_right fieldset legend {
+#calculation .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-#calculation .popup_main .popup_right fieldset .setting_line {
+#calculation .popup_main .setting_line {
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+#calculation .popup_main .setting_line:last-of-type {
+  margin-bottom: 0;
+}
+#calculation .popup_main .setting_line label,
+#calculation .popup_main .setting_line span {
+  font-size: 14px;
+}
+#calculation .popup_main .settings_block {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
 }
+#calculation .popup_main .settings_block label,
+#calculation .popup_main .settings_block span {
+  font-size: 14px;
+}
 #calculation .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
@@ -13730,11 +13970,15 @@ and open the template in the editor.
 }
 #preview_spremenljivka .popup_main {
   display: flex;
+  flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#preview_spremenljivka .popup_main.with_menu {
+  flex-direction: row;
+}
 #preview_spremenljivka .popup_main .popup_left {
   box-sizing: border-box;
-  width: 232px;
+  width: 216px;
   padding-right: 16px;
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
@@ -13757,11 +14001,30 @@ and open the template in the editor.
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
+#preview_spremenljivka .popup_main .popup_left button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  font-weight: 400;
+}
+#preview_spremenljivka .popup_main .popup_left button .faicon {
+  font-size: 12px;
+  line-height: 14px;
+}
+#preview_spremenljivka .popup_main .popup_left button .faicon::before {
+  margin-right: 8px;
+  font-size: 14px;
+  color: #1E88E5;
+}
 #preview_spremenljivka .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
 }
-#preview_spremenljivka .popup_main .popup_right fieldset {
+#preview_spremenljivka .popup_main .popup_right .popup_right_note {
+  margin-bottom: 16px;
+  font-size: 16px;
+}
+#preview_spremenljivka .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -13769,13 +14032,30 @@ and open the template in the editor.
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-#preview_spremenljivka .popup_main .popup_right fieldset legend {
+#preview_spremenljivka .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-#preview_spremenljivka .popup_main .popup_right fieldset .setting_line {
+#preview_spremenljivka .popup_main .setting_line {
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+#preview_spremenljivka .popup_main .setting_line:last-of-type {
+  margin-bottom: 0;
+}
+#preview_spremenljivka .popup_main .setting_line label,
+#preview_spremenljivka .popup_main .setting_line span {
+  font-size: 14px;
+}
+#preview_spremenljivka .popup_main .settings_block {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
 }
+#preview_spremenljivka .popup_main .settings_block label,
+#preview_spremenljivka .popup_main .settings_block span {
+  font-size: 14px;
+}
 #preview_spremenljivka .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
@@ -14620,11 +14900,15 @@ dl.arch_email dd {
 }
 #inv_view_arch_recipients .popup_main {
   display: flex;
+  flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#inv_view_arch_recipients .popup_main.with_menu {
+  flex-direction: row;
+}
 #inv_view_arch_recipients .popup_main .popup_left {
   box-sizing: border-box;
-  width: 232px;
+  width: 216px;
   padding-right: 16px;
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
@@ -14647,11 +14931,30 @@ dl.arch_email dd {
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
+#inv_view_arch_recipients .popup_main .popup_left button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  font-weight: 400;
+}
+#inv_view_arch_recipients .popup_main .popup_left button .faicon {
+  font-size: 12px;
+  line-height: 14px;
+}
+#inv_view_arch_recipients .popup_main .popup_left button .faicon::before {
+  margin-right: 8px;
+  font-size: 14px;
+  color: #1E88E5;
+}
 #inv_view_arch_recipients .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
 }
-#inv_view_arch_recipients .popup_main .popup_right fieldset {
+#inv_view_arch_recipients .popup_main .popup_right .popup_right_note {
+  margin-bottom: 16px;
+  font-size: 16px;
+}
+#inv_view_arch_recipients .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -14659,13 +14962,30 @@ dl.arch_email dd {
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-#inv_view_arch_recipients .popup_main .popup_right fieldset legend {
+#inv_view_arch_recipients .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-#inv_view_arch_recipients .popup_main .popup_right fieldset .setting_line {
+#inv_view_arch_recipients .popup_main .setting_line {
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+#inv_view_arch_recipients .popup_main .setting_line:last-of-type {
+  margin-bottom: 0;
+}
+#inv_view_arch_recipients .popup_main .setting_line label,
+#inv_view_arch_recipients .popup_main .setting_line span {
+  font-size: 14px;
+}
+#inv_view_arch_recipients .popup_main .settings_block {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
 }
+#inv_view_arch_recipients .popup_main .settings_block label,
+#inv_view_arch_recipients .popup_main .settings_block span {
+  font-size: 14px;
+}
 #inv_view_arch_recipients .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
@@ -15098,11 +15418,15 @@ and open the template in the editor.
 }
 #div_export_setting_show .popup_main {
   display: flex;
+  flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#div_export_setting_show .popup_main.with_menu {
+  flex-direction: row;
+}
 #div_export_setting_show .popup_main .popup_left {
   box-sizing: border-box;
-  width: 232px;
+  width: 216px;
   padding-right: 16px;
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
@@ -15125,11 +15449,30 @@ and open the template in the editor.
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
+#div_export_setting_show .popup_main .popup_left button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  font-weight: 400;
+}
+#div_export_setting_show .popup_main .popup_left button .faicon {
+  font-size: 12px;
+  line-height: 14px;
+}
+#div_export_setting_show .popup_main .popup_left button .faicon::before {
+  margin-right: 8px;
+  font-size: 14px;
+  color: #1E88E5;
+}
 #div_export_setting_show .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
 }
-#div_export_setting_show .popup_main .popup_right fieldset {
+#div_export_setting_show .popup_main .popup_right .popup_right_note {
+  margin-bottom: 16px;
+  font-size: 16px;
+}
+#div_export_setting_show .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -15137,13 +15480,30 @@ and open the template in the editor.
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-#div_export_setting_show .popup_main .popup_right fieldset legend {
+#div_export_setting_show .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-#div_export_setting_show .popup_main .popup_right fieldset .setting_line {
+#div_export_setting_show .popup_main .setting_line {
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+#div_export_setting_show .popup_main .setting_line:last-of-type {
+  margin-bottom: 0;
+}
+#div_export_setting_show .popup_main .setting_line label,
+#div_export_setting_show .popup_main .setting_line span {
+  font-size: 14px;
+}
+#div_export_setting_show .popup_main .settings_block {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
 }
+#div_export_setting_show .popup_main .settings_block label,
+#div_export_setting_show .popup_main .settings_block span {
+  font-size: 14px;
+}
 #div_export_setting_show .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
@@ -17483,6 +17843,10 @@ and open the template in the editor.
     Created on : 10-Aug-2018, 10:12:15
     Author     : podkrizniku
 */
+#zoom_profiles_right .settings_block .setting_line.indent {
+  padding-left: 16px;
+}
+
 .condition_profile_holder {
   float: left;
   width: 190px;
@@ -18328,11 +18692,15 @@ input#endDate {
 }
 .mc_table_settings .popup_main {
   display: flex;
+  flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+.mc_table_settings .popup_main.with_menu {
+  flex-direction: row;
+}
 .mc_table_settings .popup_main .popup_left {
   box-sizing: border-box;
-  width: 232px;
+  width: 216px;
   padding-right: 16px;
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
@@ -18355,11 +18723,30 @@ input#endDate {
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
+.mc_table_settings .popup_main .popup_left button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  font-weight: 400;
+}
+.mc_table_settings .popup_main .popup_left button .faicon {
+  font-size: 12px;
+  line-height: 14px;
+}
+.mc_table_settings .popup_main .popup_left button .faicon::before {
+  margin-right: 8px;
+  font-size: 14px;
+  color: #1E88E5;
+}
 .mc_table_settings .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
 }
-.mc_table_settings .popup_main .popup_right fieldset {
+.mc_table_settings .popup_main .popup_right .popup_right_note {
+  margin-bottom: 16px;
+  font-size: 16px;
+}
+.mc_table_settings .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -18367,13 +18754,30 @@ input#endDate {
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-.mc_table_settings .popup_main .popup_right fieldset legend {
+.mc_table_settings .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-.mc_table_settings .popup_main .popup_right fieldset .setting_line {
+.mc_table_settings .popup_main .setting_line {
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+.mc_table_settings .popup_main .setting_line:last-of-type {
+  margin-bottom: 0;
+}
+.mc_table_settings .popup_main .setting_line label,
+.mc_table_settings .popup_main .setting_line span {
+  font-size: 14px;
+}
+.mc_table_settings .popup_main .settings_block {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
 }
+.mc_table_settings .popup_main .settings_block label,
+.mc_table_settings .popup_main .settings_block span {
+  font-size: 14px;
+}
 .mc_table_settings .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
@@ -18464,11 +18868,15 @@ input#endDate {
 }
 #newMCTable .popup_main {
   display: flex;
+  flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#newMCTable .popup_main.with_menu {
+  flex-direction: row;
+}
 #newMCTable .popup_main .popup_left {
   box-sizing: border-box;
-  width: 232px;
+  width: 216px;
   padding-right: 16px;
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
@@ -18491,11 +18899,30 @@ input#endDate {
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
+#newMCTable .popup_main .popup_left button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  font-weight: 400;
+}
+#newMCTable .popup_main .popup_left button .faicon {
+  font-size: 12px;
+  line-height: 14px;
+}
+#newMCTable .popup_main .popup_left button .faicon::before {
+  margin-right: 8px;
+  font-size: 14px;
+  color: #1E88E5;
+}
 #newMCTable .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
 }
-#newMCTable .popup_main .popup_right fieldset {
+#newMCTable .popup_main .popup_right .popup_right_note {
+  margin-bottom: 16px;
+  font-size: 16px;
+}
+#newMCTable .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -18503,13 +18930,30 @@ input#endDate {
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-#newMCTable .popup_main .popup_right fieldset legend {
+#newMCTable .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-#newMCTable .popup_main .popup_right fieldset .setting_line {
+#newMCTable .popup_main .setting_line {
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+#newMCTable .popup_main .setting_line:last-of-type {
+  margin-bottom: 0;
+}
+#newMCTable .popup_main .setting_line label,
+#newMCTable .popup_main .setting_line span {
+  font-size: 14px;
+}
+#newMCTable .popup_main .settings_block {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
 }
+#newMCTable .popup_main .settings_block label,
+#newMCTable .popup_main .settings_block span {
+  font-size: 14px;
+}
 #newMCTable .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
@@ -18576,11 +19020,15 @@ input#endDate {
 }
 #renameMCTable .popup_main {
   display: flex;
+  flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#renameMCTable .popup_main.with_menu {
+  flex-direction: row;
+}
 #renameMCTable .popup_main .popup_left {
   box-sizing: border-box;
-  width: 232px;
+  width: 216px;
   padding-right: 16px;
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
@@ -18603,11 +19051,30 @@ input#endDate {
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
+#renameMCTable .popup_main .popup_left button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  font-weight: 400;
+}
+#renameMCTable .popup_main .popup_left button .faicon {
+  font-size: 12px;
+  line-height: 14px;
+}
+#renameMCTable .popup_main .popup_left button .faicon::before {
+  margin-right: 8px;
+  font-size: 14px;
+  color: #1E88E5;
+}
 #renameMCTable .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
 }
-#renameMCTable .popup_main .popup_right fieldset {
+#renameMCTable .popup_main .popup_right .popup_right_note {
+  margin-bottom: 16px;
+  font-size: 16px;
+}
+#renameMCTable .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -18615,13 +19082,30 @@ input#endDate {
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-#renameMCTable .popup_main .popup_right fieldset legend {
+#renameMCTable .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-#renameMCTable .popup_main .popup_right fieldset .setting_line {
+#renameMCTable .popup_main .setting_line {
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+#renameMCTable .popup_main .setting_line:last-of-type {
+  margin-bottom: 0;
+}
+#renameMCTable .popup_main .setting_line label,
+#renameMCTable .popup_main .setting_line span {
+  font-size: 14px;
+}
+#renameMCTable .popup_main .settings_block {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
 }
+#renameMCTable .popup_main .settings_block label,
+#renameMCTable .popup_main .settings_block span {
+  font-size: 14px;
+}
 #renameMCTable .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
@@ -18688,11 +19172,15 @@ input#endDate {
 }
 #deleteMCTable .popup_main {
   display: flex;
+  flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#deleteMCTable .popup_main.with_menu {
+  flex-direction: row;
+}
 #deleteMCTable .popup_main .popup_left {
   box-sizing: border-box;
-  width: 232px;
+  width: 216px;
   padding-right: 16px;
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
@@ -18715,11 +19203,30 @@ input#endDate {
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
+#deleteMCTable .popup_main .popup_left button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  font-weight: 400;
+}
+#deleteMCTable .popup_main .popup_left button .faicon {
+  font-size: 12px;
+  line-height: 14px;
+}
+#deleteMCTable .popup_main .popup_left button .faicon::before {
+  margin-right: 8px;
+  font-size: 14px;
+  color: #1E88E5;
+}
 #deleteMCTable .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
 }
-#deleteMCTable .popup_main .popup_right fieldset {
+#deleteMCTable .popup_main .popup_right .popup_right_note {
+  margin-bottom: 16px;
+  font-size: 16px;
+}
+#deleteMCTable .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -18727,13 +19234,30 @@ input#endDate {
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-#deleteMCTable .popup_main .popup_right fieldset legend {
+#deleteMCTable .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-#deleteMCTable .popup_main .popup_right fieldset .setting_line {
+#deleteMCTable .popup_main .setting_line {
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+#deleteMCTable .popup_main .setting_line:last-of-type {
+  margin-bottom: 0;
+}
+#deleteMCTable .popup_main .setting_line label,
+#deleteMCTable .popup_main .setting_line span {
+  font-size: 14px;
+}
+#deleteMCTable .popup_main .settings_block {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
 }
+#deleteMCTable .popup_main .settings_block label,
+#deleteMCTable .popup_main .settings_block span {
+  font-size: 14px;
+}
 #deleteMCTable .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
diff --git a/resources/sass/admin_new/components/popup/basic.scss b/resources/sass/admin_new/components/popup/basic.scss
index 0af6c5a21..ad7a1c187 100644
--- a/resources/sass/admin_new/components/popup/basic.scss
+++ b/resources/sass/admin_new/components/popup/basic.scss
@@ -109,13 +109,18 @@
 
     .popup_main{
         display: flex;
+        flex-direction: column;
 
         border-bottom: 1px $dark-gray solid;
 
+        &.with_menu{
+            flex-direction: row;
+        }
+
         .popup_left{
             box-sizing: border-box;
 
-            width: 232px;
+            width: 216px;
             padding-right: 16px; 
             margin-right: 16px; 
 
@@ -146,30 +151,78 @@
                     }
                 }
             }
+
+            button{
+                display: flex;
+                align-items: center;
+
+                width: 100%;
+                font-weight: 400;
+
+                .faicon{
+                    font-size: 12px;
+                    line-height: 14px;
+
+                    &::before{
+                        margin-right: 8px;
+    
+                        font-size: 14px;
+                        color: $blue;
+                    }
+                }
+            }
         }
 
         .popup_right{
             overflow-y: auto;
             max-height: 70vh;
 
-            fieldset{
-                display: flex;
-                flex-direction: column;
-
-                padding: 16px 0 0 0;
+            .popup_right_note{
                 margin-bottom: 16px;
+                font-size: 16px;
+            }
+        }
 
-                border: 0;
-                border-top: 1px $gray solid;
+        fieldset{
+            display: flex;
+            flex-direction: column;
 
-                legend{
-                    padding: 0 8px 0 0;
-                    font-size: 14px;
-                }
+            padding: 16px 0 0 0;
+            margin-bottom: 16px;
 
-                .setting_line{
-                    margin-bottom: 16px;
-                }
+            border: 0;
+            border-top: 1px $gray solid;
+
+            legend{
+                padding: 0 8px 0 0;
+                font-size: 14px;
+            }
+        }
+
+        .setting_line{
+            margin-bottom: 8px;
+
+            font-size: 14px;
+
+            &:last-of-type{
+                margin-bottom: 0;
+            }
+
+            label,
+            span{
+                font-size: 14px;
+            }
+        }
+
+        .settings_block{
+            display: flex;
+            flex-direction: column;
+
+            margin-bottom: 16px;
+
+            label,
+            span{
+                font-size: 14px;
             }
         }
     }
diff --git a/resources/sass/admin_new/pages/survey_analysis/popups/profiles.scss b/resources/sass/admin_new/pages/survey_analysis/popups/profiles.scss
index da42415ae..ce86d0da0 100644
--- a/resources/sass/admin_new/pages/survey_analysis/popups/profiles.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/popups/profiles.scss
@@ -8,6 +8,19 @@ and open the template in the editor.
     Author     : podkrizniku
 */
 
+
+#zoom_profiles_right{
+
+    .settings_block{
+
+        .setting_line.indent{
+            padding-left: 16px;
+        }
+    }
+}
+
+
+
 .condition_profile_holder {
 	float: left;
 	width: 190px;