diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index ed9b18d70..25dde0a08 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1167,25 +1167,14 @@ class SurveyAdminSettings {
 				echo '<div class="links">';
 
 				$d = new Dostop();
-				
-				/*$sqlc = sisplet_query("SELECT COUNT(s.id) AS count FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='$this->anketa' AND s.gru_id=g.id AND s.thread > '0'");
-				if (!$sqlc) echo mysqli_error($GLOBALS['connect_db']);
-				$rowc = mysqli_fetch_array($sqlc);
-				if ($rowc['count'] > 0 && $d->checkDostopSub('test')) {
-					
-					echo '<div class="button" title="'.$lang['srv_view_comment'].' onClick="window.location.href=\''.$site_url . 'admin/survey/index.php?anketa=' . $row['id'] .'&a=komentarji\';">';
-					echo '<span class="faicon comments"></span>';
-					echo $lang['srv_view_comment'];
-					echo '</div>';
-				}*/
 
 				echo '<div class="button" title="'.$lang['srv_view_comment'].'" onClick="window.location.href=\'index.php?anketa='.$this->anketa.'&a=komentarji\';">';
 				echo '<span class="faicon comments_num blue"></span>';
 				echo $lang['srv_admin_s_comments_view'];
 				echo '</div>';
 
-				echo '<div class="button" id="more_comments" onclick="$(\'#komentarji_napredno\').fadeToggle(); $(\'#komentarji_napredno_arrow\').toggleClass(\'plus\'); $(\'#komentarji_napredno_arrow\').toggleClass(\'minus\'); $(this).toggleClass(\'border_blue\'); return false;">';
-				echo '<span id="komentarji_napredno_arrow" class="faicon plus blue"></span>';
+				echo '<div class="button" id="more_comments" onclick="$(\'#komentarji_napredno\').fadeToggle(); $(\'#komentarji_napredno_arrow\').toggleClass(\'plus minus\'); $(this).toggleClass(\'border_blue\'); return false;">';
+				echo '<span id="komentarji_napredno_arrow" class="faicon blue '.($_GET['advanced_expanded']==1 ? 'minus' : 'plus').'"></span>';
 				echo $lang['srv_admin_s_comments_set'];
 				echo '</div>';
 				
@@ -1229,6 +1218,9 @@ class SurveyAdminSettings {
 						
 						if ( ( !check_comments_admin() && !check_comments_admin_off() ) || ( !check_comments_resp() && !check_comments_resp_off() ) ) {
 							$('#komentarji_napredno').show();
+                            $('#komentarji_napredno_arrow').addClass('minus');
+                            $('#komentarji_napredno_arrow').removeClass('plus'); 
+                            $('#more_comments').removeClass('border_blue');
 						}
 						
 					});
@@ -1451,7 +1443,7 @@ class SurveyAdminSettings {
 				echo '</select>';
 				echo '</div>';
 				echo '<div class="setting_item">';
-				echo '<input type="hidden" name="question_comment_viewauthor" value=""><input type="checkbox" id="question_comment_viewauthor" value="1" '.($question_comment_viewauthor==1?' checked':'').' />';
+				echo '<input type="hidden" name="question_comment_viewauthor" value=""><input type="checkbox" id="question_comment_viewauthor" name="question_comment_viewauthor" value="1" '.($question_comment_viewauthor==1?' checked':'').' />';
 				echo '<label for="question_comment_viewauthor">'.$lang['srv_comments_viewauthor'].'</label>';
 				echo '</div>';
 							
@@ -3423,7 +3415,7 @@ class SurveyAdminSettings {
             echo '<div class="setting_holder">';
 
             echo '<label class="bottom4" for="alert_active_text0">' . $lang['message'] . ':</label>';
-            echo '<textarea name="alert_active_text0" id="alert_active_text0">' . $text . '</textarea>';
+            echo '<textarea name="alert_active_text0" id="alert_active_text0">' . $text0 . '</textarea>';
 
             echo '</div>';
 
@@ -3447,7 +3439,7 @@ class SurveyAdminSettings {
 			echo '<div class="setting_holder">';
 
             echo '<label class="bottom4" for="alert_active_text1">' . $lang['message'] . ':</label>';
-            echo '<textarea name="alert_active_text1" id="alert_active_text1">' . $text . '</textarea>';
+            echo '<textarea name="alert_active_text1" id="alert_active_text1">' . $text1 . '</textarea>';
 
             echo '</div>';
             echo '</div>';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 6b228c171..704dbaca3 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -9331,6 +9331,7 @@ input[type=radio], input[type=checkbox] {
 input[type=radio] + label:before, input[type=checkbox] + label:before {
   cursor: pointer;
   font-family: "Font Awesome 5 Free";
+  font-weight: 400;
   display: inline-block;
   color: #777777;
   letter-spacing: 8px;
diff --git a/resources/sass/admin_new/components/form/input.scss b/resources/sass/admin_new/components/form/input.scss
index be15d6469..6df66faa9 100644
--- a/resources/sass/admin_new/components/form/input.scss
+++ b/resources/sass/admin_new/components/form/input.scss
@@ -87,6 +87,7 @@ input {
     &[type=checkbox] + label:before {
         cursor: pointer;
         font-family: $fontawesome;
+        font-weight: 400;
 
         display: inline-block;