diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
index 1b82227b2..89c6e69bb 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
@@ -6176,7 +6176,7 @@ class SurveyChart {
 		$Test->setGraphArea(self::$quality*100,self::$quality*40,self::$quality*650,self::$quality*220);
 		$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*(243+$addHeight),5,255,255,255);
 		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight),200,200,200);
+		//self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight),200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 		
 		// Pri checkboxu lahko naredimo fiksno skalo
@@ -6318,7 +6318,7 @@ class SurveyChart {
 		
 		$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*(243+$addHeight+$addLegendSpace),5,255,255,255);
 		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight+$addLegendSpace),200,200,200);
+		//$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight+$addLegendSpace),200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 		
 		// Pri ordinalnih multigridih prikazemo skalo od 1 do stevila variabel (ce prikazujemo povprecja)
@@ -6480,7 +6480,7 @@ class SurveyChart {
 		
 		$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*(243+$addHeight),5,255,255,255);
 		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight),200,200,200);
+		//$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight),200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 		$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,$angle,0,TRUE,1,FALSE,$roundText);
 		$Test->drawGrid(4,TRUE,230,230,230,50);
@@ -6572,8 +6572,7 @@ class SurveyChart {
 		if($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 3){
 			$Test->setGraphArea(self::$quality*200,self::$quality*50,self::$quality*630,self::$quality*220);
 			$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*243,5,255,255,255);
-			//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-			$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*295,200,200,200);
+			//$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*295,200,200,200);
 			$Test->drawGraphArea(255,255,255,TRUE);
 			$Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,0,0,TRUE);
 			$Test->drawHorGrid(4,TRUE,230,230,230,50);
@@ -6582,8 +6581,7 @@ class SurveyChart {
 		elseif($rightScale){
 			$Test->setGraphArea(self::$quality*270,self::$quality*50,self::$quality*530,self::$quality*(220+$addHeight));
 			$Test->drawFilledRoundedRectangle(7,7,793,243+$addHeight,5,255,255,255);
-			//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-			$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(295+$addHeight),200,200,200);
+			//$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(295+$addHeight),200,200,200);
 			$Test->drawGraphArea(255,255,255,TRUE);
 					
 			$Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0/*SCALE_START0*/,0,0,0,TRUE,0,0,TRUE,1,$rightScale,$roundText=40);
@@ -6592,8 +6590,7 @@ class SurveyChart {
 		else{
 			$Test->setGraphArea(self::$quality*$startX,self::$quality*50,self::$quality*650,self::$quality*(220+$addHeight));
 			$Test->drawFilledRoundedRectangle(7,7,793,243+$addHeight,5,255,255,255);
-			//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-			$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(295+$addHeight),200,200,200);
+			//$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(295+$addHeight),200,200,200);
 			$Test->drawGraphArea(255,255,255,TRUE);
 			$Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,0,0,TRUE,1,FALSE,$roundText);
 			$Test->drawHorGrid(4,TRUE,230,230,230,50);
@@ -6667,12 +6664,8 @@ class SurveyChart {
 		
 		$Test->setLineStyle(self::$quality,$DotSize=0);
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
-		//$Test->setGraphArea(50,40,685,220);
 		$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*273,5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*275,200,200,200);
-		//$Test->createColorGradientPalette(195,204,56,223,110,41,3);
-		//$Test->createColorGradientPalette(168,188,56,248,255,136,5);
+		//$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*275,200,200,200);
 		
 		
 		// Pri vsoti ne izpisujemo procentov
@@ -6743,13 +6736,8 @@ class SurveyChart {
 		
 		$Test->setLineStyle(self::$quality,$DotSize=0);
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
-		//$Test->setGraphArea(50,40,685,220);
 		$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*273,5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*275,200,200,200);
-		//$Test->createColorGradientPalette(195,204,56,223,110,41,3);
-		//$Test->createColorGradientPalette(168,188,56,248,255,136,5);
-		
+		//$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*275,200,200,200);		
 		
 		// Pri vsoti ne izpisujemo procentov
 		if($spremenljivka['tip'] == 18 || ($spremenljivka['tip'] == 1 && self::$settings['type'] == 2 && self::$settings['value_type'] == 1))
@@ -6838,8 +6826,7 @@ class SurveyChart {
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
 		$Test->setGraphArea(self::$quality*100,self::$quality*40,self::$quality*650,self::$quality*220);
 		$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*273,5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*275,200,200,200);
+		//$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*275,200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 		
 		// Pri checkboxu lahko naredimo fiksno skalo
@@ -6931,8 +6918,7 @@ class SurveyChart {
 		$Test->setGraphArea(self::$quality*270,self::$quality*50,self::$quality*530,self::$quality*(220+$addHeight));
 		
 		$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*(243+$addHeight),5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight),200,200,200);
+		//$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight),200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 				
 		$Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,0,0,0,TRUE,0,0,TRUE,1,$rightScale,$roundText=40);
@@ -6996,11 +6982,7 @@ class SurveyChart {
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
 		$Test->setGraphArea(self::$quality*100,self::$quality*40,self::$quality*650,self::$quality*320);
 		$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*343,5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*345,200,200,200);
-		//$Test->drawGraphArea(255,255,255,TRUE);
-		//$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,20,20,20,TRUE,$angle,0,TRUE,1,FALSE,$roundText);
-		//$Test->drawGrid(4,TRUE,230,230,230,50);
+		//$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*345,200,200,200);
 
 		// Draw the 0 line
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
@@ -7072,7 +7054,7 @@ class SurveyChart {
 
 		//moznost osvezevanja grafov - ne uporabljamo zaenkrat
 		if($admin_type < 2 && false)
-			echo '<a href="'.$site_url.'?anketa='.self::$anketa.'&a=analysis&m=charts&refresh=1"><img src="img_0/random_off.png" title="Osveži grafe" /></a>';	
+			echo '<a href="'.$site_url.'?anketa='.self::$anketa.'&a=analysis&m=charts&refresh=1" title="Osveži grafe"><span class="faicon refresh"></span></a>';	
 		
 		// Izrisemo ostale filtre
 		SurveyAnalysis::DisplayFilters(self::$quality);
@@ -7182,16 +7164,18 @@ class SurveyChart {
 		self::displayExportIcons($spid);
 		
 		
-		echo '<div id="switch_left_'.$spid.'_loop_'.self::$current_loop.'" class="switch_left '.(self::$settings_mode == 1 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$spid.'\', \'0\', \''.self::$current_loop.'\')">'.$lang['srv_chart_settings_basic'].'</div>';		
-		//echo '<span id="switch_middle_'.$spid.'_loop_'.self::$current_loop.'" class="'.(self::$settings_mode == 1 ? 'rightHighlight' : 'leftHighlight').'"></span>';	
-		echo '<div id="switch_right_'.$spid.'_loop_'.self::$current_loop.'" class="switch_right '.(self::$settings_mode == 0 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$spid.'\', \'1\', \''.self::$current_loop.'\')">'.$lang['srv_chart_settings_advanced'].'</div>';
+        echo '<div class="chart_settings_content">';
+        
+
+        echo '<div class="tab_holder">';
+		echo '  <div id="switch_left_'.$spid.'_loop_'.self::$current_loop.'" class="tab switch_left '.(self::$settings_mode == 1 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$spid.'\', \'0\', \''.self::$current_loop.'\')">'.$lang['srv_chart_settings_basic'].'</div>';		
+		echo '  <div id="switch_right_'.$spid.'_loop_'.self::$current_loop.'" class="tab switch_right '.(self::$settings_mode == 0 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$spid.'\', \'1\', \''.self::$current_loop.'\')">'.$lang['srv_chart_settings_advanced'].'</div>';
+        echo '</div>';
 		
 		
 		// OSNOVNE NASTAVITVE
 		echo '<div class="chart_settings_inner" id="chart_settings_basic_'.$spid.'_loop_'.self::$current_loop.'" '.(self::$settings_mode == 1 ? ' style="display:none;"' : '').'>';
 		
-		//echo '<span class="title">'.$lang['srv_chart_settings'].'</span>';
-
 		switch($spremenljivka['tip']){
 			case 1:
 			case 3:
@@ -7251,12 +7235,9 @@ class SurveyChart {
 		//SurveyAnalysis::showVariable($spid, $spremenljivka['variable']);
 		echo '<div class="chart_setting" style="text-align: center; margin-top: 20px;">';
 		echo '<span style="margin-right: 6px; line-height: 6px; font-weight: 600; font-size: 11px;">';
-		//echo $lang['srv_vprasanje'].': ';
-		echo $spremenljivka['variable'];
+        echo $spremenljivka['variable'];
 		echo '</span>';
-		//echo '<a href="/" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="preview_spremenljivka_analiza(\'' . $spid . '\'); return false;"><span class="sprites preview"></span></a>';
 		echo '<a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\''.$spid.'\'); return false;"><span class="faicon preview"></span></a> ';	
-		//echo '</div>';
 			
 		//echo '<div class="chart_setting" style="text-align: center;">';
 		SurveyAnalysis::showIcons($spid,$spremenljivka,$_from='charts');
@@ -7312,30 +7293,9 @@ class SurveyChart {
 								
 			default:
 				break;
-		}
-		
-		// Link na urejanje label
-		echo '<span class="edit" style="margin-top:15px;" onclick="chartAdvancedSettings(\''.$spid.'\', 1, \''.self::$current_loop.'\');">'.$lang['srv_chart_advancedLink_labels'].'</span>';	
-		// Vprasajcek za pomoc
-		echo Help :: display('displaychart_settings_labels');
-		
-		// Link na urejanje barv
-		echo '<span class="edit" onclick="chartAdvancedSettings(\''.$spid.'\', \'2\', \''.self::$current_loop.'\');">'.$lang['srv_chart_advancedLink_colors'].'</span>';	
-		// Vprasajcek za pomoc
-		echo Help :: display('displaychart_settings_colors');		
-		
-		// Link na rekodiranje
-		echo '<span class="edit" onclick="chartAdvancedSettings(\''.$spid.'\', \'3\', \''.self::$current_loop.'\');">'.$lang['srv_chart_advancedLink_recoding'].'</span>';	
-		// Vprasajcek za pomoc
-		echo Help :: display('displaychart_settings_recoding');
-		
-		// Link na napredne number (radio dropdown numeric, number, date) nastavitve
-		if(($spremenljivka['tip'] == 3 && self::checkDropdownNumeric($spid)) || $spremenljivka['tip'] == 7 || $spremenljivka['tip'] == 8 || $spremenljivka['tip'] == 22){
-			echo '<span class="edit" onclick="chartAdvancedSettings(\''.$spid.'\', \'4\', \''.self::$current_loop.'\');">'.$lang['srv_chart_advancedLink_limits'].'</span>';	
-			// Vprasajcek za pomoc
-			//echo Help :: display('displaychart_settings_number');
-		}
-			
+		}			
+
+        echo '</div>';
 			
 		echo '</div>';
 	}
@@ -7352,18 +7312,21 @@ class SurveyChart {
 		// linki
 		echo '<div class="chart_setting_exportLinks">';
 				
-			// Ikona za print
-			echo '<a href="#" onclick="showAnalizaSingleChartPopup(\''.$spid.'\',\''.M_ANALYSIS_CHARTS.'\'); return false;">';		
-			echo '<span class="faicon print_small icon-grey_dark_link" title="' . $lang['PRN_Izpis'] . '"></span>';
-			echo '</a>';
+        // Ikona za print
+        echo '<a href="#" onclick="showAnalizaSingleChartPopup(\''.$spid.'\',\''.M_ANALYSIS_CHARTS.'\'); return false;">';		
+        echo '<span class="faicon print_small icon-grey_dark_link" title="' . $lang['PRN_Izpis'] . '"></span>';
+        echo '</a>';
+
+        // Izvoz posameznega grafa v PDF/RTF/PPT
+        echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts&anketa='.self::$anketa.'&sprID='.$spid.'&loop='.$loop).'" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf"></span></a>';
+        echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_rtf&anketa='.self::$anketa.'&sprID='.$spid.'&loop='.$loop).'" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf"></span></a>';
+        // V PPT zaenkrat ne izvazamo tabel
+        if($spremenljivka['tip'] != 4 && $spremenljivka['tip'] != 19 && $spremenljivka['tip'] != 21)
+            echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_ppt&anketa='.self::$anketa.'&sprID='.$spid.'&loop='.$loop).'" target="_blank" title="'.$lang['PPT_Izpis'].'"><span class="faicon ppt"></span></a>';
+        
+        // Gumb za nastavitve
+        echo '<button class="small white-blue" onClick="chartAdvancedSettings(\''.$spid.'\', 1, \''.self::$current_loop.'\');"><span class="faicon wheel_32"></span>'.$lang['settings'].'</button>';
 
-			// Izvoz posameznega grafa v PDF/RTF/PPT
-			echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts&anketa='.self::$anketa.'&sprID='.$spid.'&loop='.$loop).'" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf"></span></a>';
-			echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_rtf&anketa='.self::$anketa.'&sprID='.$spid.'&loop='.$loop).'" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf"></span></a>';
-			// V PPT zaenkrat ne izvazamo tabel
-			if($spremenljivka['tip'] != 4 && $spremenljivka['tip'] != 19 && $spremenljivka['tip'] != 21)
-				echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_ppt&anketa='.self::$anketa.'&sprID='.$spid.'&loop='.$loop).'" target="_blank" title="'.$lang['PPT_Izpis'].'"><span class="faicon ppt"></span></a>';
-			
 		echo '</div>';
 	}
 	
@@ -7378,7 +7341,7 @@ class SurveyChart {
 		if($spremenljivka['tip'] == 3 && self::checkDropdownNumeric($spid)){
 			// Tip grafa
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 1, \'type\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_type'].':<br /> <select class="dropdown small" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 1, \'type\', \''.self::$current_loop.'\');">';
 				
 			echo '  <option value="5" '.($settings['type']=='5'?' selected="selected"':'').'>'.$lang['srv_chart_group_horizontal'].'</option>';
 			echo '  <option value="6" '.($settings['type']=='6'?' selected="selected"':'').'>'.$lang['srv_chart_group_vertical'].'</option>';
@@ -7391,7 +7354,7 @@ class SurveyChart {
 			
 			// tip izpisa vrednosti
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_valtype'].': <select id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 1, \'value_type\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_valtype'].': <select class="dropdown small" id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 1, \'value_type\', \''.self::$current_loop.'\');">';
 				
 			echo '  <option value="0" '.($settings['value_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_freq'].'</option>';
 			echo '  <option value="1" '.($settings['value_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_percent'].'</option>';
@@ -7404,7 +7367,7 @@ class SurveyChart {
 			if($settings['type'] < 5){
 				echo '<div class="chart_setting">';
 				
-				echo $lang['srv_chart_sort'].': <select id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 1, \'sort\', \''.self::$current_loop.'\');">';
+				echo $lang['srv_chart_sort'].': <select class="dropdown small" id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 1, \'sort\', \''.self::$current_loop.'\');">';
 				
 				echo '  <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
 				echo '  <option value="1" '.($settings['sort']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_sort_desc'].'</option>';
@@ -7418,7 +7381,7 @@ class SurveyChart {
 			// stevilo intervalov
 			if($settings['type'] > 4){
 				echo '<div class="chart_setting">';
-				echo $lang['srv_chart_interval'].': <select id="chart_interval_'.$spid.'_loop_'.self::$current_loop.'" name="chart_interval" onchange="changeChart(\''.$spid.'\', 1, \'interval\', \''.self::$current_loop.'\');">';
+				echo $lang['srv_chart_interval'].': <select class="dropdown small" id="chart_interval_'.$spid.'_loop_'.self::$current_loop.'" name="chart_interval" onchange="changeChart(\''.$spid.'\', 1, \'interval\', \''.self::$current_loop.'\');">';
 				
 				for($i=3; $i<=10; $i++){				
 					echo '  <option value="'.$i.'" '.($settings['interval']==$i ?' selected="selected"':'').'>'.$i.'</option>';
@@ -7436,8 +7399,8 @@ class SurveyChart {
 			if($settings['type'] == 0 || $settings['type'] == 1 || $settings['type'] == 3 || $settings['type'] == 4){
 				echo '<div class="chart_setting">';
 				
-				echo $lang['srv_chart_barLabel'].': ';
 				echo '<input type="checkbox" id="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 1, \'barLabel\', \''.self::$current_loop.'\');">';
+				echo '<label for="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabel'].'</label>';
 
 				echo '</div>';
 			}
@@ -7447,7 +7410,7 @@ class SurveyChart {
 		else{
 			// Tip grafa
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 1, \'type\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_type'].':<br /> <select class="dropdown small" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 1, \'type\', \''.self::$current_loop.'\');">';
 				
 			echo '  <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_horizontal'].'</option>';
 			echo '  <option value="1" '.($settings['type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_vertical'].'</option>';
@@ -7465,7 +7428,7 @@ class SurveyChart {
 			if($settings['type'] != 9){
 				echo '<div class="chart_setting">';
 				
-				echo $lang['srv_chart_sort'].': <select id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 1, \'sort\', \''.self::$current_loop.'\');">';
+				echo $lang['srv_chart_sort'].': <select class="dropdown small" id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 1, \'sort\', \''.self::$current_loop.'\');">';
 					
 				echo '  <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
 				echo '  <option value="1" '.($settings['sort']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_sort_desc'].'</option>';
@@ -7479,7 +7442,7 @@ class SurveyChart {
 			// tip izpisa vrednosti	
 			if($settings['type'] != 9){
 				echo '<div class="chart_setting">';
-				echo $lang['srv_chart_valtype'].': <select id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 1, \'value_type\', \''.self::$current_loop.'\');">';
+				echo $lang['srv_chart_valtype'].': <select class="dropdown small" id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 1, \'value_type\', \''.self::$current_loop.'\');">';
 					
 				echo '  <option value="0" '.($settings['value_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_valid'].'</option>';
 				echo '  <option value="1" '.($settings['value_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_freq'].'</option>';
@@ -7494,8 +7457,8 @@ class SurveyChart {
 			if($settings['type'] == 2 || $settings['type'] == 8){
 				echo '<div class="chart_setting">';
 				
-				echo $lang['srv_analiza_legenda'].': ';
 				echo '<input type="checkbox" id="chart_show_legend_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_legend" '.($settings['show_legend']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 1, \'show_legend\', \''.self::$current_loop.'\');">';
+				echo '<label for="chart_show_legend_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_analiza_legenda'].'</label>';
 
 				echo '</div>';
 			}
@@ -7504,8 +7467,8 @@ class SurveyChart {
 			if($settings['type'] == 0 || $settings['type'] == 1 || $settings['type'] == 3 || $settings['type'] == 4 || $settings['type'] == 9){
 				echo '<div class="chart_setting">';
 				
-				echo $lang['srv_chart_barLabel'].': ';
 				echo '<input type="checkbox" id="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 1, \'barLabel\', \''.self::$current_loop.'\');">';
+				echo '<label for="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabel'].'</label>';
 
 				echo '</div>';
 			}
@@ -7524,8 +7487,8 @@ class SurveyChart {
 		
 		$checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': '';
 
-		echo $lang['srv_chart_showNumerus'].': ';
 		echo '<input type="checkbox" id="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_numerus" '.$checked.' onchange="changeChart(\''.$spid.'\', 1, \'show_numerus\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_showNumerus'].'</label>';
 
 		echo '</div>';
 		
@@ -7536,8 +7499,8 @@ class SurveyChart {
 			$vars = count($spremenljivka['options']);	
 			$checked = ($settings['show_avg']=='1' || ($settings['show_avg']=='-1' && $vars == 5 && SurveyDataSettingProfiles :: getSetting('chartAvgText') == 1)) ? ' checked="checked"': '';
 			
-			echo $lang['srv_chart_showAvg'].': ';
 			echo '<input type="checkbox" id="chart_show_avg_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_avg" '.$checked.' onchange="changeChart(\''.$spid.'\', 1, \'show_avg\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_show_avg_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_showAvg'].'</label>';
 
 			echo '</div>';
 		}
@@ -7546,7 +7509,7 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 3){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_wide_chart'].': <select id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 1, \'labelWidth\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_wide_chart'].': <select class="dropdown small" id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 1, \'labelWidth\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="75" '.($settings['labelWidth']=='75'?' selected="selected"':'').'>75%</option>';
 			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
@@ -7556,23 +7519,13 @@ class SurveyChart {
 			
 			echo '</div>';
 		}
-		
-		// 3D strukturni krog
-		/*if($settings['type'] == 2){
-			echo '<div class="chart_setting">';
-			
-			echo $lang['srv_chart_3d_pie'].': ';
-			echo '<input type="checkbox" id="chart_3d_pie_'.$spid.'_loop_'.self::$current_loop.'" name="chart_3d_pie" '.($settings['3d_pie']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 1, \'3d_pie\', \''.self::$current_loop.'\');">';
-
-			echo '</div>';	
-		}*/
-		
+				
 		// Izpusti variable brez odgovora
 		if(($spremenljivka['tip'] != 3 || !self::checkDropdownNumeric($spid)) && $settings['type'] != 9){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_hideEmtyVar'].': ';
 			echo '<input type="checkbox" id="chart_hideEmptyVar_'.$spid.'_loop_'.self::$current_loop.'" name="chart_hideEmptyVar" '.($settings['hideEmptyVar']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 1, \'hideEmptyVar\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_hideEmptyVar_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_hideEmtyVar'].'</label>';
 
 			echo '</div>';	
 		}
@@ -7581,8 +7534,8 @@ class SurveyChart {
 		if($settings['barLabel'] == 1 && ($settings['type'] == 0 || $settings['type'] == 1)){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_barLabelSmall'].': ';
 			echo '<input type="checkbox" id="chart_barLabelSmall_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabelSmall" '.($settings['barLabelSmall']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 1, \'barLabelSmall\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_barLabelSmall_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabelSmall'].'</label>';
 
 			echo '</div>';
 		}
@@ -7613,7 +7566,7 @@ class SurveyChart {
 		
 		// omejitev skale
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_base'].': <select id="chart_base_'.$spid.'_loop_'.self::$current_loop.'" name="chart_base" onchange="changeChart(\''.$spid.'\', 2, \'base\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_base'].': <select class="dropdown small" id="chart_base_'.$spid.'_loop_'.self::$current_loop.'" name="chart_base" onchange="changeChart(\''.$spid.'\', 2, \'base\', \''.self::$current_loop.'\');">';
 			
 		echo '  <option value="0" '.($settings['base']=='0'?' selected="selected"':'').'>'.$lang['srv_analiza_opisne_units'].'</option>';
 		echo '  <option value="1" '.($settings['base']=='1'?' selected="selected"':'').'>'.$lang['srv_analiza_opisne_arguments'].'</option>';
@@ -7623,7 +7576,7 @@ class SurveyChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 2, \'type\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_type'].':<br /> <select class="dropdown small" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 2, \'type\', \''.self::$current_loop.'\');">';
 			
 		echo '  <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_horizontal'].'</option>';
 		echo '  <option value="1" '.($settings['type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_vertical'].'</option>';
@@ -7644,7 +7597,7 @@ class SurveyChart {
 		// Tip radarja		
 		if($settings['type'] == '5'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_type'].': <select id="chart_radar_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_type" onchange="changeChart(\''.$spid.'\', 2, \'radar_type\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_radar_type'].': <select class="dropdown small" id="chart_radar_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_type" onchange="changeChart(\''.$spid.'\', 2, \'radar_type\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="0" '.($settings['radar_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type1'].'</option>';
@@ -7656,7 +7609,7 @@ class SurveyChart {
 		// Postavitev skale pri radarju
 		if($settings['type'] == '5'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_scale'].': <select id="chart_radar_scale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_scale" onchange="changeChart(\''.$spid.'\', 2, \'radar_scale\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_radar_scale'].': <select class="dropdown small" id="chart_radar_scale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_scale" onchange="changeChart(\''.$spid.'\', 2, \'radar_scale\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="0" '.($settings['radar_scale']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_scale']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale1'].'</option>';
@@ -7667,7 +7620,7 @@ class SurveyChart {
 		
 		// tip izpisa vrednosti
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_valtype'].': <select id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 2, \'value_type\', \''.self::$current_loop.'\');" '.($settings['type'] == 2 ? 'disabled="disabled"' : '').'>';
+		echo $lang['srv_chart_valtype'].': <select class="dropdown small" id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 2, \'value_type\', \''.self::$current_loop.'\');" '.($settings['type'] == 2 ? 'disabled="disabled"' : '').'>';
 			
 		if($settings['base'] != '1')
 			echo '  <option value="0" '.($settings['value_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_valid'].'</option>';
@@ -7681,7 +7634,7 @@ class SurveyChart {
 		if($settings['type'] != 5){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_sort'].': <select id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 2, \'sort\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_sort'].': <select class="dropdown small" id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 2, \'sort\', \''.self::$current_loop.'\');">';
 				
 			echo '  <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
 			echo '  <option value="1" '.($settings['sort']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_sort_desc'].'</option>';
@@ -7696,8 +7649,8 @@ class SurveyChart {
 		if($settings['type'] == 2 || $settings['type'] == 7){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_analiza_legenda'].': ';
 			echo '<input type="checkbox" id="chart_show_legend_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_legend" '.($settings['show_legend']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 2, \'show_legend\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_show_legend_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_analiza_legenda'].'</label>';
 
 			echo '</div>';
 		}
@@ -7706,8 +7659,8 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 1 || $settings['type'] == 3 || $settings['type'] == 4){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_barLabel'].': ';
 			echo '<input type="checkbox" id="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 2, \'barLabel\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabel'].'</label>';
 
 			echo '</div>';
 		}
@@ -7723,8 +7676,8 @@ class SurveyChart {
 		
 		$checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': '';
 
-		echo $lang['srv_chart_showNumerus'].': ';
 		echo '<input type="checkbox" id="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_numerus" '.$checked.' onchange="changeChart(\''.$spid.'\', 2, \'show_numerus\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_showNumerus'].'</label>';
 
 		echo '</div>';
 			
@@ -7732,7 +7685,7 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 3){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_wide_chart'].': <select id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 2, \'labelWidth\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_wide_chart'].': <select class="dropdown small" id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 2, \'labelWidth\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="75" '.($settings['labelWidth']=='75'?' selected="selected"':'').'>75%</option>';
 			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
@@ -7746,8 +7699,8 @@ class SurveyChart {
 		// Izpusti variable brez odgovora
 		echo '<div class="chart_setting">';
 		
-		echo $lang['srv_chart_hideEmtyVar'].': ';
 		echo '<input type="checkbox" id="chart_hideEmptyVar_'.$spid.'_loop_'.self::$current_loop.'" name="chart_hideEmptyVar" '.($settings['hideEmptyVar']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 2, \'hideEmptyVar\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_hideEmptyVar_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_hideEmtyVar'].'</label>';
 
 		echo '</div>';	
 		
@@ -7755,8 +7708,8 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 1 || $settings['type'] == 6){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_settings_fullScale'].': ';
 			echo '<input type="checkbox" id="chart_noFixedScale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_noFixedScale" '.($settings['noFixedScale']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 2, \'noFixedScale\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_noFixedScale_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_settings_fullScale'].'</label>';
 
 			echo '</div>';
 		}
@@ -7765,21 +7718,11 @@ class SurveyChart {
 		if($settings['barLabel'] == 1 && ($settings['type'] == 0 || $settings['type'] == 1)){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_barLabelSmall'].': ';
 			echo '<input type="checkbox" id="chart_barLabelSmall_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabelSmall" '.($settings['barLabelSmall']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 2, \'barLabelSmall\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_barLabelSmall_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabelSmall'].'</label>';
 
 			echo '</div>';
 		}		
-		
-		// 3D strukturni krog
-		/*if($settings['type'] == 2){
-			echo '<div class="chart_setting">';
-			
-			echo $lang['srv_chart_3d_pie'].': ';
-			echo '<input type="checkbox" id="chart_3d_pie_'.$spid.'_loop_'.self::$current_loop.'" name="chart_3d_pie" '.($settings['3d_pie']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 2, \'3d_pie\', \''.self::$current_loop.'\');">';
-
-			echo '</div>';	
-		}*/
 	}
 	
 	// Nastavitve za number grafe (tip 7)
@@ -7789,7 +7732,7 @@ class SurveyChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 7, \'type\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_type'].':<br /> <select class="dropdown small" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 7, \'type\', \''.self::$current_loop.'\');">';
 			
 		echo '  <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_group_horizontal'].'</option>';
 		echo '  <option value="1" '.($settings['type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_group_vertical'].'</option>';
@@ -7804,7 +7747,7 @@ class SurveyChart {
 		// tip izpisa vrednosti
 		if($settings['type'] != 9){
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_valtype'].': <select id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 7, \'value_type\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_valtype'].': <select class="dropdown small" id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 7, \'value_type\', \''.self::$current_loop.'\');">';
 				
 			echo '  <option value="0" '.($settings['value_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_freq'].'</option>';
 			echo '  <option value="1" '.($settings['value_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_percent'].'</option>';
@@ -7818,7 +7761,7 @@ class SurveyChart {
 		if($settings['type'] > 2 && $settings['type'] != 9){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_sort'].': <select id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 7, \'sort\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_sort'].': <select class="dropdown small" id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 7, \'sort\', \''.self::$current_loop.'\');">';
 				
 			echo '  <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
 			echo '  <option value="1" '.($settings['sort']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_sort_desc'].'</option>';
@@ -7832,14 +7775,12 @@ class SurveyChart {
 		// stevilo intervalov
 		if($settings['type'] < 3){
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_interval'].': <select id="chart_interval_'.$spid.'_loop_'.self::$current_loop.'" name="chart_interval" onchange="changeChart(\''.$spid.'\', 7, \'interval\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_interval'].': <select class="dropdown small" id="chart_interval_'.$spid.'_loop_'.self::$current_loop.'" name="chart_interval" onchange="changeChart(\''.$spid.'\', 7, \'interval\', \''.self::$current_loop.'\');">';
 				
 			for($i=3; $i<=10; $i++){				
 				echo '  <option value="'.$i.'" '.($settings['interval']==$i ?' selected="selected"':'').'>'.$i.'</option>';
 			}
 			echo '  <option value="20" '.($settings['interval']=='20'?' selected="selected"':'').'>20</option>';
-			//echo '  <option value="50" '.($settings['interval']=='50'?' selected="selected"':'').'>50</option>';
-			//echo '  <option value="100" '.($settings['interval']=='100'?' selected="selected"':'').'>100</option>';
 			echo '  <option value="-1" '.($settings['interval']=='-1'?' selected="selected"':'').'>Vsi</option>';
 			
 			echo '</select>';
@@ -7849,47 +7790,10 @@ class SurveyChart {
 		// prikaz legende
 		echo '<div class="chart_setting">';
 		
-		echo $lang['srv_analiza_legenda'].': ';
 		echo '<input type="checkbox" id="chart_show_legend_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_legend" '.($settings['show_legend']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 7, \'show_legend\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_show_legend_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_analiza_legenda'].'</label>';
 
 		echo '</div>';
-		
-		// div z nastavitvami za zgornjo in spodnjo mejo
-		/*echo '<fieldset class="chart_num_limits"><legend>'.$lang['srv_chart_num_limit'].'</legend>';
-		
-		// min
-		echo '<div class="chart_setting">';
-		
-		echo $lang['srv_chart_min'].': ';
-		echo '<input type="text" id="chart_min_'.$spid.'_loop_'.self::$current_loop.'" name="chart_min" value="'.$settings['min'].'" onBlur="changeChart(\''.$spid.'\', 7, \'min\', \''.self::$current_loop.'\');" onkeypress="checkNumber(this, 6, 0);" onkeyup="checkNumber(this, 6, 0);" />';
-		
-		echo '</div>';
-		
-		// polodprt interval navzdol
-		echo '<div class="chart_setting" style="text-align:right;">';
-		
-		echo $lang['srv_chart_open_down'].': ';
-		echo '<input type="checkbox" id="chart_open_down_'.$spid.'_loop_'.self::$current_loop.'" name="chart_open_down" '.($settings['open_down']=='1'?' checked="checked"':'').' '.($settings['min']==''?' disabled="disabled"':'').' onchange="changeChart(\''.$spid.'\', 7, \'open_down\', \''.self::$current_loop.'\');">';
-
-		echo '</div>';
-		
-		// max
-		echo '<div class="chart_setting">';
-		
-		echo $lang['srv_chart_max'].': ';
-		echo '<input type="text" id="chart_max_'.$spid.'_loop_'.self::$current_loop.'" name="chart_max" value="'.$settings['max'].'" onBlur="changeChart(\''.$spid.'\', 7, \'max\', \''.self::$current_loop.'\');" onkeypress="checkNumber(this, 6, 0);" onkeyup="checkNumber(this, 6, 0);" />';
-		
-		echo '</div>';
-		
-		// polodprt interval navzgor
-		echo '<div class="chart_setting" style="text-align:right;">';
-		
-		echo $lang['srv_chart_open_up'].': ';
-		echo '<input type="checkbox" id="chart_open_up_'.$spid.'_loop_'.self::$current_loop.'" name="chart_open_up" '.($settings['open_up']=='1'?' checked="checked"':'').' '.($settings['max']==''?' disabled="disabled"':'').' onchange="changeChart(\''.$spid.'\', 7, \'open_up\', \''.self::$current_loop.'\');">';
-
-		echo '</div>';
-				
-		echo '</fieldset>';*/
 	}
 	
 	// Nastavitve za number grafe (tip 7)
@@ -7902,8 +7806,8 @@ class SurveyChart {
 		
 		$checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': '';
 
-		echo $lang['srv_chart_showNumerus'].': ';
 		echo '<input type="checkbox" id="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_numerus" '.$checked.' onchange="changeChart(\''.$spid.'\', 7, \'show_numerus\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_showNumerus'].'</label>';
 
 		echo '</div>';
 		
@@ -7913,8 +7817,8 @@ class SurveyChart {
 			
 			$checked = ($settings['show_avg']=='1' || ($settings['show_avg']=='-1' && SurveyDataSettingProfiles :: getSetting('chartAvgText') == 1)) ? ' checked="checked"': '';
 
-			echo $lang['srv_chart_showAvg'].': ';
 			echo '<input type="checkbox" id="chart_show_avg_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_avg" '.$checked.' onchange="changeChart(\''.$spid.'\', 7, \'show_avg\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_show_avg_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_showAvg'].'</label>';
 
 			echo '</div>';
 		}
@@ -7923,8 +7827,8 @@ class SurveyChart {
 		if($settings['type'] != 2){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_barLabel'].': ';
 			echo '<input type="checkbox" id="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 7, \'barLabel\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabel'].'</label>';
 
 			echo '</div>';
 		}
@@ -7933,8 +7837,8 @@ class SurveyChart {
 		if($settings['barLabel'] == 1 && $settings['type'] != 2 && $settings['type'] != 9){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_barLabelSmall'].': ';
 			echo '<input type="checkbox" id="chart_barLabelSmall_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabelSmall" '.($settings['barLabelSmall']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 7, \'barLabelSmall\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_barLabelSmall_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabelSmall'].'</label>';
 
 			echo '</div>';
 		}
@@ -7943,7 +7847,7 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 3){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_wide_chart'].': <select id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 7, \'labelWidth\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_wide_chart'].': <select class="dropdown small" id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 7, \'labelWidth\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="75" '.($settings['labelWidth']=='75'?' selected="selected"':'').'>75%</option>';
 			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
@@ -7962,7 +7866,7 @@ class SurveyChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 8, \'type\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_type'].':<br /> <select class="dropdown small" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 8, \'type\', \''.self::$current_loop.'\');">';
 			
 		echo '  <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_group_horizontal'].'</option>';
 		echo '  <option value="1" '.($settings['type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_group_vertical'].'</option>';
@@ -7976,7 +7880,7 @@ class SurveyChart {
 		// tip izpisa vrednosti
 		if($settings['type'] < 3){
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_valtype'].': <select id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 8, \'value_type\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_valtype'].': <select class="dropdown small" id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 8, \'value_type\', \''.self::$current_loop.'\');">';
 				
 			echo '  <option value="0" '.($settings['value_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_day'].'</option>';
 			echo '  <option value="1" '.($settings['value_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_month'].'</option>';
@@ -7990,7 +7894,7 @@ class SurveyChart {
 		if($settings['type'] > 2){
 			echo '<div class="chart_setting">';
 
-			echo $lang['srv_chart_sort'].': <select id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 8, \'sort\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_sort'].': <select class="dropdown small" id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 8, \'sort\', \''.self::$current_loop.'\');">';
 				
 			echo '  <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
 			echo '  <option value="1" '.($settings['sort']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_sort_desc'].'</option>';
@@ -8004,56 +7908,17 @@ class SurveyChart {
 		// stevilo intervalov
 		if($settings['type'] < 3){
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_interval'].': <select id="chart_interval_'.$spid.'_loop_'.self::$current_loop.'" name="chart_interval" onchange="changeChart(\''.$spid.'\', 8, \'interval\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_interval'].': <select class="dropdown small" id="chart_interval_'.$spid.'_loop_'.self::$current_loop.'" name="chart_interval" onchange="changeChart(\''.$spid.'\', 8, \'interval\', \''.self::$current_loop.'\');">';
 				
 			for($i=3; $i<=10; $i++){				
 				echo '  <option value="'.$i.'" '.($settings['interval']==$i ?' selected="selected"':'').'>'.$i.'</option>';
 			}
 			echo '  <option value="20" '.($settings['interval']=='20'?' selected="selected"':'').'>20</option>';
-			//echo '  <option value="50" '.($settings['interval']=='50'?' selected="selected"':'').'>50</option>';
-			//echo '  <option value="100" '.($settings['interval']=='100'?' selected="selected"':'').'>100</option>';
 			echo '  <option value="-1" '.($settings['interval']=='-1'?' selected="selected"':'').'>Vsi</option>';
 			
 			echo '</select>';
 			echo '</div>';
 		}
-		
-		// div z nastavitvami za zgornjo in spodnjo mejo
-		/*echo '<fieldset class="chart_num_limits"><legend>'.$lang['srv_chart_num_limit'].'</legend>';
-		
-		// min
-		echo '<div class="chart_setting">';
-		
-		echo $lang['srv_chart_min'].': ';
-		echo '<input type="text" id="chart_min_'.$spid.'_loop_'.self::$current_loop.'" name="chart_min" value="'.$settings['min'].'" onBlur="changeChart(\''.$spid.'\', 8, \'min\', \''.self::$current_loop.'\');" onkeypress="checkNumber(this, 6, 0);" onkeyup="checkNumber(this, 6, 0);" />';
-		
-		echo '</div>';
-		
-		// polodprt interval navdol
-		echo '<div class="chart_setting">';
-		
-		echo $lang['srv_chart_open_down'].': ';
-		echo '<input type="checkbox" id="chart_open_down_'.$spid.'_loop_'.self::$current_loop.'" name="chart_open_down" '.($settings['open_down']=='1'?' checked="checked"':'').' '.($settings['min']==''?' disabled="disabled"':'').' onchange="changeChart(\''.$spid.'\', 8, \'open_down\', \''.self::$current_loop.'\');">';
-
-		echo '</div>';	
-		
-		// max
-		echo '<div class="chart_setting">';
-		
-		echo $lang['srv_chart_max'].': ';
-		echo '<input type="text" id="chart_max_'.$spid.'_loop_'.self::$current_loop.'" name="chart_max" value="'.$settings['max'].'" onBlur="changeChart(\''.$spid.'\', 8, \'max\', \''.self::$current_loop.'\');" onkeypress="checkNumber(this, 6, 0);" onkeyup="checkNumber(this, 6, 0);" />';
-		
-		echo '</div>';
-		
-		// polodprt interval navgor
-		echo '<div class="chart_setting">';
-		
-		echo $lang['srv_chart_open_up'].': ';
-		echo '<input type="checkbox" id="chart_open_up_'.$spid.'_loop_'.self::$current_loop.'" name="chart_open_up" '.($settings['open_up']=='1'?' checked="checked"':'').' '.($settings['max']==''?' disabled="disabled"':'').' onchange="changeChart(\''.$spid.'\', 8, \'open_up\', \''.self::$current_loop.'\');">';
-
-		echo '</div>';	
-
-		echo '</fieldset>';*/
 	}
 	
 	// Nastavitve za datum grafe (tip 8)
@@ -8066,8 +7931,8 @@ class SurveyChart {
 		
 		$checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': '';
 
-		echo $lang['srv_chart_showNumerus'].': ';
 		echo '<input type="checkbox" id="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_numerus" '.$checked.' onchange="changeChart(\''.$spid.'\', 8, \'show_numerus\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_showNumerus'].'</label>';
 
 		echo '</div>';
 		
@@ -8075,7 +7940,7 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 3){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_wide_chart'].': <select id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 8, \'labelWidth\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_wide_chart'].': <select class="dropdown small" id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 8, \'labelWidth\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="75" '.($settings['labelWidth']=='75'?' selected="selected"':'').'>75%</option>';
 			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
@@ -8096,7 +7961,7 @@ class SurveyChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 6, \'type\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_type'].': <select class="dropdown small" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 6, \'type\', \''.self::$current_loop.'\');">';
 		
 		// Pri nominalnih ne prikazujemo povprecij
 		if($spremenljivka['skala'] != 1 && $spremenljivka['cnt_all'] != 1){
@@ -8121,15 +7986,13 @@ class SurveyChart {
 			echo '<div class="chart_setting">';	
 			if($settings['rotate']=='1'){
 				echo $lang['srv_chart_rotate_grids'].' ';
-				//echo '<input type="checkbox" id="chart_rotate_'.$spid.'_loop_'.self::$current_loop.'" name="chart_rotate" '.($settings['rotate']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 20, \'rotate\', \''.self::$current_loop.'\');">';
-				echo '<span onclick="changeChart(\''.$spid.'\', 6, \'rotate\', \''.self::$current_loop.'\');" style="cursor: pointer;"><img src="img_0/random_off.png" title="Obrni grafe/variable" /></span>';
+				echo '<span class="faicon refresh" onclick="changeChart(\''.$spid.'\', 6, \'rotate\', \''.self::$current_loop.'\');" style="cursor: pointer;" title="Obrni grafe/variable"></span>';
 				echo '<input type="hidden" id="chart_rotate_'.$spid.'_loop_'.self::$current_loop.'" name="chart_rotate" value="0">';
 				echo ' '.$lang['srv_chart_rotate_vars'].' ';
 			}
 			else{
 				echo $lang['srv_chart_rotate_vars'].' ';
-				//echo '<input type="checkbox" id="chart_rotate_'.$spid.'_loop_'.self::$current_loop.'" name="chart_rotate" '.($settings['rotate']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 20, \'rotate\', \''.self::$current_loop.'\');">';
-				echo '<span onclick="changeChart(\''.$spid.'\', 6, \'rotate\', \''.self::$current_loop.'\');" style="cursor: pointer;"><img src="img_0/random_off.png" title="Obrni grafe/variable" /></span>';
+				echo '<span class="faicon refresh" onclick="changeChart(\''.$spid.'\', 6, \'rotate\', \''.self::$current_loop.'\');" style="cursor: pointer;" title="Obrni grafe/variable"></span>';
 				echo '<input type="hidden" id="chart_rotate_'.$spid.'_loop_'.self::$current_loop.'" name="chart_rotate" value="1">';
 				echo ' '.$lang['srv_chart_rotate_grids'];
 			}
@@ -8140,7 +8003,7 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 5 || $settings['type'] == 6){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_sort'].': <select id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 6, \'sort\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_sort'].': <select class="dropdown small" id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 6, \'sort\', \''.self::$current_loop.'\');">';
 				
 			echo '  <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
 			echo '  <option value="1" '.($settings['sort']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_sort_desc'].'</option>';
@@ -8154,7 +8017,7 @@ class SurveyChart {
 		else{
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_sort'].': <select id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 6, \'sort\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_sort'].': <select class="dropdown small" id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 6, \'sort\', \''.self::$current_loop.'\');">';
 				
 			echo '  <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
 			echo '  <option value="1" '.($settings['sort']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_sort_category'].'</option>';
@@ -8170,7 +8033,7 @@ class SurveyChart {
 		// tip izpisa vrednosti
 		if(($settings['type'] > 0 && $settings['type'] < 5) || $settings['type'] == 7){
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_valtype'].': <select id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 6, \'value_type\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_valtype'].': <select class="dropdown small" id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 6, \'value_type\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="0" '.($settings['value_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_valid'].'</option>';	
 			echo '  <option value="1" '.($settings['value_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_freq'].'</option>';
@@ -8183,7 +8046,7 @@ class SurveyChart {
 		// Tip radarja		
 		if($settings['type'] == 5 || $settings['type'] == 7){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_type'].': <select id="chart_radar_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_type" onchange="changeChart(\''.$spid.'\', 6, \'radar_type\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_radar_type'].': <select class="dropdown small" id="chart_radar_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_type" onchange="changeChart(\''.$spid.'\', 6, \'radar_type\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="0" '.($settings['radar_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type1'].'</option>';
@@ -8195,7 +8058,7 @@ class SurveyChart {
 		// Postavitev skale pri radarju
 		if($settings['type'] == 5 || $settings['type'] == 7){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_scale'].': <select id="chart_radar_scale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_scale" onchange="changeChart(\''.$spid.'\', 6, \'radar_scale\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_radar_scale'].': <select class="dropdown small" id="chart_radar_scale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_scale" onchange="changeChart(\''.$spid.'\', 6, \'radar_scale\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="0" '.($settings['radar_scale']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_scale']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale1'].'</option>';
@@ -8208,8 +8071,8 @@ class SurveyChart {
 		if($spremenljivka['enota'] == 1 && ($settings['type'] == 2 || $settings['type'] == 6)){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_right_scale'].': ';
 			echo '<input type="checkbox" id="chart_scale_limit_'.$spid.'_loop_'.self::$current_loop.'" name="chart_scale_limit" '.($settings['scale_limit']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 6, \'scale_limit\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_scale_limit_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_right_scale'].'</label>';
 
 			echo '</div>';
 		}
@@ -8218,8 +8081,8 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 5 || $settings['type'] == 6){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_analiza_legenda'].': ';
 			echo '<input type="checkbox" id="chart_show_legend_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_legend" '.($settings['show_legend']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 6, \'show_legend\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_show_legend_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_analiza_legenda'].'</label>';
 
 			echo '</div>';
 		}
@@ -8228,8 +8091,8 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 1 || $settings['type'] == 2){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_barLabel'].': ';
 			echo '<input type="checkbox" id="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 6, \'barLabel\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabel'].'</label>';
 
 			echo '</div>';
 		}
@@ -8247,8 +8110,8 @@ class SurveyChart {
 		
 		$checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': '';
 
-		echo $lang['srv_chart_showNumerus'].': ';
 		echo '<input type="checkbox" id="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_numerus" '.$checked.' onchange="changeChart(\''.$spid.'\', 6, \'show_numerus\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_showNumerus'].'</label>';
 
 		echo '</div>';
 		
@@ -8256,7 +8119,7 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 2 || $settings['type'] == 4){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_wide_chart'].': <select id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 6, \'labelWidth\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_wide_chart'].': <select class="dropdown small" id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 6, \'labelWidth\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="75" '.($settings['labelWidth']=='75'?' selected="selected"':'').'>75%</option>';
 			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
@@ -8270,8 +8133,8 @@ class SurveyChart {
 		// Izpusti variable brez odgovora
 		echo '<div class="chart_setting">';
 		
-		echo $lang['srv_chart_hideEmtyVar'].': ';
 		echo '<input type="checkbox" id="chart_hideEmptyVar_'.$spid.'_loop_'.self::$current_loop.'" name="chart_hideEmptyVar" '.($settings['hideEmptyVar']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 6, \'hideEmptyVar\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_hideEmptyVar_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_hideEmtyVar'].'</label>';
 
 		echo '</div>';
 		
@@ -8279,8 +8142,8 @@ class SurveyChart {
 		if($settings['barLabel'] == 1 && $settings['type'] == 0){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_barLabelSmall'].': ';
 			echo '<input type="checkbox" id="chart_barLabelSmall_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabelSmall" '.($settings['barLabelSmall']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 6, \'barLabelSmall\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_barLabelSmall_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabelSmall'].'</label>';
 
 			echo '</div>';
 		}
@@ -8289,8 +8152,8 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 5 || $settings['type'] == 6){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_noFixedScale'].': ';
 			echo '<input type="checkbox" id="chart_noFixedScale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_noFixedScale" '.($settings['noFixedScale']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 6, \'noFixedScale\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_noFixedScale_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_noFixedScale'].'</label>';
 
 			echo '</div>';
 		}
@@ -8321,7 +8184,7 @@ class SurveyChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 62, \'type\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_type'].': <select class="dropdown small" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 62, \'type\', \''.self::$current_loop.'\');">';
 		
 		echo '  <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_horizontal'].'</option>';
 		echo '  <option value="1" '.($settings['type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_vertical'].'</option>';
@@ -8336,7 +8199,7 @@ class SurveyChart {
 		// Tip radarja		
 		if($settings['type'] == '4'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_type'].': <select id="chart_radar_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_type" onchange="changeChart(\''.$spid.'\', 62, \'radar_type\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_radar_type'].': <select class="dropdown small" id="chart_radar_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_type" onchange="changeChart(\''.$spid.'\', 62, \'radar_type\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="0" '.($settings['radar_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type1'].'</option>';
@@ -8348,7 +8211,7 @@ class SurveyChart {
 		// Postavitev skale pri radarju
 		if($settings['type'] == '4'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_scale'].': <select id="chart_radar_scale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_scale" onchange="changeChart(\''.$spid.'\', 62, \'radar_scale\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_radar_scale'].': <select class="dropdown small" id="chart_radar_scale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_scale" onchange="changeChart(\''.$spid.'\', 62, \'radar_scale\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="0" '.($settings['radar_scale']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_scale']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale1'].'</option>';
@@ -8361,8 +8224,8 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 1){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_barLabel'].': ';
 			echo '<input type="checkbox" id="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 62, \'barLabel\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabel'].'</label>';
 
 			echo '</div>';
 		}
@@ -8380,8 +8243,8 @@ class SurveyChart {
 		
 		$checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': '';
 
-		echo $lang['srv_chart_showNumerus'].': ';
 		echo '<input type="checkbox" id="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_numerus" '.$checked.' onchange="changeChart(\''.$spid.'\', 62, \'show_numerus\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_showNumerus'].'</label>';
 
 		echo '</div>';
 		
@@ -8389,7 +8252,7 @@ class SurveyChart {
 		if($settings['type'] == 0){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_wide_chart'].': <select id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 62, \'labelWidth\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_wide_chart'].': <select class="dropdown small" id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 62, \'labelWidth\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="75" '.($settings['labelWidth']=='75'?' selected="selected"':'').'>75%</option>';
 			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
@@ -8403,8 +8266,8 @@ class SurveyChart {
 		// zacni skalo z 0
 		echo '<div class="chart_setting">';
 		
-		echo $lang['srv_chart_noFixedScale'].': ';
 		echo '<input type="checkbox" id="chart_noFixedScale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_noFixedScale" '.($settings['noFixedScale']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 62, \'noFixedScale\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_noFixedScale_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_noFixedScale'].'</label>';
 
 		echo '</div>';
 	}
@@ -8416,7 +8279,7 @@ class SurveyChart {
 		
 		// omejitev skale
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_base'].': <select id="chart_base_'.$spid.'_loop_'.self::$current_loop.'" name="chart_base" onchange="changeChart(\''.$spid.'\', 16, \'base\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_base'].': <select class="dropdown small" id="chart_base_'.$spid.'_loop_'.self::$current_loop.'" name="chart_base" onchange="changeChart(\''.$spid.'\', 16, \'base\', \''.self::$current_loop.'\');">';
 			
 		echo '  <option value="0" '.($settings['base']=='0'?' selected="selected"':'').'>'.$lang['srv_analiza_opisne_units'].'</option>';
 		echo '  <option value="1" '.($settings['base']=='1'?' selected="selected"':'').'>'.$lang['srv_analiza_opisne_arguments'].'</option>';
@@ -8426,7 +8289,7 @@ class SurveyChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 16, \'type\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_type'].': <select class="dropdown small" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 16, \'type\', \''.self::$current_loop.'\');">';
 			
 		if($settings['base'] == '1'){
 			echo '  <option value="2" '.($settings['type']=='2'?' selected="selected"':'').'>'.$lang['srv_chart_structure_ver'].'</option>';
@@ -8444,7 +8307,7 @@ class SurveyChart {
 		// sortiranje
 		echo '<div class="chart_setting">';
 
-		echo $lang['srv_chart_sort'].': <select id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 16, \'sort\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_sort'].': <select class="dropdown small" id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 16, \'sort\', \''.self::$current_loop.'\');">';
 			
 		echo '  <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
 		echo '  <option value="1" '.($settings['sort']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_sort_category'].'</option>';
@@ -8459,15 +8322,13 @@ class SurveyChart {
 		
 		if($settings['rotate']=='1'){
 			echo $lang['srv_chart_rotate_grids'].' ';
-			//echo '<input type="checkbox" id="chart_rotate_'.$spid.'_loop_'.self::$current_loop.'" name="chart_rotate" '.($settings['rotate']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 20, \'rotate\', \''.self::$current_loop.'\');">';
-			echo '<span onclick="changeChart(\''.$spid.'\', 16, \'rotate\', \''.self::$current_loop.'\');" style="cursor: pointer;"><img src="img_0/random_off.png" title="Obrni grafe/variable" /></span>';
+			echo '<span class="faicon refresh" onclick="changeChart(\''.$spid.'\', 16, \'rotate\', \''.self::$current_loop.'\');" style="cursor: pointer;" title="Obrni grafe/variable"></span>';
 			echo '<input type="hidden" id="chart_rotate_'.$spid.'_loop_'.self::$current_loop.'" name="chart_rotate" value="0">';
 			echo ' '.$lang['srv_chart_rotate_vars'].' ';
 		}
 		else{
 			echo $lang['srv_chart_rotate_vars'].' ';
-			//echo '<input type="checkbox" id="chart_rotate_'.$spid.'_loop_'.self::$current_loop.'" name="chart_rotate" '.($settings['rotate']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 20, \'rotate\', \''.self::$current_loop.'\');">';
-			echo '<span onclick="changeChart(\''.$spid.'\', 16, \'rotate\', \''.self::$current_loop.'\');" style="cursor: pointer;"><img src="img_0/random_off.png" title="Obrni grafe/variable" /></span>';
+			echo '<span class="faicon refresh" onclick="changeChart(\''.$spid.'\', 16, \'rotate\', \''.self::$current_loop.'\');" style="cursor: pointer;" title="Obrni grafe/variable"></span>';
 			echo '<input type="hidden" id="chart_rotate_'.$spid.'_loop_'.self::$current_loop.'" name="chart_rotate" value="1">';
 			echo ' '.$lang['srv_chart_rotate_grids'];
 		}
@@ -8476,7 +8337,7 @@ class SurveyChart {
 		// Tip radarja		
 		if($settings['type'] == '4'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_type'].': <select id="chart_radar_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_type" onchange="changeChart(\''.$spid.'\', 16, \'radar_type\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_radar_type'].': <select class="dropdown small" id="chart_radar_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_type" onchange="changeChart(\''.$spid.'\', 16, \'radar_type\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="0" '.($settings['radar_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type1'].'</option>';
@@ -8488,7 +8349,7 @@ class SurveyChart {
 		// Postavitev skale pri radarju
 		if($settings['type'] == '4'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_scale'].': <select id="chart_radar_scale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_scale" onchange="changeChart(\''.$spid.'\', 16, \'radar_scale\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_radar_scale'].': <select class="dropdown small" id="chart_radar_scale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_scale" onchange="changeChart(\''.$spid.'\', 16, \'radar_scale\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="0" '.($settings['radar_scale']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_scale']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale1'].'</option>';
@@ -8499,7 +8360,7 @@ class SurveyChart {
 		
 		// tip izpisa vrednosti
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_valtype'].': <select id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 16, \'value_type\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_valtype'].': <select class="dropdown small" id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 16, \'value_type\', \''.self::$current_loop.'\');">';
 		
 		echo '  <option value="1" '.($settings['value_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_percent'].'</option>';	
 		echo '  <option value="2" '.($settings['value_type']=='2'?' selected="selected"':'').'>'.$lang['srv_chart_freq'].'</option>';
@@ -8513,8 +8374,8 @@ class SurveyChart {
 		if($settings['type'] == 2 || $settings['type'] == 3){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_barLabel'].': ';
 			echo '<input type="checkbox" id="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 16, \'barLabel\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabel'].'</label>';
 
 			echo '</div>';
 		}	
@@ -8530,8 +8391,8 @@ class SurveyChart {
 		
 		$checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': '';
 
-		echo $lang['srv_chart_showNumerus'].': ';
 		echo '<input type="checkbox" id="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_numerus" '.$checked.' onchange="changeChart(\''.$spid.'\', 16, \'show_numerus\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_showNumerus'].'</label>';
 
 		echo '</div>';
 		
@@ -8539,7 +8400,7 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 3){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_wide_chart'].': <select id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 16, \'labelWidth\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_wide_chart'].': <select class="dropdown small" id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 16, \'labelWidth\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="75" '.($settings['labelWidth']=='75'?' selected="selected"':'').'>75%</option>';
 			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
@@ -8553,8 +8414,8 @@ class SurveyChart {
 		// Izpusti variable brez odgovora
 		echo '<div class="chart_setting">';
 		
-		echo $lang['srv_chart_hideEmtyVar'].': ';
 		echo '<input type="checkbox" id="chart_hideEmptyVar_'.$spid.'_loop_'.self::$current_loop.'" name="chart_hideEmptyVar" '.($settings['hideEmptyVar']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 16, \'hideEmptyVar\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_hideEmptyVar_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_hideEmtyVar'].'</label>';
 
 		echo '</div>';
 	}
@@ -8566,7 +8427,7 @@ class SurveyChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 18, \'type\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_type'].': <select class="dropdown small" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 18, \'type\', \''.self::$current_loop.'\');">';
 			
 		echo '  <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_pie'].'</option>';
 		echo '  <option value="5" '.($settings['type']=='5'?' selected="selected"':'').'>'.$lang['srv_chart_3Dpie'].'</option>';
@@ -8581,7 +8442,7 @@ class SurveyChart {
 		// Tip radarja		
 		if($settings['type'] == '4'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_type'].': <select id="chart_radar_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_type" onchange="changeChart(\''.$spid.'\', 18, \'radar_type\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_radar_type'].': <select class="dropdown small" id="chart_radar_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_type" onchange="changeChart(\''.$spid.'\', 18, \'radar_type\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="0" '.($settings['radar_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type1'].'</option>';
@@ -8593,7 +8454,7 @@ class SurveyChart {
 		// Postavitev skale pri radarju
 		if($settings['type'] == '4'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_scale'].': <select id="chart_radar_scale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_scale" onchange="changeChart(\''.$spid.'\', 18, \'radar_scale\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_radar_scale'].': <select class="dropdown small" id="chart_radar_scale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_scale" onchange="changeChart(\''.$spid.'\', 18, \'radar_scale\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="0" '.($settings['radar_scale']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_scale']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale1'].'</option>';
@@ -8606,7 +8467,7 @@ class SurveyChart {
 		if($settings['type'] != '4'){
 			echo '<div class="chart_setting">';
 
-			echo $lang['srv_chart_sort'].': <select id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 18, \'sort\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_sort'].': <select class="dropdown small" id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 18, \'sort\', \''.self::$current_loop.'\');">';
 				
 			echo '  <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
 			echo '  <option value="1" '.($settings['sort']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_sort_desc'].'</option>';
@@ -8621,8 +8482,8 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 5){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_analiza_legenda'].': ';
 			echo '<input type="checkbox" id="chart_show_legend_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_legend" '.($settings['show_legend']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 18, \'show_legend\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_show_legend_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_analiza_legenda'].'</label>';
 
 			echo '</div>';
 		}
@@ -8631,8 +8492,8 @@ class SurveyChart {
 		if($settings['type'] == 2 || $settings['type'] == 3){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_barLabel'].': ';
 			echo '<input type="checkbox" id="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 18, \'barLabel\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabel'].'</label>';
 
 			echo '</div>';
 		}
@@ -8648,8 +8509,8 @@ class SurveyChart {
 		
 		$checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': '';
 
-		echo $lang['srv_chart_showNumerus'].': ';
 		echo '<input type="checkbox" id="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_numerus" '.$checked.' onchange="changeChart(\''.$spid.'\', 18, \'show_numerus\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_showNumerus'].'</label>';
 
 		echo '</div>';
 					
@@ -8657,7 +8518,7 @@ class SurveyChart {
 		if($settings['type'] == 2){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_wide_chart'].': <select id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 18, \'labelWidth\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_wide_chart'].': <select class="dropdown small" id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 18, \'labelWidth\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="75" '.($settings['labelWidth']=='75'?' selected="selected"':'').'>75%</option>';
 			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
@@ -8672,21 +8533,11 @@ class SurveyChart {
 		if($settings['barLabel'] == 1 && ($settings['type'] == 2 || $settings['type'] == 3)){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_barLabelSmall'].': ';
 			echo '<input type="checkbox" id="chart_barLabelSmall_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabelSmall" '.($settings['barLabelSmall']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 18, \'barLabelSmall\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_barLabelSmall_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabelSmall'].'</label>';
 
 			echo '</div>';
 		}
-		
-		// 3D strukturni krog
-		/*if($settings['type'] == 0){
-			echo '<div class="chart_setting">';
-			
-			echo $lang['srv_chart_3d_pie'].': ';
-			echo '<input type="checkbox" id="chart_3d_pie_'.$spid.'_loop_'.self::$current_loop.'" name="chart_3d_pie" '.($settings['3d_pie']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 18, \'3d_pie\', \''.self::$current_loop.'\');">';
-
-			echo '</div>';	
-		}*/
 	}
 	
 	// Nastavitve za ranking grafe (tip 17)
@@ -8696,12 +8547,11 @@ class SurveyChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 17, \'type\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_type'].': <select class="dropdown small" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 17, \'type\', \''.self::$current_loop.'\');">';
 			
 		echo '  <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_avg'].'</option>';
 		echo '  <option value="1" '.($settings['type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_structure_hor'].'</option>';
 		echo '  <option value="2" '.($settings['type']=='2'?' selected="selected"':'').'>'.$lang['srv_chart_structure_ver'].'</option>';
-		//echo '  <option value="3" '.($settings['type']=='3'?' selected="selected"':'').'>'.$lang['srv_chart_structure'].'</option>';
 		
 		echo '</select>';
 		echo '</div>';
@@ -8709,7 +8559,7 @@ class SurveyChart {
 		// sortiranje
 		echo '<div class="chart_setting">';
 
-		echo $lang['srv_chart_sort'].': <select id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 17, \'sort\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_sort'].': <select class="dropdown small" id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 17, \'sort\', \''.self::$current_loop.'\');">';
 				
 		echo '  <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
 		echo '  <option value="1" '.($settings['sort']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_sort_desc'].'</option>';
@@ -8721,11 +8571,10 @@ class SurveyChart {
 		
 		// tip izpisa vrednosti
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_valtype'].': <select id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 17, \'value_type\', \''.self::$current_loop.'\');" '.($settings['type'] == 0 ? 'disabled="disabled"' : '').'>';
+		echo $lang['srv_chart_valtype'].': <select class="dropdown small" id="chart_value_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_value_type" onchange="changeChart(\''.$spid.'\', 17, \'value_type\', \''.self::$current_loop.'\');" '.($settings['type'] == 0 ? 'disabled="disabled"' : '').'>';
 			
 		echo '  <option value="0" '.($settings['value_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_freq'].'</option>';
 		echo '  <option value="1" '.($settings['value_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_percent'].'</option>';
-		//echo '  <option value="2" '.($settings['value_type']=='2'?' selected="selected"':'').'>'.$lang['srv_chart_valid'].'</option>';
 		
 		echo '</select>';
 		echo '</div>';
@@ -8733,8 +8582,8 @@ class SurveyChart {
 		// prikaz label v stolpcih
 		echo '<div class="chart_setting">';
 		
-		echo $lang['srv_chart_barLabel'].': ';
 		echo '<input type="checkbox" id="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 17, \'barLabel\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_barLabel_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabel'].'</label>';
 
 		echo '</div>';
 	}
@@ -8749,8 +8598,8 @@ class SurveyChart {
 		
 		$checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': '';
 
-		echo $lang['srv_chart_showNumerus'].': ';
 		echo '<input type="checkbox" id="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_numerus" '.$checked.' onchange="changeChart(\''.$spid.'\', 17, \'show_numerus\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_showNumerus'].'</label>';
 
 		echo '</div>';
 		
@@ -8758,7 +8607,7 @@ class SurveyChart {
 		if($settings['type'] == 0 || $settings['type'] == 1){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_wide_chart'].': <select id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 17, \'labelWidth\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_wide_chart'].': <select class="dropdown small" id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 17, \'labelWidth\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="75" '.($settings['labelWidth']=='75'?' selected="selected"':'').'>75%</option>';
 			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
@@ -8773,8 +8622,8 @@ class SurveyChart {
 		if($settings['barLabel'] == 1 && $settings['type'] == 0){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_barLabelSmall'].': ';
 			echo '<input type="checkbox" id="chart_barLabelSmall_'.$spid.'_loop_'.self::$current_loop.'" name="chart_barLabelSmall" '.($settings['barLabelSmall']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 17, \'barLabelSmall\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_barLabelSmall_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_barLabelSmall'].'</label>';
 
 			echo '</div>';
 		}
@@ -8783,8 +8632,8 @@ class SurveyChart {
 		if($settings['type'] == 0){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_chart_noFixedScale'].': ';
 			echo '<input type="checkbox" id="chart_noFixedScale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_noFixedScale" '.($settings['noFixedScale']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 17, \'noFixedScale\', \''.self::$current_loop.'\');">';
+			echo '<label for="chart_noFixedScale_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_noFixedScale'].'</label>';
 
 			echo '</div>';
 		}
@@ -8797,7 +8646,7 @@ class SurveyChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 20, \'type\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_type'].': <select class="dropdown small" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 20, \'type\', \''.self::$current_loop.'\');">';
 			
 		echo '  <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar'].'</option>';
 		echo '  <option value="1" '.($settings['type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_vertical'].'</option>';
@@ -8810,7 +8659,7 @@ class SurveyChart {
 		// sortiranje
 		echo '<div class="chart_setting">';
 
-		echo $lang['srv_chart_sort'].': <select id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 20, \'sort\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_sort'].': <select class="dropdown small" id="chart_sort_'.$spid.'_loop_'.self::$current_loop.'" name="chart_sort" onchange="changeChart(\''.$spid.'\', 20, \'sort\', \''.self::$current_loop.'\');">';
 			
 		echo '  <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
 		echo '  <option value="1" '.($settings['sort']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_sort_category'].'</option>';
@@ -8825,15 +8674,13 @@ class SurveyChart {
 		
 		if($settings['rotate']=='1'){
 			echo $lang['srv_chart_rotate_grids'].' ';
-			//echo '<input type="checkbox" id="chart_rotate_'.$spid.'_loop_'.self::$current_loop.'" name="chart_rotate" '.($settings['rotate']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 20, \'rotate\', \''.self::$current_loop.'\');">';
-			echo '<span onclick="changeChart(\''.$spid.'\', 20, \'rotate\', \''.self::$current_loop.'\');" style="cursor: pointer;"><img src="img_0/random_off.png" title="Obrni grafe/variable" /></span>';
+			echo '<span class="faicon refresh" onclick="changeChart(\''.$spid.'\', 20, \'rotate\', \''.self::$current_loop.'\');" style="cursor: pointer;" title="Obrni grafe/variable"></span>';
 			echo '<input type="hidden" id="chart_rotate_'.$spid.'_loop_'.self::$current_loop.'" name="chart_rotate" value="0">';
 			echo ' '.$lang['srv_chart_rotate_vars'].' ';
 		}
 		else{
 			echo $lang['srv_chart_rotate_vars'].' ';
-			//echo '<input type="checkbox" id="chart_rotate_'.$spid.'_loop_'.self::$current_loop.'" name="chart_rotate" '.($settings['rotate']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 20, \'rotate\', \''.self::$current_loop.'\');">';
-			echo '<span onclick="changeChart(\''.$spid.'\', 20, \'rotate\', \''.self::$current_loop.'\');" style="cursor: pointer;"><img src="img_0/random_off.png" title="Obrni grafe/variable" /></span>';
+			echo '<span class="faicon refresh" onclick="changeChart(\''.$spid.'\', 20, \'rotate\', \''.self::$current_loop.'\');" style="cursor: pointer;" title="Obrni grafe/variable"></span>';
 			echo '<input type="hidden" id="chart_rotate_'.$spid.'_loop_'.self::$current_loop.'" name="chart_rotate" value="1">';
 			echo ' '.$lang['srv_chart_rotate_grids'];
 		}
@@ -8842,7 +8689,7 @@ class SurveyChart {
 		// Tip radarja		
 		if($settings['type'] == '0'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_type'].': <select id="chart_radar_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_type" onchange="changeChart(\''.$spid.'\', 20, \'radar_type\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_radar_type'].': <select class="dropdown small" id="chart_radar_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_type" onchange="changeChart(\''.$spid.'\', 20, \'radar_type\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="0" '.($settings['radar_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type1'].'</option>';
@@ -8854,7 +8701,7 @@ class SurveyChart {
 		// Postavitev skale pri radarju
 		if($settings['type'] == '0'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_scale'].': <select id="chart_radar_scale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_scale" onchange="changeChart(\''.$spid.'\', 20, \'radar_scale\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_chart_radar_scale'].': <select class="dropdown small" id="chart_radar_scale_'.$spid.'_loop_'.self::$current_loop.'" name="chart_radar_scale" onchange="changeChart(\''.$spid.'\', 20, \'radar_scale\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="0" '.($settings['radar_scale']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_scale']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale1'].'</option>';
@@ -8874,8 +8721,8 @@ class SurveyChart {
 		
 		$checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': '';
 
-		echo $lang['srv_chart_showNumerus'].': ';
 		echo '<input type="checkbox" id="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_numerus" '.$checked.' onchange="changeChart(\''.$spid.'\', 20, \'show_numerus\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_show_numerus_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_showNumerus'].'</label>';
 
 		echo '</div>';
 		
@@ -8883,7 +8730,7 @@ class SurveyChart {
 		if($settings['type'] == 2){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_wide_chart'].': <select id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 20, \'labelWidth\', \''.self::$current_loop.'\');">';
+			echo $lang['srv_wide_chart'].': <select class="dropdown small" id="chart_labelWidth_'.$spid.'_loop_'.self::$current_loop.'" name="chart_labelWidth" onchange="changeChart(\''.$spid.'\', 20, \'labelWidth\', \''.self::$current_loop.'\');">';
 			
 			echo '  <option value="75" '.($settings['labelWidth']=='75'?' selected="selected"':'').'>75%</option>';
 			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
@@ -8902,7 +8749,7 @@ class SurveyChart {
 		
 		// Tip tabele
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_table_type'].':<br /> <select style="width:140px;" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 21, \'type\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_table_type'].': <select class="dropdown small" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 21, \'type\', \''.self::$current_loop.'\');">';
 			
 		echo '  <option value="0" '.(self::$settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_table_type_0'].'</option>';
 		echo '  <option value="1" '.(self::$settings['type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_table_type_1'].'</option>';
@@ -8913,8 +8760,8 @@ class SurveyChart {
 		//Poravnava texta
 		echo '<div class="chart_setting">';
 			
-		echo $lang['srv_chart_table_align'].': ';
 		echo '<input type="checkbox" id="chart_show_legend_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_legend" '.(self::$settings['show_legend']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 21, \'show_legend\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_show_legend_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_table_align'].'</label>';
 
 		echo '</div>';
 	}
@@ -8926,7 +8773,7 @@ class SurveyChart {
 		
 		// Tip tabele
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_table_type'].':<br /> <select style="width:140px;" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 19, \'type\', \''.self::$current_loop.'\');">';
+		echo $lang['srv_chart_table_type'].': <select class="dropdown small" id="chart_type_'.$spid.'_loop_'.self::$current_loop.'" name="chart_type" onchange="changeChart(\''.$spid.'\', 19, \'type\', \''.self::$current_loop.'\');">';
 			
 		echo '  <option value="0" '.(self::$settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_table_type_0'].'</option>';
 		echo '  <option value="1" '.(self::$settings['type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_table_type_1'].'</option>';
@@ -8946,16 +8793,16 @@ class SurveyChart {
 		//Poravnava texta
 		echo '<div class="chart_setting">';
 			
-		echo $lang['srv_chart_table_align'].': ';
 		echo '<input type="checkbox" id="chart_other_otherType_'.$spid.'_loop_'.self::$current_loop.'" name="chart_other_otherType" '.(self::$settings['otherType']=='1'?' checked="checked"':'').' onchange="changeOther(\''.$spid.'\', \'otherType\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_other_otherType_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_table_align'].'</label>';
 
 		echo '</div>';		
 		
 		//Prikaz frekvenc
 		echo '<div class="chart_setting">';
 			
-		echo $lang['srv_chart_table_freq'].': ';
 		echo '<input type="checkbox" id="chart_other_otherFreq_'.$spid.'_loop_'.self::$current_loop.'" name="chart_other_otherFreq" '.(self::$settings['otherFreq']=='1'?' checked="checked"':'').' onchange="changeOther(\''.$spid.'\', \'otherFreq\', \''.self::$current_loop.'\');">';
+		echo '<label for="chart_other_otherFreq_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_table_freq'].'</label>';
 
 		echo '</div>';
 		
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyTableChart.php b/admin/survey/classes/surveyAnalysis/class.SurveyTableChart.php
index e39e8b118..4c85d97a3 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyTableChart.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyTableChart.php
@@ -1705,8 +1705,7 @@ class SurveyTableChart {
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
 		$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*220);
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*(243+$addHeight),5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 		$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,0,0,0,TRUE,$angle,0,TRUE,1,FALSE,$roundText);
 		$Test->drawGrid(4,TRUE,230,230,230,50);
@@ -1764,8 +1763,7 @@ class SurveyTableChart {
 		$Test->setGraphArea($this->settings['hq']*$startX,$this->settings['hq']*70,$this->settings['hq']*650,$this->settings['hq']*(220+$addHeight));
 		
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*(243+$addHeight),5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 
 		// Če gre za hierarhijo, potem je fiksna skala
@@ -1849,8 +1847,7 @@ class SurveyTableChart {
 			$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*220);
 		
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*(243+$addHeight),5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 		$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,$angle,0,TRUE,1,FALSE,$roundText);
 		$Test->drawGrid(4,TRUE,230,230,230,50);
@@ -1905,24 +1902,12 @@ class SurveyTableChart {
 		$roundText = ($this->settings['labelWidth'] == 20) ? 35 : 65;
 		
 		// Pri navadnem radio in checkbox vprasanju imamo samo en stolpec - zato so dimenzije drugacne
-		/*if($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 3){
-			$Test->setGraphArea($this->settings['hq']*200,$this->settings['hq']*50,$this->settings['hq']*630,$this->settings['hq']*220);
-			$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*243,5,255,255,255);
-			//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-			$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*295,200,200,200);
-			$Test->drawGraphArea(255,255,255,TRUE);
-			$Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,0,0,TRUE);
-			$Test->drawHorGrid(4,TRUE,230,230,230,50);
-		}
-		else{*/
-			$Test->setGraphArea($this->settings['hq']*$startX,$this->settings['hq']*70,$this->settings['hq']*650,$this->settings['hq']*(220+$addHeight));
-			$Test->drawFilledRoundedRectangle(7,7,793,243+$addHeight,5,255,255,255);
-			//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-			$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(295+$addHeight),200,200,200);
-			$Test->drawGraphArea(255,255,255,TRUE);
-			$Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,0,0,TRUE,1,FALSE,$roundText);
-			$Test->drawHorGrid(4,TRUE,230,230,230,50);
-		//}	
+        $Test->setGraphArea($this->settings['hq']*$startX,$this->settings['hq']*70,$this->settings['hq']*650,$this->settings['hq']*(220+$addHeight));
+        $Test->drawFilledRoundedRectangle(7,7,793,243+$addHeight,5,255,255,255);
+        //$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(295+$addHeight),200,200,200);
+        $Test->drawGraphArea(255,255,255,TRUE);
+        $Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,0,0,TRUE,1,FALSE,$roundText);
+        $Test->drawHorGrid(4,TRUE,230,230,230,50);
 
 		// Draw the 0 line
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*6);
@@ -1975,12 +1960,8 @@ class SurveyTableChart {
 		
 		$Test->setLineStyle($this->settings['hq'],$DotSize=0);
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
-		//$Test->setGraphArea(50,40,685,220);
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*273,5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
-		//$Test->createColorGradientPalette(195,204,56,223,110,41,3);
-		//$Test->createColorGradientPalette(168,188,56,248,255,136,5);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
 		
 		// Draw the pie graph
 		$labels = ($this->settings['sort'] == 1) ? 'custom_percent_sort' : 'custom_percent';
@@ -2018,12 +1999,8 @@ class SurveyTableChart {
 		
 		$Test->setLineStyle($this->settings['hq'],$DotSize=0);
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
-		//$Test->setGraphArea(50,40,685,220);
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*273,5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
-		//$Test->createColorGradientPalette(195,204,56,223,110,41,3);
-		//$Test->createColorGradientPalette(168,188,56,248,255,136,5);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
 		
 		// Draw the pie graph
 		$labels = ($this->settings['sort'] == 1) ? 'custom_percent_sort' : 'custom_percent';
@@ -2067,8 +2044,7 @@ class SurveyTableChart {
 		$Test->setGraphArea($this->settings['hq']*270,$this->settings['hq']*50,$this->settings['hq']*530,$this->settings['hq']*(220+$addHeight));
 		
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*(243+$addHeight),5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 		
 		
@@ -2122,11 +2098,7 @@ class SurveyTableChart {
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
 		$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*320);
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*343,5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*345,200,200,200);
-		//$Test->drawGraphArea(255,255,255,TRUE);
-		//$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,20,20,20,TRUE,$angle,0,TRUE,1,FALSE,$roundText);
-		//$Test->drawGrid(4,TRUE,230,230,230,50);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*345,200,200,200);
 
 		// Draw the 0 line
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
@@ -2179,8 +2151,7 @@ class SurveyTableChart {
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
 		$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*220);
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*273,5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 		$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,0,0,0,TRUE,$angle,0,TRUE);
 		if($count <= 20)
@@ -2215,11 +2186,14 @@ class SurveyTableChart {
 		// Ikone izvoza na vrhu posameznih nastavitev
 		//$this->displayExportIcons($chartID);
 		
-		
-		echo '<div id="switch_left_'.$chartID.'_loop_0" class="switch_left '.($this->settings_mode == 1 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$chartID.'\', \'0\', \'0\')">'.$lang['srv_chart_settings_basic'].'</div>';		
-		//echo '<span id="switch_middle_'.$chartID.'_loop_0" class="'.($this->settings_mode == 1 ? 'rightHighlight' : 'leftHighlight').'"></span>';	
-		echo '<div id="switch_right_'.$chartID.'_loop_0" class="switch_right '.($this->settings_mode == 0 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$chartID.'\', \'1\', \'0\')">'.$lang['srv_chart_settings_advanced'].'</div>';
-		
+
+		echo '<div class="chart_settings_content">';
+        
+
+        echo '<div class="tab_holder">';
+		echo '  <div id="switch_left_'.$chartID.'_loop_0" class="tab switch_left '.($this->settings_mode == 1 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$chartID.'\', \'0\', \'0\')">'.$lang['srv_chart_settings_basic'].'</div>';		
+		echo '  <div id="switch_right_'.$chartID.'_loop_0" class="tab switch_right '.($this->settings_mode == 0 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$chartID.'\', \'1\', \'0\')">'.$lang['srv_chart_settings_advanced'].'</div>';
+		echo '</div>';
 		
 		// OSNOVNE NASTAVITVE
 		echo '<div class="chart_settings_inner" id="chart_settings_basic_'.$chartID.'_loop_0" '.($this->settings_mode == 1 ? ' style="display:none;"' : '').'>';
@@ -2261,8 +2235,8 @@ class SurveyTableChart {
 				// visoka locljivost grafa
 				echo '<div class="chart_setting">';
 					
-				echo $lang['srv_chart_hq'].': ';
 				echo '<input type="checkbox" id="tablechart_hq_'.$chartID.'" name="tablechart_hq" '.($settings['hq']=='3'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \''.$this->podstran.'\', \'hq\');">';
+				echo '<label for="tablechart_hq_'.$chartID.'">'.$lang['srv_chart_hq'].'</label>';
 
 				echo '</div>';
 				break;
@@ -2273,32 +2247,23 @@ class SurveyTableChart {
 				
 				$checked = ($settings['show_numerus']=='1') ? ' checked="checked"': '';
 
-				echo $lang['srv_chart_showNumerus'].': ';
 				echo '<input type="checkbox" id="tablechart_show_numerus_'.$chartID.'" name="tablechart_show_numerus" '.$checked.' onchange="changeTableChart(\''.$chartID.'\', \'ttest\', \'show_numerus\');">';
+				echo '<label for="tablechart_show_numerus_'.$chartID.'">'.$lang['srv_chart_showNumerus'].'</label>';
 
 				echo '</div>';
 				
 			default:
 				break;
 		}
-		
-		
-		// Link na urejanje label
-		//echo '<span class="edit" style="margin-top:15px;" onclick="chartAdvancedSettings(\''.$this->counter.'\');">'.$lang['srv_chart_advancedLink_labels'].'</span>';	
-		// Vprasajcek za pomoc
-		//echo Help :: display('displaychart_settings_labels');
-		
+				
 		// Link na urejanje barv
 		echo '<span class="edit" onclick="tableChartAdvancedSettings(\''.$chartID.'\', \''.$this->podstran.'\')">'.$lang['srv_chart_advancedLink_colors'].'</span>';	
 		// Vprasajcek za pomoc
 		echo Help :: display('displaychart_settings_colors');		
-		
-		// Link na rekodiranje
-		//echo '<span class="edit" onclick="chartAdvancedSettings(\''.$this->counter.'\', \'3\');">'.$lang['srv_chart_advancedLink_recoding'].'</span>';	
-		// Vprasajcek za pomoc
-		//echo Help :: display('displaychart_settings_recoding');
 			
 			
+		echo '</div>';
+
 		echo '</div>';
 	}
 	
@@ -2331,7 +2296,7 @@ class SurveyTableChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'type\');">';
+		echo $lang['srv_chart_type'].': <select class="dropdown small" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'type\');">';
 
 		if($this->crossCheck){
 			// navedbe
@@ -2374,29 +2339,12 @@ class SurveyTableChart {
 		
 		
 		// prikaz label v stolpcih
-		//if($settings['type'] == 0 || $settings['type'] == 1){
-			echo '<div class="chart_setting">';
-			
-			echo $lang['srv_chart_barLabel'].': ';
-			echo '<input type="checkbox" id="tablechart_barLabel_'.$chartID.'" name="tablechart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'barLabel\');">';
+        echo '<div class="chart_setting">';
+        
+        echo '<input type="checkbox" id="tablechart_barLabel_'.$chartID.'" name="tablechart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'barLabel\');">';
+        echo '<label for="tablechart_barLabel_'.$chartID.'">'.$lang['srv_chart_barLabel'].'</label>';
 
-			echo '</div>';
-		//}
-		
-		
-		// sirina label
-		/*if($settings['type'] == 0 || $settings['type'] == 3){
-			echo '<div class="chart_setting">';
-			
-			echo $lang['srv_wide_chart'].': <select id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'labelWidth\');">';
-			
-			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
-			echo '  <option value="20" '.($settings['labelWidth']=='20'?' selected="selected"':'').'>20%</option>';
-			
-			echo '</select>';
-			
-			echo '</div>';
-		}*/
+        echo '</div>';
 	}
 	
 	// Nastavitve za ttest graf
@@ -2407,7 +2355,7 @@ class SurveyTableChart {
 		// sirina label
 		echo '<div class="chart_setting">';
 		
-		echo $lang['srv_wide_chart'].': <select id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'ttest\', \'labelWidth\');">';
+		echo $lang['srv_wide_chart'].': <select class="dropdown small" id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'ttest\', \'labelWidth\');">';
 		
 		echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
 		echo '  <option value="20" '.($settings['labelWidth']=='20'?' selected="selected"':'').'>20%</option>';
@@ -2420,8 +2368,8 @@ class SurveyTableChart {
 		// visoka locljivost grafa
 		echo '<div class="chart_setting">';
 			
-		echo $lang['srv_chart_hq'].': ';
 		echo '<input type="checkbox" id="tablechart_hq_'.$chartID.'" name="tablechart_hq" '.($settings['hq']=='3'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \'ttest\', \'hq\');">';
+		echo '<label for="tablechart_hq_'.$chartID.'">'.$lang['srv_chart_hq'].'</label>';
 
 		echo '</div>';
 	}
@@ -2433,7 +2381,7 @@ class SurveyTableChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'type\');">';
+		echo $lang['srv_chart_type'].': <select class="dropdown small" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'type\');">';
 
 		echo '  <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_avg_hor'].'</option>';
 		echo '  <option value="1" '.($settings['type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_avg_radar'].'</option>';
@@ -2446,8 +2394,8 @@ class SurveyTableChart {
 		// sortiranje
 		echo '<div class="chart_setting">';
 		
-		echo $lang['srv_chart_sort'].': ';
 		echo '<input type="checkbox" id="tablechart_sort_'.$chartID.'" name="tablechart_sort" '.($settings['sort']=='1'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'sort\');">';
+		echo '<label for="tablechart_sort_'.$chartID.'">'.$lang['srv_chart_sort'].'</label>';
 
 		echo '</div>';
 			
@@ -2456,7 +2404,7 @@ class SurveyTableChart {
 		if($settings['type'] == 0){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_wide_chart'].': <select id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'labelWidth\');">';
+			echo $lang['srv_wide_chart'].': <select class="dropdown small" id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'labelWidth\');">';
 			
 			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
 			echo '  <option value="20" '.($settings['labelWidth']=='20'?' selected="selected"':'').'>20%</option>';
@@ -2470,7 +2418,7 @@ class SurveyTableChart {
 		// Tip radarja		
 		if($settings['type'] == 1){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_type'].': <select id="tablechart_radar_type_'.$chartID.'" name="tablechart_radar_type" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'radar_type\');">';
+			echo $lang['srv_chart_radar_type'].': <select class="dropdown small" id="tablechart_radar_type_'.$chartID.'" name="tablechart_radar_type" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'radar_type\');">';
 			
 			echo '  <option value="0" '.($settings['radar_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type1'].'</option>';
@@ -2482,7 +2430,7 @@ class SurveyTableChart {
 		// Postavitev skale pri radarju
 		if($settings['type'] == 1){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_scale'].': <select id="tablechart_radar_scale_'.$chartID.'" name="tablechart_radar_scale" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'radar_scale\');">';
+			echo $lang['srv_chart_radar_scale'].': <select class="dropdown small" id="tablechart_radar_scale_'.$chartID.'" name="tablechart_radar_scale" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'radar_scale\');">';
 			
 			echo '  <option value="0" '.($settings['radar_scale']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_scale']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale1'].'</option>';
@@ -2501,7 +2449,7 @@ class SurveyTableChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'type\');">';
+		echo $lang['srv_chart_type'].': <select class="dropdown small" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'type\');">';
 		
 		if($tip != 7)
 			echo '  <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar'].'</option>';
@@ -2515,7 +2463,7 @@ class SurveyTableChart {
 		// sortiranje
 		echo '<div class="chart_setting">';
 
-		echo $lang['srv_chart_sort'].': <select id="tablechart_sort_'.$chartID.'" name="tablechart_sort" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'sort\');">';
+		echo $lang['srv_chart_sort'].': <select class="dropdown small" id="tablechart_sort_'.$chartID.'" name="tablechart_sort" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'sort\');">';
 			
 		echo '  <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
 		if($tip != 7)
@@ -2531,13 +2479,13 @@ class SurveyTableChart {
 		
 		if($settings['rotate']=='1'){
 			echo $lang['srv_chart_rotate_grids'].' ';
-			echo '<span onclick="changeTableChart(\''.$chartID.'\', \'break\', \'rotate\');" style="cursor: pointer;"><img src="img_0/random_off.png" title="Obrni grafe/variable" /></span>';
+			echo '<span class="faicon refresh" onclick="changeTableChart(\''.$chartID.'\', \'break\', \'rotate\');" style="cursor: pointer;" title="Obrni grafe/variable"></span>';
 			echo '<input type="hidden" id="tablechart_rotate_'.$chartID.'" name="tablechart_rotate" value="0">';
 			echo ' '.$lang['srv_chart_rotate_vars'].' ';
 		}
 		else{
 			echo $lang['srv_chart_rotate_vars'].' ';
-			echo '<span onclick="changeTableChart(\''.$chartID.'\', \'break\', \'rotate\');" style="cursor: pointer;"><img src="img_0/random_off.png" title="Obrni grafe/variable" /></span>';
+			echo '<span class="faicon refresh" onclick="changeTableChart(\''.$chartID.'\', \'break\', \'rotate\');" style="cursor: pointer;" title="Obrni grafe/variable"></span>';
 			echo '<input type="hidden" id="tablechart_rotate_'.$chartID.'" name="tablechart_rotate" value="1">';
 			echo ' '.$lang['srv_chart_rotate_grids'];
 		}
@@ -2546,7 +2494,7 @@ class SurveyTableChart {
 		// Tip radarja		
 		if($settings['type'] == '0'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_type'].': <select id="tablechart_radar_type_'.$chartID.'" name="tablechart_radar_type" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'radar_type\');">';
+			echo $lang['srv_chart_radar_type'].': <select class="dropdown small" id="tablechart_radar_type_'.$chartID.'" name="tablechart_radar_type" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'radar_type\');">';
 			
 			echo '  <option value="0" '.($settings['radar_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type1'].'</option>';
@@ -2558,7 +2506,7 @@ class SurveyTableChart {
 		// Postavitev skale pri radarju
 		if($settings['type'] == '0'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_scale'].': <select id="tablechart_radar_scale_'.$chartID.'" name="tablechart_radar_scale" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'radar_scale\');">';
+			echo $lang['srv_chart_radar_scale'].': <select class="dropdown small" id="tablechart_radar_scale_'.$chartID.'" name="tablechart_radar_scale" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'radar_scale\');">';
 			
 			echo '  <option value="0" '.($settings['radar_scale']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_scale']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale1'].'</option>';
@@ -2590,7 +2538,6 @@ class SurveyTableChart {
 		
 		// urejanje label
 		echo '<div id="chartSettingsArea2" class="chartSettingsArea" style="visibility: hidden;">';
-		//$this->displayAdvancedSettingsLabels($chartID);	
 		echo '</div>';
 		
 		echo '</form>';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index b8b5b4c40..75593a0ff 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -25865,6 +25865,199 @@ iframe#ifmcontentstoprint {
   text-decoration: none;
 }
 
+/*
+    Grafi v analizi
+*/
+.chart_holder {
+  width: 1060px;
+  margin: 0 auto;
+  padding-top: 36px;
+  overflow: hidden;
+  text-align: center;
+}
+.chart_holder .chart_title {
+  width: 800px;
+  margin: 0 0 16px 0;
+  font-weight: 600;
+  font-size: 18px;
+  text-align: left;
+}
+.chart_holder .chart_title .subtitle {
+  font-weight: normal;
+  font-size: 12px;
+  color: #333333;
+}
+.chart_holder .chart_title span.numerus {
+  font-weight: normal;
+  color: #333333;
+  padding-left: 10px;
+}
+.chart_holder .chart_img {
+  float: left;
+  min-height: 260px;
+  border: 1px solid #D3D3D3;
+  border-radius: 2px;
+}
+.chart_holder .chart_img img {
+  width: 800px;
+}
+.chart_holder .chart_bottom_info {
+  clear: both;
+  width: auto;
+  height: 20px;
+  padding: 5px;
+  text-align: left;
+}
+.chart_holder .chart_bottom_info ul {
+  list-style: none;
+}
+.chart_holder .chart_bottom_info ul li {
+  display: inline;
+  margin-right: 2px;
+}
+.chart_holder .chart_other_text {
+  margin-top: 10px;
+  float: left;
+  width: 770px;
+  min-height: 150px;
+  padding-left: 30px;
+}
+.chart_holder .chart_settings {
+  float: right;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  width: 230px;
+  margin-top: -46px;
+  opacity: 0;
+}
+.chart_holder .chart_settings .chart_setting_exportLinks {
+  display: flex;
+  align-items: center;
+  margin-bottom: 16px;
+}
+.chart_holder .chart_settings .chart_setting_exportLinks a {
+  margin: 0 0 0 16px;
+}
+.chart_holder .chart_settings .chart_setting_exportLinks a:first-child {
+  margin-left: 0;
+}
+.chart_holder .chart_settings .chart_setting_exportLinks button {
+  min-width: 0;
+  width: auto;
+  margin-left: 16px;
+  padding: 4px 14px;
+  font-weight: 400;
+  font-size: 14px;
+  color: #333333;
+  border-radius: 2px;
+}
+.chart_holder .chart_settings .chart_setting_exportLinks button .faicon {
+  margin-right: 8px;
+}
+.chart_holder .chart_settings .chart_setting_exportLinks button .faicon:before {
+  color: #1E88E5;
+  font-size: 14px;
+}
+.chart_holder .chart_settings .chart_settings_content {
+  border: 1px solid #D3D3D3;
+  border-radius: 2px;
+}
+.chart_holder .chart_settings .chart_settings_content .tab_holder {
+  display: flex;
+}
+.chart_holder .chart_settings .chart_settings_content .tab_holder .tab {
+  position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 50%;
+  height: 40px;
+  font-size: 13px;
+  color: #333333;
+}
+.chart_holder .chart_settings .chart_settings_content .tab_holder .tab.non-active {
+  cursor: pointer;
+  color: #777777;
+  background-color: #F8F8F8 !important;
+}
+.chart_holder .chart_settings .chart_settings_content .chart_settings_inner {
+  position: relative;
+  box-sizing: border-box;
+  width: 100%;
+  padding: 0 16px 16px 16px;
+}
+.chart_holder .chart_settings .chart_settings_content .chart_settings_inner .chart_setting {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+  margin: 16px 0 0 0;
+  text-align: left;
+  font-weight: 400;
+  font-size: 14px;
+}
+.chart_holder .chart_settings .chart_settings_content .chart_settings_inner .chart_setting label {
+  text-align: left;
+  font-weight: 400;
+  font-size: 14px;
+}
+.chart_holder .chart_settings .chart_settings_content .chart_settings_inner .chart_setting select {
+  width: 124px;
+  margin: 0;
+}
+.chart_holder .chart_settings .chart_settings_content .chart_settings_inner .chart_setting .faicon.refresh:before {
+  color: #1E88E5;
+  font-size: 14px;
+}
+.chart_holder .chart_settings .chart_settings_content .chart_settings_inner fieldset.chart_num_limits {
+  padding: 0;
+  margin: 0 !important;
+}
+.chart_holder .chart_settings .chart_settings_content .chart_settings_inner .chart_num_limits legend {
+  color: black;
+}
+.chart_holder .chart_settings .chart_settings_content span.title {
+  color: #1E88E5;
+  font-size: 14px;
+  font-weight: bold;
+}
+.chart_holder .chart_settings .chart_settings_content span.edit {
+  cursor: pointer;
+  display: block;
+  margin: 10px;
+  font-weight: bold;
+  text-align: left;
+  color: #1E88E5;
+}
+.chart_holder .chart_settings .chart_settings_content span.edit:hover {
+  color: #1E88E5;
+}
+.chart_holder .chart_settings .chart_settings_content input[type=text] {
+  width: 50px;
+  float: right;
+}
+.chart_holder .other_settings {
+  margin-top: 50px;
+  margin-bottom: 20px;
+  /*height: 60px;*/
+}
+.chart_holder .other_settings .chart_settings_inner {
+  margin-top: 0px;
+}
+.chart_holder .anl_bl {
+  border-left: 1px solid #E5E5E5 !important;
+}
+.chart_holder .anl_br {
+  border-right: 1px solid #E5E5E5 !important;
+}
+.chart_holder .anl_bt {
+  border-top: 1px solid #E5E5E5 !important;
+}
+.chart_holder .anl_bb {
+  border-bottom: 1px solid #E5E5E5 !important;
+}
+
 /*editing chart labels in popup*/
 table#grids td {
   padding: 0 5px;
@@ -26028,167 +26221,6 @@ ul.vrednost_sort input[type=text] {
   margin: 10px;
 }
 
-.chart_holder {
-  margin: 20px auto 50px auto;
-  width: 1000px;
-  overflow: hidden;
-  text-align: center;
-}
-.chart_holder .chart_title {
-  width: 800px;
-  margin: 5px 0px 15px 0;
-  padding-left: 5px;
-  padding-right: 5px;
-  font-weight: 600;
-  font-size: 14px;
-  text-align: left;
-}
-.chart_holder .chart_title .subtitle {
-  font-weight: normal;
-  font-size: 12px;
-  color: #333333;
-}
-.chart_holder .chart_title span.numerus {
-  font-weight: normal;
-  color: #333333;
-  padding-left: 10px;
-}
-.chart_holder .chart_img {
-  float: left;
-  min-height: 260px;
-}
-.chart_holder .chart_img img {
-  width: 800px;
-}
-.chart_holder .chart_bottom_info {
-  clear: both;
-  width: auto;
-  height: 20px;
-  padding: 5px;
-  text-align: left;
-}
-.chart_holder .chart_bottom_info ul {
-  list-style: none;
-}
-.chart_holder .chart_bottom_info ul li {
-  display: inline;
-  margin-right: 2px;
-}
-.chart_holder .chart_other_text {
-  margin-top: 10px;
-  float: left;
-  width: 770px;
-  min-height: 150px;
-  padding-left: 30px;
-}
-.chart_holder .chart_settings {
-  float: right;
-  position: relative;
-  opacity: 0;
-  filter: alpha(opacity=0);
-  margin-top: -25px;
-  background-color: #E5E5E5;
-  border: 1px solid #E5E5E5;
-}
-.chart_holder .chart_settings .switch_left {
-  z-index: 99999;
-  position: relative;
-  width: 90px;
-  height: 17px;
-  padding: 5px 0 8px 0 !important;
-  color: #1E88E5;
-  font-size: 13px;
-  font-weight: 500;
-  background-color: white;
-  float: left;
-}
-.chart_holder .chart_settings .switch_right {
-  z-index: 99999;
-  position: relative;
-  width: 90px;
-  height: 17px;
-  padding: 5px 0 8px 0 !important;
-  color: #1E88E5;
-  font-size: 13px;
-  font-weight: 500;
-  background-color: white;
-  float: right;
-}
-.chart_holder .chart_settings .non-active {
-  cursor: pointer;
-  background-color: #E5E5E5 !important;
-}
-.chart_holder .chart_settings .chart_settings_inner {
-  position: relative;
-  clear: both;
-  margin-top: -3px;
-  padding: 10px;
-  width: 160px;
-  height: auto;
-  font-size: 10px;
-  line-height: 15px;
-  font-weight: normal;
-  text-align: left;
-  background-color: white;
-}
-.chart_holder .chart_settings span.title {
-  color: #1E88E5;
-  font-size: 14px;
-  font-weight: bold;
-}
-.chart_holder .chart_settings span.edit {
-  cursor: pointer;
-  display: block;
-  margin: 10px;
-  font-weight: bold;
-  text-align: left;
-  color: #1E88E5;
-}
-.chart_holder .chart_settings span.edit:hover {
-  color: #1E88E5;
-}
-.chart_holder .chart_settings input[type=text] {
-  width: 50px;
-  float: right;
-}
-.chart_holder .chart_settings .chart_setting_exportLinks {
-  text-align: right;
-  padding: 7px;
-}
-.chart_holder .chart_settings .chart_setting_exportLinks span {
-  margin: 0 4px;
-}
-.chart_holder .chart_settings_inner fieldset.chart_num_limits {
-  padding: 0;
-  margin: 0 !important;
-}
-.chart_holder .chart_settings_inner .chart_num_limits legend {
-  color: black;
-}
-.chart_holder .other_settings {
-  margin-top: 50px;
-  margin-bottom: 20px;
-  /*height: 60px;*/
-}
-.chart_holder .other_settings .chart_settings_inner {
-  margin-top: 0px;
-}
-.chart_holder .chart_setting {
-  margin: 10px;
-}
-.chart_holder .anl_bl {
-  border-left: 1px solid #E5E5E5 !important;
-}
-.chart_holder .anl_br {
-  border-right: 1px solid #E5E5E5 !important;
-}
-.chart_holder .anl_bt {
-  border-top: 1px solid #E5E5E5 !important;
-}
-.chart_holder .anl_bb {
-  border-bottom: 1px solid #E5E5E5 !important;
-}
-
 .chart_other_text .chart_title {
   margin-top: 20px;
   padding-left: 0;
diff --git a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
index 6924a8714..262ba6149 100644
--- a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
@@ -1,3 +1,244 @@
+/*
+    Grafi v analizi
+*/
+
+
+// Posamezen element grafa
+.chart_holder {
+    width: 1060px;
+    margin: 0 auto;
+    padding-top: 36px;
+    overflow: hidden;
+
+    text-align: center;
+    
+    .chart_title {
+        width: 800px;
+        margin: 0 0 16px 0;
+
+        font-weight: 600;
+        font-size: 18px;
+        text-align: left;
+
+        .subtitle {
+            font-weight: normal;
+            font-size: 12px;
+            color: $black;
+        }
+        span.numerus {
+            font-weight: normal;
+            color: $black;
+            padding-left: 10px;
+        }
+    }
+    .chart_img {
+        float: left;
+        min-height: 260px;
+
+        border: 1px solid $dark-gray2;
+        border-radius: 2px;
+
+        img {
+            width: 800px;
+        }
+    }
+    .chart_bottom_info {
+        clear: both;
+        width: auto;
+        height: 20px;
+        padding: 5px;
+        text-align: left;
+        ul {
+            list-style: none;
+            li {
+                display: inline;
+                margin-right: 2px;
+            }
+        }
+    }
+    .chart_other_text {
+        margin-top: 10px;
+        float: left;
+        width: 770px;
+        min-height: 150px;
+        padding-left: 30px;
+    }
+
+    .chart_settings {
+        float: right;
+        position: relative;
+        display: flex;
+        flex-direction: column;
+
+        width: 230px;
+        margin-top: -46px;
+
+        opacity: 0;
+
+        .chart_setting_exportLinks {
+            display: flex;
+            align-items: center;
+
+            margin-bottom: 16px;
+
+            a {
+                margin: 0 0 0 16px;
+
+                &:first-child{
+                    margin-left: 0;
+                }
+            }
+
+            button{
+                min-width: 0;
+                width: auto;
+                margin-left: 16px;
+                padding: 4px 14px;
+
+                font-weight: 400;
+                font-size: 14px;
+                color: $black;
+
+                border-radius: 2px;
+
+                .faicon{
+                    margin-right: 8px;
+
+                    &:before{
+                        color: $blue;
+                        font-size: 14px;
+                    }
+                }
+            }
+        }
+
+
+        .chart_settings_content{
+            border: 1px solid $dark-gray2;
+            border-radius: 2px;
+
+            .tab_holder{
+                display: flex;
+
+                .tab{
+                    position: relative;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+
+                    width: 50%;
+                    height: 40px;
+                    
+                    font-size: 13px;
+                    color: $black;
+    
+                    &.non-active {
+                        cursor: pointer;
+                        color: $very-dark-gray;
+                        background-color: $light-gray !important;
+                    }
+                }
+            }
+  
+            .chart_settings_inner {
+                position: relative;
+                box-sizing: border-box;
+                width: 100%;
+
+                padding: 0 16px 16px 16px;
+
+                .chart_setting {
+                    display: flex;
+                    align-items: center;
+                    justify-content: space-between;
+
+                    box-sizing: border-box;
+                    margin: 16px 0 0 0;
+
+                    text-align: left;
+                    font-weight: 400;
+                    font-size: 14px;
+
+                    label{
+                        text-align: left;
+                        font-weight: 400;
+                        font-size: 14px;
+                    }
+
+                    select{
+                        width: 124px;
+                        margin: 0;
+                    }
+
+                    .faicon.refresh:before{
+                        color: $blue;
+                        font-size: 14px;
+                    }
+                }
+
+                fieldset.chart_num_limits {
+                    padding: 0;
+                    margin: 0 !important;
+                }
+                .chart_num_limits {
+                    legend {
+                        color: black;
+                    }
+                }
+
+            }
+            span.title {
+                color: $blue;
+                font-size: 14px;
+                font-weight: bold;
+            }
+            span.edit {
+                cursor: pointer;
+                display: block;
+                margin: 10px;
+                font-weight: bold;
+                text-align: left;
+                color: $blue;
+                &:hover {
+                    color: $blue;
+                }
+            }
+            input[type=text] {
+                width: 50px;
+                float: right;
+            }
+
+        }
+        
+        
+    }
+
+    .other_settings {
+        margin-top: 50px;
+        margin-bottom: 20px;
+        /*height: 60px;*/
+        
+        .chart_settings_inner {
+            margin-top: 0px;
+        }
+    }
+    
+    .anl_bl {
+        border-left: 1px solid $gray !important;
+    }
+    .anl_br {
+        border-right: 1px solid $gray !important;
+    }
+    .anl_bt {
+        border-top: 1px solid $gray !important;
+    }
+    .anl_bb {
+        border-bottom: 1px solid $gray !important;
+    }
+}
+
+
+
 
 /*editing chart labels in popup*/
 table#grids {
@@ -162,174 +403,7 @@ ul.vrednost_sort {
 		margin: 10px;
 	}
 }
-.chart_holder {
-	margin: 20px auto 50px auto;
-	width: 1000px;
-	overflow: hidden;
-    text-align: center;
-    
-	.chart_title {
-		width: 800px;
-        margin: 5px 0px 15px 0;
-        padding-left: 5px;
-        padding-right: 5px;
 
-		font-weight: 600;
-        font-size: 14px;
-        text-align: left;
-
-		.subtitle {
-			font-weight: normal;
-			font-size: 12px;
-			color: $black;
-		}
-		span.numerus {
-			font-weight: normal;
-			color: $black;
-			padding-left: 10px;
-		}
-	}
-	.chart_img {
-		float: left;
-		min-height: 260px;
-		img {
-			width: 800px;
-		}
-	}
-	.chart_bottom_info {
-		clear: both;
-		width: auto;
-		height: 20px;
-		padding: 5px;
-		text-align: left;
-		ul {
-			list-style: none;
-			li {
-				display: inline;
-				margin-right: 2px;
-			}
-		}
-	}
-	.chart_other_text {
-		margin-top: 10px;
-		float: left;
-		width: 770px;
-		min-height: 150px;
-		padding-left: 30px;
-	}
-	.chart_settings {
-		float: right;
-		position: relative;
-		opacity: 0;
-		filter: alpha(opacity=0);
-		margin-top: -25px;
-		background-color: $gray;
-                border: 1px solid $gray;
-		.switch_left {
-			z-index: 99999;
-			position: relative;
-			width: 90px;
-			height: 17px;
-			padding: 5px 0 8px 0 !important;
-			color: $blue;
-			font-size: 13px;
-			font-weight: 500;
-			background-color: white;
-			float: left;
-		}
-		.switch_right {
-			z-index: 99999;
-			position: relative;
-			width: 90px;
-			height: 17px;
-			padding: 5px 0 8px 0 !important;
-			color: $blue;
-			font-size: 13px;
-			font-weight: 500;
-			background-color: white;
-			float: right;
-		}
-		.non-active {
-			cursor: pointer;
-			background-color: $gray !important;
-		}
-		.chart_settings_inner {
-			position: relative;
-			clear: both;
-			margin-top: -3px;
-			padding: 10px;
-			width: 160px;
-			height: auto;
-			font-size: 10px;
-			line-height: 15px;
-			font-weight: normal;
-			text-align: left;
-			background-color: white;
-		}
-		span.title {
-			color: $blue;
-			font-size: 14px;
-			font-weight: bold;
-		}
-		span.edit {
-			cursor: pointer;
-			display: block;
-			margin: 10px;
-			font-weight: bold;
-			text-align: left;
-			color: $blue;
-			&:hover {
-				color: $blue;
-			}
-		}
-		input[type=text] {
-			width: 50px;
-			float: right;
-		}
-		.chart_setting_exportLinks {
-			text-align: right;
-			padding: 7px;
-			span {
-				margin: 0 4px;
-			}
-		}
-	}
-	.chart_settings_inner {
-		fieldset.chart_num_limits {
-			padding: 0;
-			margin: 0 !important;
-		}
-		.chart_num_limits {
-			legend {
-				color: black;
-			}
-		}
-	}
-	.other_settings {
-		margin-top: 50px;
-		margin-bottom: 20px;
-        /*height: 60px;*/
-        
-		.chart_settings_inner {
-			margin-top: 0px;
-		}
-	}
-	.chart_setting {
-		margin: 10px;
-	}
-	.anl_bl {
-		border-left: 1px solid $gray !important;
-	}
-	.anl_br {
-		border-right: 1px solid $gray !important;
-	}
-	.anl_bt {
-		border-top: 1px solid $gray !important;
-	}
-	.anl_bb {
-		border-bottom: 1px solid $gray !important;
-	}
-}
 .chart_other_text {
 	.chart_title {
         margin-top: 20px;