diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index a94f08ea9..7dfc9cce5 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -417,29 +417,45 @@ class SurveyAdminAjax {
 			
 			echo '<h2>'.$lang['srv_ime'].'</h2>';
 			
-			echo '<div class="quick_title_edit_label taLeft floatLeft">'.$lang['srv_novaanketa_polnoime'].':</div>';
-			echo '<div class="floatLeft" >';
-			echo '<input type="text" id="novaanketa_naslov_1" name="novaanketa_naslov_1" value="'.$naslov.'" class="full" maxlength="'.ANKETA_NASLOV_MAXLENGTH.'"  onfocus="if(this.value==\''.$lang['srv_naslov'].'\') {this.value=\'\';}" />';
-			echo '<span id="novaanketa_naslov_1_chars" class="spaceLeft">'.mb_strlen($naslov, 'UTF-8').'/'.ANKETA_NASLOV_MAXLENGTH.'</span>';
-			echo '<br class="clr"/><i class="gray small">'.$lang['srv_interno_ime'].'</i>';
-			echo '</div>';
+
+            echo '<div class="quick_title_setting">';
+
+			echo '  <div class="title_line">'.$lang['srv_novaanketa_polnoime'].':</div>';
+			echo '  <div class="setting_line">';
+			echo '      <input type="text" id="novaanketa_naslov_1" name="novaanketa_naslov_1" value="'.$naslov.'" class="medium" maxlength="'.ANKETA_NASLOV_MAXLENGTH.'"  onfocus="if(this.value==\''.$lang['srv_naslov'].'\') {this.value=\'\';}" />';
+			echo '      <span id="novaanketa_naslov_1_chars" class="counter">'.mb_strlen($naslov, 'UTF-8').'/'.ANKETA_NASLOV_MAXLENGTH.'</span>';
+			echo '  </div>';
+			echo '  <div class="opomba_line">';
+			echo        $lang['srv_interno_ime'];
+			echo '  </div>';
+
+            echo '</div>';
 			
-			echo '<br class="clr"/><br class="clr"/>';
-			
-			echo '<div class="quick_title_edit_label taLeft floatLeft">'.$lang['srv_novaanketa_kratkoime'].':</div>';
-			echo '<div class="floatLeft">';
+
+            echo '<div class="quick_title_setting">';
+
+			echo '  <div class="title_line">'.$lang['srv_novaanketa_kratkoime'].':</div>';
+			echo '  <div class="setting_line">';
 			$name_changed = ($naslov != $akronim) ? '1' : '0';
-			echo '<input type="text" id="novaanketa_akronim_1" name="novaanketa_akronim_1" value="'.$akronim.'" class="full" maxlength="'.ANKETA_AKRONIM_MAXLENGTH.'"  onfocus="$(this).attr(\'changed\',\'1\'); if(this.value==\''.$lang['srv_naslov'].'\') {this.value=\'\';}" changed="'.$name_changed.'" />';
-			echo '<span id="novaanketa_akronim_1_chars" class="spaceLeft">'.mb_strlen($akronim, 'UTF-8').'/'.ANKETA_AKRONIM_MAXLENGTH.'</span>';
-			echo '<br class="clr"/><i class="gray small">'.$lang['srv_objavljeno_ime'].'</i>';
-			echo '</div>';
-			
-			echo '<br class="clr"/><br class="clr"/>';
-			
-			echo '<div class="quick_title_edit_label taLeft floatLeft">'.$lang['srv_list_no_data_create_note'].':</div>';
-			echo '<div class="floatLeft">';
-			echo '<textarea id="novaanketa_opis_1" name="novaanketa_opis_1" class="full" rows="3">'.$row['intro_opomba'].'</textarea>';
-			echo '</div>';
+			echo '      <input type="text" id="novaanketa_akronim_1" name="novaanketa_akronim_1" value="'.$akronim.'" class="medium" maxlength="'.ANKETA_AKRONIM_MAXLENGTH.'"  onfocus="$(this).attr(\'changed\',\'1\'); if(this.value==\''.$lang['srv_naslov'].'\') {this.value=\'\';}" changed="'.$name_changed.'" />';
+			echo '      <span id="novaanketa_akronim_1_chars" class="counter">'.mb_strlen($akronim, 'UTF-8').'/'.ANKETA_AKRONIM_MAXLENGTH.'</span>';
+			echo '  </div>';
+			echo '  <div class="opomba_line">';
+            echo        $lang['srv_objavljeno_ime'];
+			echo '  </div>';
+
+            echo '</div>';
+
+
+            echo '<div class="quick_title_setting">';
+
+			echo '  <div class="title_line">'.$lang['srv_list_no_data_create_note'].':</div>';
+			echo '  <div class="setting_line">';
+			echo '      <textarea id="novaanketa_opis_1" name="novaanketa_opis_1" class="full" rows="3">'.$row['intro_opomba'].'</textarea>';
+			echo '  </div>';
+
+            echo '</div>';
+
 			
 			echo '<script>';
 			echo "$('#novaanketa_naslov_1').keyup(function(){
@@ -473,12 +489,10 @@ class SurveyAdminAjax {
 			    ";
 			echo '</script>';
 			
-			
-	        //echo '<span class="floatleft spaceLeft" title="'.$lang['srv_settings_quick'].'"><a class="" href="#" onclick="quick_title_edit_save(\'true\'); return false;"><span>'.$lang['srv_settings_quick'].'</span></a></span>';
-           
-            echo '<div class="buttons_holder">';
-			echo '<span class="buttonwrapper floatRight" title="'.$lang['srv_save_profile_yes'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="quick_title_edit_save(); return false;"><span>'.$lang['srv_save_profile_yes'].'</span></a></span>';
-	        echo '<span class="buttonwrapper floatRight spaceRight" title="'.$lang['srv_cancel'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="quick_title_edit_cancel(); return false;"><span>'.$lang['srv_cancel'].'</span></a></span>';
+			           
+            echo '<div class="button_holder">';
+	        echo '  <button class="medium white-blue" title="'.$lang['srv_cancel'].'" onclick="quick_title_edit_cancel(); return false;">'.$lang['srv_cancel'].'</button>';
+			echo '  <button class="medium blue" title="'.$lang['srv_save_profile_yes'].'" onclick="quick_title_edit_save(); return false;">'.$lang['srv_save_profile_yes'].'</button>';
             echo '</div>';
             
 			echo '</div>';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index ae7e89dfe..bc7ffa877 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -21808,12 +21808,21 @@ span.faicon.st-besede-popup {
 /* Survey title edit */
 #quick_title_edit {
   position: relative;
-  width: 720px;
-  height: 265px;
 }
-#quick_title_edit .quick_title_edit_label {
-  width: 145px;
-  font-weight: 600;
+#quick_title_edit .quick_title_setting {
+  margin-bottom: 16px;
+}
+#quick_title_edit .quick_title_setting .setting_line {
+  display: flex;
+  align-items: center;
+}
+#quick_title_edit .quick_title_setting .setting_line input {
+  margin-right: 8px;
+}
+#quick_title_edit .quick_title_setting .opomba_line {
+  font-size: 14px;
+  font-style: italic;
+  color: #a9a9a9;
 }
 
 /*
diff --git a/resources/sass/admin_new/pages/survey_edit/popups/title_edit.scss b/resources/sass/admin_new/pages/survey_edit/popups/title_edit.scss
index 619c44dee..c14027438 100644
--- a/resources/sass/admin_new/pages/survey_edit/popups/title_edit.scss
+++ b/resources/sass/admin_new/pages/survey_edit/popups/title_edit.scss
@@ -3,12 +3,28 @@
 #quick_title_edit {
 	position: relative;
 
-	width: 720px;
-	height: 265px;
+    .quick_title_setting{
+        margin-bottom: 16px;
+
+        .title_line{
+            
+        }
+        
+        .setting_line{
+            display: flex;
+            align-items: center;
+
+            input{
+                margin-right: 8px;
+            }
+        }
+
+        .opomba_line{
+            font-size: 14px;
+            font-style: italic;
+            color: #a9a9a9;
+        }
 
-    .quick_title_edit_label {
-        width: 145px;
-        font-weight: 600;
     }
 }