diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 84a5505e6..c5ed65cac 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -1547,7 +1547,7 @@ class Branching {
     * hitre nastavitve - na dnu pri formi
     *
     */
-    function toolbox_settings ($status1='none', $status2='none') {
+    function toolbox_settings ($status1='none') {
 		global $lang;
 		global $admin_type;
 
@@ -1570,7 +1570,7 @@ class Branching {
         $alertDiv == 1 ? $obvescanje = 0 : $obvescanje = 1;
 
 
-		echo '<div class="header" onClick="change_form_quicksettings(\'form_settings_obvescanje\');">';
+		echo '<div class="header" onClick="change_form_quicksettings();">';
 		echo    '<span>'.$lang['srv_alert_link_form'].'</span><span id="obvescanje_switch" class="faicon '.($status1 == 'none' ? 'arrow2_d' : 'arrow2_u').'"></span>';
 		echo '</div>';
 
@@ -1589,24 +1589,25 @@ class Branching {
 
 		// posebej navedeni maili
         echo '<div class="setting_row">';
-		echo '<p class="whole"><input type="checkbox" name="alert_finish_other"  id="alert_finish_other"  value="1"' . ($checked ? ' checked' : '') . ' onchange="toggleStatusAlertOtherCheckbox(\'finish_other\'); quick_settings(\'' . $row2['spr_id'] . '\', this, \'finish_other\'); return false;"><label for="alert_finish_other">' . $lang['email_prejemniki'] . ($checked ? $lang['email_one_per_line'] : '' ) . '</label></p>';
+		echo '  <input type="checkbox" name="alert_finish_other"  id="alert_finish_other"  value="1"' . ($checked ? ' checked' : '') . ' onchange="toggleStatusAlertOtherCheckbox(\'finish_other\'); quick_settings(\'' . $row2['spr_id'] . '\', this, \'finish_other\'); return false;"><label for="alert_finish_other">' . $lang['email_prejemniki'] . ($checked ? $lang['email_one_per_line'] : '' ) . '</label>';
+
+		echo '  <div id="alert_holder_finish_other_emails" '.($rowAlert['finish_other'] == 0 ? 'class="displayNone"' : '' ).'>';
+		echo '      <label for="alert_finish_other_emails">' . $lang['email'] . ':</label>';
+		echo '      <textarea name="alert_finish_other_emails" id="alert_finish_other_emails" style="height:100px; width:60%; margin-left: 10px;" onBlur="quick_settings(\'' . $row2['spr_id'] . '\', this.value, \'finish_other_emails\');">' . $rowAlert['finish_other_emails'] . '</textarea>';
+		echo '  </div>';
 
-		echo '<p id="alert_holder_finish_other_emails" '.($rowAlert['finish_other'] == 0 ? 'class="hidden"' : '' ).'>';
-		echo '<label for="alert_finish_other_emails">' . $lang['email'] . ':</label>';
-		echo '<textarea name="alert_finish_other_emails" id="alert_finish_other_emails" style="height:100px; width:60%; margin-left: 10px;" onBlur="quick_settings(\'' . $row2['spr_id'] . '\', this.value, \'finish_other_emails\');">' . $rowAlert['finish_other_emails'] . '</textarea>';
 		echo '</div>';
 
         // respondent
         echo '<div class="setting_row">';
-		echo '<p class="whole"><input type="checkbox"  class="enka-admin-custom" name="alert_finish_respondent" id="alert_finish_respondent" value="1" onChange="quick_settings(\'' . $row2['spr_id'] . '\', this, \'finish_respondent\'); return false;" ' . ($rowAlert['finish_respondent'] == 1 ? ' checked' : '') . '>';
-        echo '<span class="enka-checkbox-radio "></span>';
-		echo '<span id="label_alert_finish_respondent">';
+		echo '  <input type="checkbox"  class="enka-admin-custom" name="alert_finish_respondent" id="alert_finish_respondent" value="1" onChange="quick_settings(\'' . $row2['spr_id'] . '\', this, \'finish_respondent\'); return false;" ' . ($rowAlert['finish_respondent'] == 1 ? ' checked' : '') . '>';
+		echo '  <span id="label_alert_finish_respondent">';
 		$sas->display_alert_label('finish_respondent',($rowAlert['finish_respondent'] == 1), true);
-		echo '</span></p>';
+		echo '  </span>';
         echo '</div>';
 
-        echo '<div class="setting_row">';
-		echo '  <a href="index.php?anketa=' . $this->anketa . '&a=alert" >'.$lang['srv_detail_settings'].'<span class="faicon arrow2_r"></span></a>';
+        echo '<div class="setting_row bottom">';
+		echo '  <a href="index.php?anketa=' . $this->anketa . '&a=alert" class="noline">'.$lang['srv_detail_settings'].'<span class="faicon arrow2_r"></span></a>';
 		echo '</div>';
 
 		echo '</div>';
diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php
index 98a2b8f16..918889041 100644
--- a/admin/survey/BranchingAjax.php
+++ b/admin/survey/BranchingAjax.php
@@ -1791,7 +1791,6 @@ class BranchingAjax {
 		$results = $_POST['results'];
 		
 		$status1 = $_POST['status1'];
-		$status2 = $_POST['status2'];
 		
 		if($what == 'finish_author' || $what == 'finish_respondent_cms' || $what == 'finish_respondent' || $what == 'finish_other' | $what == 'finish_other_emails') {
 			sisplet_query("INSERT INTO srv_alert (ank_id, $what) VALUES ('$this->anketa', '$results')
@@ -1802,7 +1801,7 @@ class BranchingAjax {
 		}
 		
 		$b = new Branching($this->anketa);
-		$b->toolbox_settings($status1, $status2);
+		$b->toolbox_settings($status1);
     }
     
     
diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js
index a84cdc2bb..251267e72 100644
--- a/admin/survey/script/branching.js
+++ b/admin/survey/script/branching.js
@@ -856,25 +856,10 @@ function change_mode(what, value) {
 }
 
 // spremeni hitre nastavitve pri formi
-function change_form_quicksettings(what) {
+function change_form_quicksettings() {
 
-    var status = $('#' + what).css('display');
-    if (status == 'none') {
-        $('#' + what).show();
-        if (what == 'form_settings_obvescanje') {
-            $('#obvescanje_switch').removeClass("plus").addClass("minus");
-        } else {
-            $('#email_switch').removeClass("plus").addClass("minus");
-        }
-    }
-    else {
-        $('#' + what).hide();
-        if (what == 'form_settings_obvescanje') {
-            $('#obvescanje_switch').removeClass("minus").addClass("plus");
-        } else {
-            $('#email_switch').removeClass("minus").addClass("plus");
-        }
-    }
+    $('#form_settings_obvescanje').slideToggle();
+    $('#obvescanje_switch').toggleClass("arrow2_d").toggleClass("arrow2_u");
 
     vprasanje_save();
 }
@@ -2267,8 +2252,7 @@ function quick_settings(spremenljivka, results, what) {
         spremenljivka: spremenljivka,
         results: results,
         what: what,
-        status1: status1,
-        status2: status2
+        status1: status1
     });
 
     if (what == 'finish_respondent')
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index b0bd9b20f..e18f8a8d7 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -13587,10 +13587,10 @@ div.drop_setting_transition {
 #anketa_edit.glasovanje #placeholder #branching {
   min-height: 400px;
   width: calc(100% - 421px);
-  margin: 80px 0 0 0;
+  margin: 60px 0 0 0;
 }
 #anketa_edit.glasovanje #placeholder #vprasanje_float_editing {
-  margin-top: 80px !important;
+  margin-top: 60px !important;
 }
 
 /* Desne nastavitve */
@@ -13614,6 +13614,7 @@ div.drop_setting_transition {
   cursor: pointer;
   display: flex;
   justify-content: space-between;
+  align-items: center;
   font-weight: 600;
   text-transform: uppercase;
 }
@@ -13634,6 +13635,28 @@ div.drop_setting_transition {
 #quick_settings_holder #quick_settings #form_settings_obvescanje.form_bottom_settings .setting_row {
   margin: 16px 0 0 0;
 }
+#quick_settings_holder #quick_settings #form_settings_obvescanje.form_bottom_settings .setting_row .alert_authors .setting_item > span,
+#quick_settings_holder #quick_settings #form_settings_obvescanje.form_bottom_settings .setting_row #label_alert_finish_respondent > a,
+#quick_settings_holder #quick_settings #form_settings_obvescanje.form_bottom_settings .setting_row #label_alert_finish_respondent > p {
+  display: none;
+}
+#quick_settings_holder #quick_settings #form_settings_obvescanje.form_bottom_settings .setting_row #alert_holder_finish_other_emails {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 8px;
+}
+#quick_settings_holder #quick_settings #form_settings_obvescanje.form_bottom_settings .setting_row #alert_holder_finish_other_emails textarea {
+  width: 100% !important;
+  margin: 0 0 0 16px;
+}
+#quick_settings_holder #quick_settings #form_settings_obvescanje.form_bottom_settings .setting_row.bottom a {
+  font-size: 14px;
+}
+#quick_settings_holder #quick_settings #form_settings_obvescanje.form_bottom_settings .setting_row.bottom .faicon:before {
+  margin-left: 8px;
+  font-size: 12px;
+}
 
 /*
     Forma - urejanje
@@ -13644,10 +13667,10 @@ div.drop_setting_transition {
   /* Srednji del */
 }
 #anketa_edit.forma #placeholder #branching {
-  margin-top: 80px;
+  margin-top: 28px;
 }
 #anketa_edit.forma #placeholder #vprasanje_float_editing {
-  margin-top: 80px !important;
+  margin-top: 60px !important;
 }
 
 /*
diff --git a/resources/sass/admin_new/pages/survey_edit/forma.scss b/resources/sass/admin_new/pages/survey_edit/forma.scss
index d2d71ad28..26ae3afdd 100644
--- a/resources/sass/admin_new/pages/survey_edit/forma.scss
+++ b/resources/sass/admin_new/pages/survey_edit/forma.scss
@@ -12,11 +12,11 @@
     #placeholder{
 
         #branching {
-            margin-top: 80px;
+            margin-top: 28px;
         }
 
         #vprasanje_float_editing{
-            margin-top: 80px !important;
+            margin-top: 60px !important;
         }
     }
 }
diff --git a/resources/sass/admin_new/pages/survey_edit/glasovanje.scss b/resources/sass/admin_new/pages/survey_edit/glasovanje.scss
index 8101116b3..c8d26e842 100644
--- a/resources/sass/admin_new/pages/survey_edit/glasovanje.scss
+++ b/resources/sass/admin_new/pages/survey_edit/glasovanje.scss
@@ -98,11 +98,11 @@
         #branching {
             min-height: 400px;
             width: calc(100% - 421px);
-            margin: 80px 0 0 0;
+            margin: 60px 0 0 0;
         }
 
         #vprasanje_float_editing{
-            margin-top: 80px !important;
+            margin-top: 60px !important;
         }
     }
 }
@@ -134,6 +134,7 @@
 
             display: flex;
             justify-content: space-between;
+            align-items: center;
 
             font-weight: 600;
             text-transform: uppercase;
@@ -155,6 +156,37 @@
 
             .setting_row{
                 margin: 16px 0 0 0;
+
+                .alert_authors .setting_item > span,
+                #label_alert_finish_respondent > a,
+                #label_alert_finish_respondent > p{
+                    display: none;
+                }
+
+                #alert_holder_finish_other_emails{
+                    display: flex;
+                    align-items: center;
+                    justify-content: space-between;
+
+                    margin-top: 8px;
+
+                    textarea{
+                        width: 100% !important;
+                        margin: 0 0 0 16px;
+                    }
+                }
+
+                &.bottom{
+
+                    a{
+                        font-size: 14px;
+                    }
+
+                    .faicon:before{
+                        margin-left: 8px;
+                        font-size: 12px;
+                    }
+                }
             }
         }
     }