diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index ba0ab3bed..63ba87ed4 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -208,6 +208,8 @@ class SurveyAdminSettings {
 			echo '</div>';
             
             // Ta del se v 2. fazi zamenja z gumbom "Večjezične ankete"
+			echo '<div class="setting_holder">';
+
 			echo '<p>'.$lang['srv_language_link2'].':';
 			// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
             $userAccess = UserAccess::getInstance($global_user_id);
@@ -219,6 +221,7 @@ class SurveyAdminSettings {
             }			
 			echo '<p>'.$lang['srv_language_mySurveys'].'</p>';
 
+			echo '</div>';
 			
 			echo '</fieldset>';
 
@@ -538,20 +541,28 @@ class SurveyAdminSettings {
 			echo '</div>';
 			
 			// zamakni
-			echo '<br />';
-			echo '<span class="nastavitveSpan2"><label>'.$lang['a_show'].'</label></span>'; 
+			echo '<div class="setting_holder">';
+
+			echo '<span class="setting_title">'.$lang['a_show'].'</span>'; 
+			echo '<div class="setting_item">';
 			if ($row['flat'] == 0)
-				echo '<span title="'.$lang['srv_flat_0'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=flat&value=1"><span class="faicon flat_0"></span> '.$lang['srv_flat_0_short'].'</a></span> ';
+				echo '<span title="'.$lang['srv_flat_0'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=flat&value=1">'.$lang['srv_flat_0_short'].'</a></span> ';
 			else
-				echo '<span title="'.$lang['srv_flat_1'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=flat&value=0"><span class="faicon flat_1"></span> '.$lang['srv_flat_0_short'].'</a></span> ';
+				echo '<span title="'.$lang['srv_flat_1'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=flat&value=0">'.$lang['srv_flat_0_short'].'</a></span> ';
 			echo Help::display('srv_branching_flat');
+			echo '</div>';
 			
-			// odpri	
+			// odpri
+			echo '<div class="setting_item">';
 			if ($row['popup'] == 1)
-				echo '<span class="spaceLeft" title="'.$lang['srv_popup_1'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=popup&value=0"><span class="faicon popup_1"></span> '.$lang['srv_popup_1_short'].'</a></span> ';
+				echo '<span class="spaceLeft" title="'.$lang['srv_popup_1'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=popup&value=0">'.$lang['srv_popup_1_short'].'</a></span> ';
 			else
-				echo '<span class="spaceLeft" title="'.$lang['srv_popup_0'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=popup&value=1"><span class="faicon popup_0"></span> '.$lang['srv_popup_1_short'].'</a></span> ';
+				echo '<span class="spaceLeft" title="'.$lang['srv_popup_0'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=popup&value=1">'.$lang['srv_popup_1_short'].'</a></span> ';
 			echo Help::display('srv_branching_popup');
+			echo '</div>';
+
+			echo '</div>';
+
 			
 			echo '</fieldset>';