diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index a0441173f..49b24e0a8 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -2851,22 +2851,28 @@ class Vprasanje {
             echo '<div class="popup_close"><a href="#" onClick="vrednost_cancel(); return false;">✕</a></div>';
 
             echo '<h2>'.$lang['srv_kategorije_odgovorov_title'].'</h2>';
-			
-			echo '<div class="left-float"><span class="title">'.(in_array($rows['tip'], array(2,6,16,19,20))?$lang['srv_spremenljivka']:$lang['srv_vrednost']).':</span> <input type="text" name="vrednost_variable" value="'.$row['variable'].'" '.(in_array($rows['tip'], array(2,6,16,19,20)) ? ' onkeyup="vprasanje_check_variable(this);"' : '').'></div>';
+
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.(in_array($rows['tip'], array(2,6,16,19,20))?$lang['srv_spremenljivka']:$lang['srv_vrednost']).':</span>';
+			echo '<input type="text" class="text large" name="vrednost_variable" value="'.$row['variable'].'" '.(in_array($rows['tip'], array(2,6,16,19,20)) ? ' onkeyup="vprasanje_check_variable(this);"' : '').'>';
+			echo '</div>';
             
 			// RAZVRSTI odgovore
-            echo '<div class="left-float"><span class="title">'.$lang['sort'].':</span> ';
-            echo '<select name="vrednost_random">';
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.$lang['sort'].':</span>';
+
+			echo '<select class="dropdown large" name="vrednost_random">';
             echo '<option value="0"'.($row['random']==0?' selected':'').'>'.$lang['srv_random_off2'].'</option>';
             echo '<option value="1"'.($row['random']==1?' selected':'').'>'.$lang['srv_random_on2'].'</option>';
             echo '<option value="2"'.($row['random']==2?' selected':'').'>'.$lang['srv_sort_asc2'].'</option>';
             echo '<option value="3"'.($row['random']==3?' selected':'').'>'.$lang['srv_sort_desc2'].'</option>';
             echo '</select>';
-            echo '</div>';
+			
+			echo '</div>';
 
-			echo '<div style="clear:both;"></div>';
-            
-			echo '<div>'.$lang['srv_vprasanje_text'].' <span onmouseover="$(this).hide(); create_editor(\'vrednost_naslov\');" class="red pointer"> - '.$lang['srv_editor'].'</span>: <textarea id="vrednost_naslov" name="vrednost_naslov" style="width:99%">'.$row['naslov'].'</textarea></div>';
+			echo '<div class="bottom4">'.$lang['srv_vprasanje_text'].' <span onmouseover="$(this).hide(); create_editor(\'vrednost_naslov\');" class="pointer"> - '.$lang['srv_editor'].'</span>:';
+			
+			echo '<textarea id="vrednost_naslov" name="vrednost_naslov" style="width:99%">'.$row['naslov'].'</textarea></div>';
 						
 			echo '<p>';
 			if ($row['if_id'] > 0) {
@@ -2877,17 +2883,14 @@ class Vprasanje {
                 echo '</a>';
 			} else {
 				echo  $lang['srv_podif_new'].': ';
-                echo '<span class="faicon odg_if_not inline inline_if_not" onclick="vrednost_condition_editing(\''.$vrednost.'\'); return false;" title="'.$lang['srv_podif_edit'].'" style="cursor: pointer;"></span>';
+                echo '<span class="faicon odg_if_not inline inline_if_not blue pointer" onclick="vrednost_condition_editing(\''.$vrednost.'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
             }
 			echo '</p>';
-            
-			echo '<span class="buttonwrapper spaceLeft floatRight">';
-	        echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="vrednost_save(\''.$vrednost.'\'); return false;"><span>'.$lang['srv_potrdi'].'</span></a>';
-            echo '</span>';
-            
-            echo '<span class="buttonwrapper spaceLeft 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 '<div class="button_holder">';
+			echo '<button class="medium white-blue" onClick="vrednost_save(\''.$vrednost.'\'); return false;">'.$lang['srv_close_profile'].'</button>';              
+			echo '<button class="medium blue" onclick="vrednost_cancel(); return false;">'.$lang['srv_potrdi'].'</button>';
+			echo '</div>';
 		}
 
 		echo '</form>';		
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index d0057b237..4274e63a5 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5087,6 +5087,14 @@ p, span {
   margin-top: 8px;
 }
 
+.bottom4 {
+  margin-bottom: 4px;
+}
+
+.top4 {
+  margin-top: 4px;
+}
+
 .warning,
 .red {
   color: #FF0000;
diff --git a/resources/sass/admin_new/basic/typography.scss b/resources/sass/admin_new/basic/typography.scss
index b0f3b90d2..5eb5da813 100644
--- a/resources/sass/admin_new/basic/typography.scss
+++ b/resources/sass/admin_new/basic/typography.scss
@@ -30,6 +30,14 @@ p,span {
 	margin-top: 8px;
 }
 
+.bottom4 {
+	margin-bottom: 4px;
+}
+
+.top4 {
+	margin-top: 4px;
+}
+
 //Barve
 .warning,
 .red {