diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php
index 4f30f407b..0f50220a6 100644
--- a/admin/survey/BranchingAjax.php
+++ b/admin/survey/BranchingAjax.php
@@ -1633,14 +1633,15 @@ class BranchingAjax {
 			if ($_GET['izpis'] == 'long') {
 				
 				if ($code['type'] == 'if' || $code['type'] == 'podif')
-					echo '<p><b>'.$lang['srv_check_pogoji_not_ok'].'</b></p>';
+					echo '<h2>'.$lang['srv_check_pogoji_not_ok'].'</h2>';
 				elseif ($code['type'] == 'loop')
-					echo '<p><b>'.$lang['srv_loop_no_nesting'].'</b></p>';
+					echo '<h2>'.$lang['srv_loop_no_nesting'].'</h2>';
 				elseif ($code['type'] == 'question_variable')
-					echo '<p><b>'.$lang['srv_duplicate_question_variable'].'</b></p>';
+					echo '<h2>'.$lang['srv_duplicate_question_variable'].'</h2>';
 				elseif ($code['type'] == 'variable')
-					echo '<p><b>'.$lang['srv_duplicate_variables'].'</b></p>';
-				
+					echo '<h2>'.$lang['srv_duplicate_variables'].'</h2>';
+                
+                echo '<div class="popup_close"><a href="#" onClick="$(\'#check_pogoji\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">✕</a></div>';        
 				
 				// napaka v ifih
 				if ($code['type'] == 'if') {
@@ -1690,14 +1691,18 @@ class BranchingAjax {
 				
 				echo '</p>';
 			
-				echo '<p class="as_link" onclick="$(\'#check_pogoji\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</p>';
+				//echo '<p class="as_link" onclick="$(\'#check_pogoji\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</p>';
+                echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="$(\'#check_pogoji\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</a></div></span>';
 			} 
 			else {
-				echo '<p>'.$lang['srv_check_pogoji_not_ok'].'</p>';
+                echo '<h2>'.$lang['srv_check_pogoji_not_ok'].'</h2>';
+                echo '<div class="popup_close"><a href="#" onClick="$(\'#surveyTrajanje\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">✕</a></div>';        
+
 				echo '<p>'.$lang['srv_check_pogoji_not_ok_txt'].'</p>';
 				
-				echo '<p class="as_link" onclick="$(\'#surveyTrajanje\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</p>';
-			}		
+				//echo '<p class="as_link" onclick="$(\'#surveyTrajanje\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</p>';
+                echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="$(\'#surveyTrajanje\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</a></div></span>';
+            }		
 		}
     }
 
@@ -2767,9 +2772,8 @@ class BranchingAjax {
 		echo '<p><label style="display:inline-block; width:100px">'.$lang['srv_find'].': </label><input type="text" name="find" style="width:200px"><span id="find_count" style="color:red; margin:0 20px"></span></p>';
 		echo '<p><label style="display:inline-block; width:100px">'.$lang['srv_replace_with'].': </label><input type="text" name="replace" style="width:200px"></p>';
 		
-		echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange btn_savesettings" onclick="find_replace_do(); return false;" href="#"><span>'.$lang['srv_replace'].'</span></a></div></span>';
-		echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray btn_savesettings" onclick="$(\'#vrednost_edit\').hide().html(\'\'); $(\'#fade\').fadeOut(); return false;" href="#"><span>'.$lang['srv_cancel'].'</span></a></div></span>';
-		
+		echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange btn_savesettings" onclick="find_replace_do(); return false;" href="#"><span>'.$lang['srv_replace'].'</span></a></div></span>';
+		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray btn_savesettings" onclick="$(\'#vrednost_edit\').hide().html(\'\'); $(\'#fade\').fadeOut(); return false;" href="#"><span>'.$lang['srv_cancel'].'</span></a></div></span>';	
 	}
 	
 	function ajax_find_replace_count() {
diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 13bab1f2f..3f1f29f5f 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -432,11 +432,8 @@ class SurveyAdmin
         echo '<div class="popup_holder">';
 
         // div za setiranje trajanja ankete ob aktiviranju
-        echo '<div id="surveyTrajanje">';
+        echo '<div id="surveyTrajanje" class="divPopUp">';
         echo '  <div id="surveyTrajanje_msg">&nbsp;</div>';
-        echo '  <div id="surveyTrajanje_close">';
-        echo '      <a href="#"><span class="faicon close"></span></a>';
-        echo '  </div>';
         echo '</div> <!-- /surveyTrajanje -->';
 
         // urejanje pogojev -- v tem pogledu se uporabi za urejanje vrednosti v editorju
diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index 16d2a633d..9530e412d 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -888,15 +888,16 @@ class GDPR{
 
         echo '	<br />';
 
+        echo '<a href="#" onClick="previewGDPRExport(\'1\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
+        echo '	<br />';
+
         // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
         $userAccess = UserAccess::getInstance($global_user_id);
 
         if(!$userAccess->checkUserAccess($what='gdpr_export')){
             $userAccess->displayNoAccess($what='gdpr_export');
         }
-        else{
-            echo '<a href="#" onClick="previewGDPRExport(\'1\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
-            echo '	<br />';
+        else{    
             echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_individual&anketa='.$ank_id).'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
             echo '	<br />';
             echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_individual&anketa='.$ank_id).'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
@@ -916,12 +917,13 @@ class GDPR{
 
         echo '	<br />';
 
+        echo '<a href="#" onClick="previewGDPRExport(\'2\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
+        echo '	<br />';
+
         if(!$userAccess->checkUserAccess($what='gdpr_export')){
             $userAccess->displayNoAccess($what='gdpr_export');
         }
-        else{
-            echo '<a href="#" onClick="previewGDPRExport(\'2\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
-            echo '	<br />';
+        else{     
             echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_activity&anketa='.$ank_id).'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
             echo '	<br />';
             echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_activity&anketa='.$ank_id).'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
@@ -930,18 +932,6 @@ class GDPR{
         echo '	<br /><br />';
 
         echo '</fieldset>';
-        
-
-
-		// Prošnje za izbris za posamezno anketo - zaenkrat to ugasnemo
-		/*echo '<fieldset class="wide">';
-		echo '<legend>'.$lang['srv_gdpr_requests'].'</legend>';
-
-		echo '<div id="survey_requests">';
-		self::displayGDPRSurveyRequests($ank_id);
-		echo '</div>';
-
-		echo '</fieldset>';*/
 	}
 
 	// Prikazemo vsebino zavihka gdpr - nastavitve posamezne ankete
diff --git a/admin/survey/classes/class.SurveyChart.php b/admin/survey/classes/class.SurveyChart.php
index cf8002ba8..3173b64e9 100644
--- a/admin/survey/classes/class.SurveyChart.php
+++ b/admin/survey/classes/class.SurveyChart.php
@@ -8966,7 +8966,9 @@ class SurveyChart {
 		
 		$spremenljivka = SurveyAnalysis::$_HEADERS[$spid];
 
-		echo '<h2>'.$spremenljivka['variable'].' - '.$spremenljivka['naslov'].'</h2>';
+        echo '<h2>'.$spremenljivka['variable'].' - '.$spremenljivka['naslov'].'</h2>';
+        
+        echo '<div class="popup_close"><a href="#" onClick="chartCloseAdvancedSettings(); return false;">✕</a></div>';
 		
 		echo '<form method="post" name="chart_advanced_settings" onsubmit="chartSaveAdvancedSettings(\''.$spid.'\', \''.self::$current_loop.'\'); return false;">';
 		
@@ -9015,7 +9017,7 @@ class SurveyChart {
 		echo '</li>';
 		echo '<li id="chartTab3" class="chartTab" onClick="chartTabAdvancedSettings(\'3\');">';
 		echo  $lang['srv_chart_advanced_recoding'];
-		echo '</li>';
+        echo '</li>';
 		// Tab za meje numericov
 		if(($spremenljivka['tip'] == 3 && self::checkDropdownNumeric($spid)) || $spremenljivka['tip'] == 7 || $spremenljivka['tip'] == 8 || $spremenljivka['tip'] == 22){
 			echo '<li id="chartTab4" class="chartTab" onClick="chartTabAdvancedSettings(\'4\');">';
diff --git a/admin/survey/classes/class.SurveyDataSettingProfiles.php b/admin/survey/classes/class.SurveyDataSettingProfiles.php
index 3f487c8e9..a715a1cfb 100644
--- a/admin/survey/classes/class.SurveyDataSettingProfiles.php
+++ b/admin/survey/classes/class.SurveyDataSettingProfiles.php
@@ -607,7 +607,9 @@ class SurveyDataSettingProfiles {
 		global $lang;
         $_all_profiles = self::getProfiles();
 
-		echo '<h2>'.$lang['srv_analiza_settings'].'</h2>';
+        echo '<h2>'.$lang['srv_analiza_settings'].'</h2>';
+        
+        echo '<div class="popup_close"><a href="#" onClick="dataSettingProfileAction(\'cancel\'); return false;">✕</a></div>';
 
         if ($current_pid == null) {
         	$current_pid = self::getCurentProfileId();
@@ -646,20 +648,7 @@ class SurveyDataSettingProfiles {
 		}
 		echo '</span>'; # dataSetting_profile
 		echo '</span>'; # dsp_profiles_holder
-		
-		# privzetega profila ne moremo ne zbrisat ne preimenovat
-        /*echo '<div id="dsp_left_link_holder" class="link_no_decoration">'."\n";
-        # sistemskega in seje ne moremo preimenovati
-        if ($current_pid > 0) {
-        	echo '<a href="#" onclick="dataSettingProfileAction(\'show_rename\'); return false;">'.$lang['srv_rename_profile'].'</a><br/>'."\n";
-        }
-        # sistemskega ne moremo izbrisati
-        if ($current_pid != 0) {
-			echo '<a href="#" onclick="dataSettingProfileAction(\'show_delete\'); return false;">'.$lang['srv_delete_profile'].'</a>'."\n";
-		}
-        echo '</div>'."\n"; // dataSetting_profile_button_left_holder
-		*/
-		
+				
 		echo '</div>'; # dsp_profiles_left
 
 		echo '<div id="dsp_profiles_right">'."\n";
@@ -718,9 +707,7 @@ class SurveyDataSettingProfiles {
         echo '<input id="deleteProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />'."\n";
         echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'do_delete\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>'."\n";
         echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'cancel_delete\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";            
-        echo '</div>'."\n";
-		
-				
+        echo '</div>'."\n";		
 	}
 	
 	/** Funkcija prikaze osnovnih informacije profila
diff --git a/admin/survey/classes/class.SurveyPostProcess.php b/admin/survey/classes/class.SurveyPostProcess.php
index 8158f62fe..b1f858090 100644
--- a/admin/survey/classes/class.SurveyPostProcess.php
+++ b/admin/survey/classes/class.SurveyPostProcess.php
@@ -498,7 +498,9 @@ class SurveyPostProcess {
 		
 		echo '<div id="preview_spremenljivka">';
 		echo '<div id="spremenljivka_preview">';
-		
+        
+        echo '<div class="popup_close"><a href="#" onClick="edit_data_close(); return false;">✕</a></div>';
+
 		echo '<form name="edit_data" method="post" action="ajax.php?t=postprocess&a=edit_data_question_save&anketa='.$this->anketa.'" onsubmit="edit_data_question_save(); return false;">';
 		echo '<input type="submit" id="submit" style="display:none" />'; // workaround, ker se drugace ne poklice onsubmit
 		echo '<input type="hidden" name="spr_id" value="'.$spr_id.'" />';
diff --git a/admin/survey/classes/class.SurveyRecoding.php b/admin/survey/classes/class.SurveyRecoding.php
index ad4343353..ed65e1f0d 100644
--- a/admin/survey/classes/class.SurveyRecoding.php
+++ b/admin/survey/classes/class.SurveyRecoding.php
@@ -263,7 +263,9 @@ class SurveyRecoding
 			$qry = sisplet_query($qry_str);
 			$spr_row = mysqli_fetch_assoc($qry);
 			
-			echo '<h2>'.$spr_row['variable'].' - '.strip_tags($spr_row['naslov']).'</h2>';
+            echo '<h2>'.$spr_row['variable'].' - '.strip_tags($spr_row['naslov']).'</h2>';
+            
+            echo '<div class="popup_close"><a href="#" onClick="cancelQuestionRecode(); return false;">✕</a></div>';
 			
 			#echo '<span id="vprasanje_edit_mv" style="outline:1px solid red;">';
 			$vmv = new RecodeValues($this->anketa,$spr_id);
diff --git a/admin/survey/classes/class.SurveyTableChart.php b/admin/survey/classes/class.SurveyTableChart.php
index 4ef8771ad..c0d21ba86 100644
--- a/admin/survey/classes/class.SurveyTableChart.php
+++ b/admin/survey/classes/class.SurveyTableChart.php
@@ -2573,7 +2573,9 @@ class SurveyTableChart {
 		global $site_path;
 		global $lang;
 
-		echo '<h2>'.$lang['srv_detail_settings'].'</h2>';
+        echo '<h2>'.$lang['srv_detail_settings'].'</h2>';
+        
+        echo '<div class="popup_close"><a href="#" onClick="chartCloseAdvancedSettings(); return false;">✕</a></div>';
 		
 		echo '<form method="post" name="table_chart_advanced_settings" onsubmit="tableChartSaveAdvancedSettings(\''.$chartID.'\'); return false;">';
 		
@@ -2600,9 +2602,6 @@ class SurveyTableChart {
 		echo '<li id="chartTab1" class="chartTab active" onClick="chartTabAdvancedSettings(\'1\');">';
 		echo  $lang['srv_chart_advanced_colors'];
 		echo '</li>';
-		/*echo '<li id="chartTab2" class="chartTab" onClick="chartTabAdvancedSettings(\'2\');">';
-		echo  $lang['srv_chart_advanced_labels'];
-		echo '</li>';*/
 		echo '</ul>';	
 		
 		echo '</div>';		
diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index 9b0b484e5..b78318c3a 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -2969,7 +2969,9 @@ class Vprasanje {
 	function vrednost_fastadd() {
 		global $lang;
 		
-		echo '<h2>'.$lang['srv_vrednost_fastadd'].'</h2>';
+        echo '<h2>'.$lang['srv_vrednost_fastadd'].'</h2>';
+        
+        echo '<div class="popup_close"><a href="#" onClick="vrednost_cancel(); return false;">✕</a></div>';
 		
 		echo '<form name="vrednost_fastadd_form" onsubmit="vrednost_fastadd_save(); return false;">';
 		
@@ -2978,15 +2980,15 @@ class Vprasanje {
 		
 		echo '<p><textarea name="fastadd" style="width:99%; height:100px"></textarea></p>';
 		
-		echo '<p>'.$lang['srv_vrednost_fastadd_txt'].'</p>';
-		
-        echo '<span class="buttonwrapper spaceRight floatLeft">';
+        echo '<p>'.$lang['srv_vrednost_fastadd_txt'].'</p>';
+        
+        echo '<span class="buttonwrapper floatRight">';
         echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="vrednost_fastadd_save(\''.$this->spremenljivka.'\'); return false;"><span>'.$lang['srv_potrdi'].'</span></a>';
         echo '</span>';
-		
-		echo '<span class="buttonwrapper spaceRight floatLeft">';
+
+		echo '<span class="buttonwrapper spaceRight floatRight">';
         echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="vrednost_cancel(); return false;"><span>'.$lang['srv_close_profile'].'</span></a>'."\n\r";
-		echo '</span>';
+        echo '</span>'; 
 		
 		echo '</form>';
 		
diff --git a/public/css/admin.css b/public/css/admin.css
index 391ee4292..3a0854b01 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -8885,7 +8885,7 @@ body.waitlong #loading {
   height: 300px;
   padding: 20px;
   margin: 0 0 40px 0;
-  background-color: #f5fafe;
+  background-color: #dfeffb;
 }
 #chart_float_editing .chartSettingsArea ul.vrednost_sort li {
   border: 1px solid grey;
@@ -8915,6 +8915,8 @@ body.waitlong #loading {
 }
 #chart_float_editing .chartSettingsTabs ul {
   padding: 0;
+  margin: 0;
+  list-style-type: none;
 }
 #chart_float_editing .chartSettingsTabs ul li {
   width: 100%;
@@ -8923,7 +8925,7 @@ body.waitlong #loading {
   cursor: pointer;
 }
 #chart_float_editing .chartSettingsTabs ul li.active {
-  background-color: #f5fafe;
+  background-color: #dfeffb;
 }
 #chart_float_editing .form-item {
   padding: 3px;
@@ -21522,7 +21524,6 @@ and open the template in the editor.
   border-left: 6px #1e88e5 solid !important;
   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34);
   display: none;
-  left: 250px;
   width: 500px;
 }
 #surveyTrajanje .popup_close {
@@ -21621,7 +21622,6 @@ and open the template in the editor.
 
 #surveyTrajanje_msg {
   float: left;
-  width: 450px;
 }
 
 #surveyTrajanje_close {
diff --git a/resources/sass/admin/popup/settings.scss b/resources/sass/admin/popup/settings.scss
index 95fb4c1fa..56b228815 100644
--- a/resources/sass/admin/popup/settings.scss
+++ b/resources/sass/admin/popup/settings.scss
@@ -70,7 +70,7 @@
 		padding: 20px;
         margin: 0 0 40px 0;
         
-		background-color: $soft_blue_very_lighten;
+		background-color: $soft_blue_lighten;
         
         ul.vrednost_sort {
 			li {
@@ -103,20 +103,26 @@
 		font-size: 13px;
 		font-weight: 500;
 		text-align: center;
-		background-color: white;
+        background-color: white;
+        
 		ul {
-			padding: 0;
+            padding: 0;
+            margin: 0;
+            list-style-type: none;
+            
 			li {
 				width: 100%;
 				height: 20px;
 				padding: 10px 0;
 				cursor: pointer;
-			}
+            }
+            
 			li.active {
-				background-color: $soft_blue_very_lighten;
+				background-color: $soft_blue_lighten;
 			}
 		}
-	}
+    }
+    
 	.form-item {
 		padding: 3px;
 		width: 200px;
diff --git a/resources/sass/admin/survey_settings/other.scss b/resources/sass/admin/survey_settings/other.scss
index 190d20040..7d75bb010 100644
--- a/resources/sass/admin/survey_settings/other.scss
+++ b/resources/sass/admin/survey_settings/other.scss
@@ -36,7 +36,6 @@ and open the template in the editor.
     
 	display: none;
 
-	left: 250px;
 	width: 500px;
 }
 #surveyTrajanje_img {
@@ -45,7 +44,6 @@ and open the template in the editor.
 }
 #surveyTrajanje_msg {
 	float: left;
-	width: 450px;
 }
 #surveyTrajanje_close {
 	position: absolute;