diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php
index 06e0d29f1..7c526c011 100644
--- a/admin/survey/BranchingAjax.php
+++ b/admin/survey/BranchingAjax.php
@@ -2258,7 +2258,7 @@ class BranchingAjax {
 		
 		$rowanketa = SurveyInfo::getInstance()->getSurveyRow();
 
-		echo '<textarea name="vsebina" placeholder="'.$lang['srv_comments_add_comment'].'" id="vsebina_'.$spremenljivka.'_'.$view.'"></textarea>';
+		echo '<textarea name="vsebina" placeholder="'.$lang['srv_comments_add_comment'.$type.''].'" id="vsebina_'.$spremenljivka.'_'.$view.'"></textarea>';
         
 		if ($buttons) {
 			echo '<div class="button_holder bottom0">';
diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index ce7365118..2db55b53a 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -1425,25 +1425,35 @@ class SurveyAdmin
 
                     //dropdown na klik ikone
                     echo '<div id="comment_dropdown" class="displayNone">';
+                   
+                    echo '<div class="comment_dropdown_top">';
 
                     echo '<div class="title">';
                     echo '<span class="faicon comment_dropdown"></span>';
                     echo $lang['comments'];
+                    echo '</div>';
+
+                    echo '<div class="settings">';
+                    echo '<a href="index.php?anketa=' . $this->anketa . '&a=urejanje" title="' . $lang['srv_settings_komentarji1'] . '">';
+                    echo '<span class="faicon wheel_32"></span>';
+                    echo '</a>';
+                    echo '</div>';
+                    
                     echo '</div>';
 
 				    $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji_anketa\'; return false;';
                     echo '<div class="links" onclick="'.$comment_link.'">';
-                    echo $lang['srv_testiranje_komentarji_anketa_title'];
-                    echo ' (' . $comment_count['question']['unresolved'];
-		            echo '/' . $comment_count['question']['all'] . ')';
+                    echo $lang['srv_testiranje_komentarji_anketa_overview'];
+                    echo ' (<span class="red">' . $comment_count['question']['unresolved'];
+		            echo '</span>/' . $comment_count['question']['all'] . ')';
                     echo '<span class="faicon fa-angle-right"></span>';
                     echo '</div>';
 
 				    $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji\'; return false;';
                     echo '<div class="links" onclick="'.$comment_link.'">';
-                    echo $lang['srv_testiranje_komentarji_title'];
-                    echo ' (' . ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']); //nerešeni
-		            echo '/' . ($comment_count['survey_resp']['all'] + $comment_count['survey_admin']['all']) . ')'; //vsi
+                    echo $lang['srv_testiranje_komentarji_overview'];
+                    echo ' (<span class="red">' . ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']); //nerešeni
+		            echo '</span>/' . ($comment_count['survey_resp']['all'] + $comment_count['survey_admin']['all']) . ')'; //vsi
                     echo '<span class="faicon fa-angle-right"></span>';
                     echo '</div>';
 
@@ -1453,18 +1463,9 @@ class SurveyAdmin
                     echo '</div>';
 
                     echo '<div class="button_holder">';
-                    echo '  <button class="small blue" onclick="toggleCommentDropdown(); return false;">'.$lang['srv_zapri'].'</button>';
-
-                    echo '<div class="options">';
-                    echo '<div class="square" onclick="toggleCommentDropdown(); return false;">';
-                    echo '<span class="faicon fa-times"></span>';
+                    echo '<button class="small white-blue" onclick="toggleCommentDropdown(); return false;">'.$lang['edit1338'].'</button>';
+                    echo '<button class="small blue" onclick="add_comment(\'0\', \'0\', \'1\', $(\'#vsebina_0_1\').val()); actionNotePopup(\'comment_added\', \'success\');return false;">'.$lang['srv_comments_new'].'</button>';
                     echo '</div>';
-                    echo '<div class="square blue" onclick="add_comment(\'0\', \'0\', \'1\', $(\'#vsebina_0_1\').val()); actionNotePopup(\'comment_added\', \'success\');return false;">';
-                    echo '<span class="faicon fa-paper-plane"></span>';
-                    echo '</div>';
-                    echo '</div>';
-
-                    echo '</div>'; //button holder
 
                     echo '</div>'; //comment_dropdown
 
diff --git a/lang/1.php b/lang/1.php
index 97c72ec4c..7ba79a001 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -4922,6 +4922,8 @@ $lang = array (
 	"desc2"								=>	"Padajo&#269;e brez preteklih (samo za datume)",
 	"archive_date"							=>	"Zapis datuma v arhivu: ",
 	"srv_comments_add_comment"					=>	"Nov komentar",
+	"srv_comments_add_comment0"					=>	"Nov splošni komentar na anketo",
+	"srv_comments_add_comment1"					=>	"Nov komentar na vprašanje",
 	"srv_comments_unresolved"					=>	"Samo nerešeni komentarji",
 	"srv_comments_marks"						=>	"Označevanje komentarjev",
 	"srv_comments_marks_0"						=>	"Enostavno (Končano)",
@@ -5390,6 +5392,7 @@ $lang = array (
 	"srv_testiranje_komentarji_anketa"			=>	"Komentarji na anketo",
 	"srv_testiranje_komentarji_anketa_link"			=>	"Oglej si komentarje na anketo",
 	"srv_testiranje_komentarji_title"			=>	"Komentarji na vprašanja",			
+	"srv_testiranje_komentarji_overview"			=>	"Pregled komentarjev na vprašanja",			
 	"srv_testiranje_komentarji_title_link"			=>	"Oglej si komentarje na vprašanja",			
 	"srv_testiranje_komentar_q_title"			=>	"Komentar na vprašanje",			
 	"srv_testiranje_komentar_q_all_title"		=>	"Komentarji na vprašanje",			
@@ -5399,6 +5402,7 @@ $lang = array (
 	"srv_testiranje_komentar_blok_title"		=>	"Komentar na blok",			
 	"srv_testiranje_komentar_blok_all_title"	=>	"Komentarji na blok",			
 	"srv_testiranje_komentarji_anketa_title"	=>	"Splošni komentarji",			
+	"srv_testiranje_komentarji_anketa_overview"	=>	"Pregled splošnih komentarjev",			
 	"srv_testiranje_komentarji_anketa_title2"	=>	"Splošni komentarji na anketo",	
 	"srv_testiranje_vnosi"						=>	"Avtomatski vnosi",
 	"srv_testiranje_vnosi2"						=>	"Avtomatski testni vnos",
diff --git a/lang/2.php b/lang/2.php
index 2188c803b..bf78c24da 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4016,6 +4016,7 @@ $lang = array (
 	"srv_testiranje_komentarji_anketa"	=>	"Survey comments",	
 	"srv_testiranje_komentarji_anketa_link"	=>	"View survey comments",	
 	"srv_testiranje_komentarji_title"			=>	"Question comments",	
+	"srv_testiranje_komentarji_overview"			=>	"Question comments overview",			
 	"srv_testiranje_komentarji_title_link"			=>	"View question comments",	
 	"srv_testiranje_komentar_q_title"			=>	"Question comment",			
 	"srv_testiranje_komentar_q_all_title"		=>	"Question comments",			
@@ -4025,6 +4026,7 @@ $lang = array (
 	"srv_testiranje_komentar_blok_title"		=>	"Block comment",		
 	"srv_testiranje_komentar_blok_all_title"	=>	"Block comments",		
 	"srv_testiranje_komentarji_anketa_title"	=>	"Survey comments",	
+	"srv_testiranje_komentarji_anketa_overview"	=>	"Survey comments overview",			
 	"srv_testiranje_komentarji_anketa_title2"	=>	"General survey comments",		
 	"srv_truncate"						=>	"%s of the longest and shortest times are removed before calculation average times.",			
 	"srv_truncate_off"					=>	"Calculate with all times",
@@ -4893,7 +4895,9 @@ $lang = array (
 	"srv_chart_ttest_title"						=>	"Average value",
 	"srv_chart_settings_fullScale"				=>	"Full scale",
     "srv_chart_open_answers_settings"			=>	"Open answers settings",
-	"srv_comments_add_comment"					=>	"Respond to comments",
+	"srv_comments_add_comment"					=>	"New comment",
+	"srv_comments_add_comment0"					=>	"New general survey comment",
+	"srv_comments_add_comment1"					=>	"New question comment",
 	"srv_comments_unresolved"					=>	"Display only unresolved comments",
 	"srv_comments_marks"						=>	"Labelling comments",
 	"srv_comments_marks_0"						=>	"Simple (done)",
diff --git a/main/survey/app/Controllers/BodyController.php b/main/survey/app/Controllers/BodyController.php
index 949f1b3c2..071b969a3 100644
--- a/main/survey/app/Controllers/BodyController.php
+++ b/main/survey/app/Controllers/BodyController.php
@@ -2350,7 +2350,7 @@ class BodyController extends Controller
                             $_GET['testdata'] == 'on')
                     ) {
 
-                        echo '<span id="test_comments" class="stngs floatLeft">';
+                        echo '<span class="stngs floatLeft">';
 
                         $show_survey_comment = $_GET['show_survey_comment'];
                         if ($row['forum'] == 0 || $row['thread'] == 0) {
@@ -2364,7 +2364,7 @@ class BodyController extends Controller
                             $rowf = mysqli_fetch_array($sqlf);
                             $rowf['count']--; //zaradi 1. avtomatskega posta
 
-                            echo '<span class="blue bold" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
+                            echo '<a href="#" onclick="return false;" class="surveycomment bold" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
                             echo self::$lang['srv_comment_splosen'] . ' ';
                             echo '<span class="faicon comment" title="' . self::$lang['srv_survey_comment'] . '" alt="' . self::$lang['srv_survey_comment'] . '"></span>';
                         
@@ -2375,65 +2375,15 @@ class BodyController extends Controller
                                 if (mysqli_num_rows($s) == 0)
                                     $show_survey_comment = 1;
                             }
-                            echo '</span>';
-
-                            //dropdown na klik ikone
-                            echo '<div id="comment_dropdown" class="displayNone">';
-
-                            echo '<div class="title">';
-                            echo '<span class="faicon comment_dropdown"></span>';
-                            echo $lang['comments'];
-                            echo '</div>';
-
-                            $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji\'; return false;';
-                            echo '<div class="links" onclick="'.$comment_link.'">';
-                            echo $lang['srv_testiranje_komentarji_anketa_title'];
-                            echo ' (' . $comment_count['question']['unresolved'];
-                            echo '/' . $comment_count['question']['all'] . ')';
-                            echo '<span class="faicon fa-angle-right"></span>';
-                            echo '</div>';
-
-                            $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji_anketa\'; return false;';
-                            echo '<div class="links" onclick="'.$comment_link.'">';
-                            echo $lang['srv_testiranje_komentarji_title'];
-                            echo ' (' . ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']); //nerešeni
-                            echo '/' . ($comment_count['survey_resp']['all'] + $comment_count['survey_admin']['all']) . ')'; //vsi
-                            echo '<span class="faicon fa-angle-right"></span>';
-                            echo '</div>';
-
-                            echo '<div id="survey_comment_0_1">';
-                            $ba = new BranchingAjax($this->anketa);
-                            $ba->add_comment_field(0, '0', '1', false, false);
-                            echo '</div>';
-
-                            echo '<div class="button_holder">';
-                            echo '  <button class="small blue" onclick="toggleCommentDropdown(); return false;">'.$lang['srv_zapri'].'</button>';
-
-                            echo '<div class="options">';
-                            echo '<div class="square" onclick="toggleCommentDropdown(); return false;">';
-                            echo '<span class="faicon fa-times"></span>';
-                            echo '</div>';
-                            echo '<div class="square blue" onclick="add_comment(\'0\', \'0\', \'1\', $(\'#vsebina_0_1\').val()); return false;">';
-                            echo '<span class="faicon fa-paper-plane"></span>';
-                            echo '</div>';
-                            echo '</div>';
-
-                            echo '</div>'; //button holder
-
-                            echo '</div>'; //comment_dropdown
-
-                            // Klik izven  - zapremo dropdown
-                            echo '<script>
-                            $(document).mouseup(function(e){
-                                var container = $("#comment_dropdown");
-                            
-                                if (!container.is(e.target) && container.has(e.target).length === 0){
-                                    $("#comment_dropdown").addClass("displayNone");
-                                }
-                            });
-                            </script>';
+                            echo '</a>';
                         }
 
+                        echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/js-lang.php?lang='.self::$lang['lang_short'].'&amp;v=13.06.07"></script>';
+                        // Ce je tole vklopljeno se js porusi?
+                        //echo '<script type="text/javascript" src="'.self::$site_url.'/admin/survey/minify/g=jsnew?v=13.06.07"></script>';
+                        echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/jquery/jquery.qtip-1.0.js"></script>';
+                        echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/script.js"></script>';
+                        echo '<script>  $(function() {  load_comment(\'#surveycomment_0_' . $view . '\'' . ($show_survey_comment == '1' ? ', \'2\'' : '') . ');  });</script>';
 
                         echo '</span>';
                     }
@@ -2467,7 +2417,7 @@ class BodyController extends Controller
                             $sqlf = sisplet_query("SELECT COUNT(*) AS count FROM post WHERE tid='$row[thread_resp]'");
                             $rowf = mysqli_fetch_array($sqlf);
                             $rowf['count']--; //zaradi 1. avtomatskega posta
-                            echo '<span onclick="return false;" class="surveycomment bold" id="surveycomment_0_' . $view . '" type="4" view="' . $view . '" spremenljivka="0">';
+                            echo '<a href="#" onclick="return false;" class="surveycomment bold" id="surveycomment_0_' . $view . '" type="4" view="' . $view . '" spremenljivka="0">';
                             echo self::$lang['srv_comment_splosen'] . ' ';
                             echo '<span class="faicon comment" title="' . self::$lang['srv_survey_comment'] . '" alt="' . self::$lang['srv_survey_comment'] . '"></span>';
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 3c12a983e..ba8274df3 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10415,9 +10415,9 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
 div.button_holder.editor_button_holder {
   margin: 0;
   padding: 8px 16px;
-  border-bottom: 1px rgb(204, 204, 204) solid;
-  border-left: 1px rgb(204, 204, 204) solid;
-  border-right: 1px rgb(204, 204, 204) solid;
+  border-bottom: 1px #cccccc solid;
+  border-left: 1px #cccccc solid;
+  border-right: 1px #cccccc solid;
   border-radius: 0 0 2px 2px;
 }
 
@@ -10445,8 +10445,8 @@ div.button_holder.editor_button_holder {
 }
 .cke_toolbox .cke_button__textcolor:after,
 .cke_toolbox .cke_button__image_icon:after {
-  background-color: rgb(191, 191, 191);
-  border-color: rgb(191, 191, 191);
+  background-color: #bfbfbf;
+  border-color: #bfbfbf;
   content: "";
   position: absolute;
   height: 18px;
@@ -11305,7 +11305,7 @@ div#gdrp_requests_unresolved {
 }
 .gdpr-box-container .num_box {
   border: 1px solid #E5E5E5;
-  background-color: white;
+  background-color: #FFFF;
   border-radius: 2px;
   cursor: pointer;
   margin: 0px;
@@ -21304,7 +21304,7 @@ div#theme-edit-wrap div#theme-editor #picker {
   left: 500px;
   z-index: 999;
   border-radius: 2px;
-  box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
+  box-shadow: 0px 0px 7px 0px #0000001F;
 }
 div#theme-edit-wrap div#theme-editor #picker .popup_close {
   position: absolute !important;
@@ -25747,30 +25747,43 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment .
   padding: 12px;
   cursor: auto !important;
 }
-#quick_comments_link #comment_dropdown .title {
-  width: 100%;
+#quick_comments_link #comment_dropdown .comment_dropdown_top {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-content: center;
+  border-bottom: 1px #E5E5E5 solid;
   margin-bottom: 16px;
   padding-bottom: 12px;
+}
+#quick_comments_link #comment_dropdown .comment_dropdown_top .title {
+  width: 100%;
+  padding-top: 4px;
   font-weight: 600;
   font-size: 16px;
   text-transform: uppercase;
-  border-bottom: 1px #E5E5E5 solid;
   font-size: 14px !important;
   color: #333333;
   display: flex;
   flex-direction: row;
   align-content: center;
 }
-#quick_comments_link #comment_dropdown .title span.faicon.comment_dropdown {
+#quick_comments_link #comment_dropdown .comment_dropdown_top .title span.faicon.comment_dropdown {
   margin-right: 6px;
   line-height: 17px !important;
 }
-#quick_comments_link #comment_dropdown .title span.faicon.comment_dropdown::before {
+#quick_comments_link #comment_dropdown .comment_dropdown_top .title span.faicon.comment_dropdown::before {
   color: #1E88E5 !important;
   font-weight: 400;
   font-size: 14px !important;
   content: "\f27a";
 }
+#quick_comments_link #comment_dropdown .comment_dropdown_top .settings span.faicon::before {
+  color: #1E88E5 !important;
+  font-size: 16px !important;
+  content: "\f013";
+  line-height: 17px !important;
+}
 #quick_comments_link #comment_dropdown .links {
   margin-bottom: 16px;
   color: #1E88E5;
@@ -25782,9 +25795,13 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment .
   cursor: pointer;
   width: fit-content;
 }
+#quick_comments_link #comment_dropdown .links span {
+  font-size: 14px;
+}
 #quick_comments_link #comment_dropdown .links span.faicon {
   margin-left: 8px;
-  line-height: 17px !important;
+  padding-top: 1px;
+  line-height: 18px !important;
 }
 #quick_comments_link #comment_dropdown .links span.faicon::before {
   color: #1E88E5 !important;
@@ -25839,114 +25856,6 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment .
   font-size: 16px !important;
 }
 
-span#test_comments {
-  position: relative;
-}
-span#test_comments #comment_dropdown {
-  position: absolute;
-  background-color: #FFFFFF;
-  top: 35px;
-  right: 0;
-  width: 305px;
-  z-index: 9999;
-  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
-  border-radius: 2px;
-  font-family: Source Sans Pro, sans-serif;
-  padding: 12px;
-  cursor: auto !important;
-}
-span#test_comments #comment_dropdown .title {
-  width: 100%;
-  margin-bottom: 16px;
-  padding-bottom: 12px;
-  font-weight: 600;
-  font-size: 16px;
-  text-transform: uppercase;
-  border-bottom: 1px #E5E5E5 solid;
-  font-size: 14px !important;
-  color: #333333;
-  display: flex;
-  flex-direction: row;
-  align-content: center;
-}
-span#test_comments #comment_dropdown .title span.faicon.comment_dropdown {
-  margin-right: 6px;
-  line-height: 17px !important;
-}
-span#test_comments #comment_dropdown .title span.faicon.comment_dropdown::before {
-  color: #1E88E5 !important;
-  font-weight: 400;
-  font-size: 14px !important;
-  content: "\f27a";
-}
-span#test_comments #comment_dropdown .links {
-  margin-bottom: 16px;
-  color: #1E88E5;
-  font-weight: 400;
-  font-size: 14px !important;
-  display: flex;
-  flex-direction: row;
-  align-content: center;
-  cursor: pointer;
-  width: fit-content;
-}
-span#test_comments #comment_dropdown .links span.faicon {
-  margin-left: 8px;
-  line-height: 17px !important;
-}
-span#test_comments #comment_dropdown .links span.faicon::before {
-  color: #1E88E5 !important;
-  font-size: 14px !important;
-}
-span#test_comments #comment_dropdown #comment_field {
-  padding-top: 16px;
-  border-top: 1px solid #E5E5E5;
-  margin-bottom: 10px;
-}
-span#test_comments #comment_dropdown #comment_field textarea {
-  height: 130px;
-  width: 100%;
-  margin: 0;
-}
-span#test_comments #comment_dropdown .button_holder {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  padding-top: 8px;
-  border-top: 1px solid #E5E5E5;
-  margin-bottom: 0;
-}
-span#test_comments #comment_dropdown .button_holder button {
-  min-width: 128px;
-}
-span#test_comments #comment_dropdown .button_holder .options {
-  display: flex;
-  flex-direction: row;
-}
-span#test_comments #comment_dropdown .button_holder .options .square {
-  box-sizing: border-box;
-  border: 1px solid #1E88E5;
-  width: 28px;
-  height: 28px;
-  margin-left: 8px;
-  display: flex;
-  justify-content: center;
-  align-content: center;
-  color: #1E88E5;
-  font-size: 14px !important;
-  cursor: pointer;
-}
-span#test_comments #comment_dropdown .button_holder .options .square.blue {
-  background-color: #1E88E5;
-}
-span#test_comments #comment_dropdown .button_holder .options .square.blue span.faicon::before {
-  font-size: 14px !important;
-  color: #FFFFFF;
-}
-span#test_comments #comment_dropdown .button_holder .options .square span.faicon::before {
-  font-size: 16px !important;
-}
-
 #quick_comments_link.newCss {
   text-align: center;
 }
@@ -26310,6 +26219,7 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   .page_vabila #vabila .button_holder #nice_url_holder .buttons {
     margin: 9px 0px 0px 0px !important;
   }
+
   div#vabila div.more div.more_block {
     width: 89% !important;
   }
@@ -30465,7 +30375,7 @@ iframe#ifmcontentstoprint {
 .analysis_icons_holder {
   background-color: white;
   border-radius: 2px;
-  box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
+  box-shadow: 0px 0px 7px 0px #0000001F;
 }
 .analysis_icons_holder .icon_box {
   margin-left: 16px;
@@ -30754,15 +30664,15 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_l
 }
 
 .rsdl_bck1 {
-  background-color: rgb(250, 226, 226) !important;
+  background-color: #fae2e2 !important;
 }
 
 .rsdl_bck2 {
-  background-color: rgb(255, 157, 157) !important;
+  background-color: #ff9d9d !important;
 }
 
 .rsdl_bck3 {
-  background-color: rgb(248, 66, 66) !important;
+  background-color: #f84242 !important;
 }
 
 .rsdl_bck4 {
@@ -34250,19 +34160,24 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   #quick_comments_link.newCss {
     display: none;
   }
+
   #firstNavigation ol.right-side {
     display: none;
   }
+
   div.status_advanced {
     flex-direction: column;
   }
+
   div.status_advanced_box {
     width: 100%;
     box-sizing: border-box;
   }
+
   a.status_advanced_link {
     width: 95%;
   }
+
   .content_div_normalmode {
     overflow-x: auto;
   }
@@ -34356,6 +34271,7 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
+
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -34385,36 +34301,44 @@ fieldset textarea {
   fieldset .setting {
     height: auto !important;
   }
+
   .setting_horizontal_wrapper {
     flex-direction: column !important;
   }
+
   #vnosi_paginacija div select {
     display: inline-block;
     width: fit-content;
     margin: 0 5px;
     text-align: center;
   }
+
   div.breadcrumbs {
     display: block;
     padding: 15px;
     color: #1e88e5;
     font-weight: 600;
   }
+
   button.small, submit.small {
     min-width: auto;
     padding: 5px 16px;
   }
+
   button.medium, submit.medium {
     min-width: auto;
     padding: 10px 24px;
   }
+
   button.large, submit.large {
     min-width: auto;
     padding: 12px 32px;
   }
+
   .top_note {
     padding: 8px 16px;
   }
+
   header {
     /* Mobile meni */
     /* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@@ -34670,6 +34594,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   header .mobile_settings .mobile_settings_content a .setting_text {
     width: auto;
   }
+
   footer#srv_footer {
     display: flex;
     flex-direction: column;
@@ -34691,6 +34616,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
+
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -34701,6 +34627,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     left: 10% !important;
     box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
   }
+
   .divPopUp {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
@@ -34711,10 +34638,12 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
   }
+
   /* Vse povezano s paketi in placili */
   .dt-buttons {
     display: none;
   }
+
   #main #moje_ankete_edit #anketa_edit {
     padding: 0 !important;
   }
@@ -34789,6 +34718,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit fieldset div.setting {
     margin-bottom: 10px;
   }
+
   #new_anketa_div {
     display: flex;
     flex-direction: column;
@@ -34872,6 +34802,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border: 1px solid #c8e3f8 !important;
     border-radius: 1px;
   }
+
   .dashboard_top_settings {
     flex-direction: column;
   }
@@ -34884,16 +34815,19 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0;
     margin-right: 16px;
   }
+
   .dashboard_boxes {
     flex-direction: column;
   }
   .dashboard_boxes .dashboard_box {
     margin: 0 0 32px 0;
   }
+
   .locked .add-variable-mobile,
 .spremenljivka_content .add-variable {
     display: none !important;
   }
+
   #branching {
     width: 100%;
     margin: 0;
@@ -34998,9 +34932,11 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin: 0;
     padding: 0 12px;
   }
+
   .toolbox_holder {
     display: none;
   }
+
   .mobile_add_question {
     display: block;
     position: fixed;
@@ -35020,6 +34956,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     line-height: 15px;
     font-weight: 600;
   }
+
   .mobile_add_question_popup {
     z-index: 9999;
     position: fixed;
@@ -35073,6 +35010,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     font-size: 14px;
     font-weight: 500;
   }
+
   #vprasanje_float_editing .vprasanje_edit_holder {
     position: fixed;
     z-index: 99999;
@@ -35125,6 +35063,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0 !important;
     text-align: center;
   }
+
   #main #anketa #globalSetingsList {
     max-width: 100% !important;
     width: 100% !important;
@@ -35137,6 +35076,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
     width: 100%;
   }
+
   /* NASTAVITVE in ARHIVI */
   /* OBLIKA */
   #main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@@ -35152,15 +35092,18 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
     height: auto;
   }
+
   #theme-editor {
     width: 100% !important;
     float: none !important;
   }
+
   #theme-preview {
     width: 100% !important;
     float: none !important;
     margin-top: 80px !important;
   }
+
   /* ARHIVI */
   #main #anketa #anketa_edit.page_arhivi {
     flex-direction: column-reverse;
@@ -35178,6 +35121,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
     width: 100% !important;
   }
+
   div.page_tema .theme_list {
     flex-wrap: wrap;
   }
@@ -35204,6 +35148,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
     margin-right: 8px;
   }
+
   .page_theme-editor #theme-preview {
     display: none;
   }
@@ -35211,6 +35156,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
+
   #srv_diagnostic br {
     display: none;
   }
@@ -35231,6 +35177,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #srv_diagnostic #srv_diagnostic_results_right table td + td {
     width: auto !important;
   }
+
   .subpage_testnipodatki {
     line-height: 20px;
   }
@@ -35244,6 +35191,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .subpage_testnipodatki form label input {
     vertical-align: bottom;
   }
+
   .lastnosti_wrapper {
     flex-direction: column !important;
   }
@@ -35251,6 +35199,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 .lastnosti_wrapper .lastnosti_right {
     width: 100% !important;
   }
+
   .page_vabila #vabila .button_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -35275,6 +35224,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_vabila #vabila .more_block {
     width: 100%;
   }
+
   .page_invitations #inv_top_navi {
     flex-direction: column;
     align-items: flex-start;
@@ -35342,6 +35292,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_invitations .button_holder button {
     margin-bottom: 8px;
   }
+
   #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,
@@ -35425,6 +35376,7 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
+
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -35432,6 +35384,7 @@ table.invitations_settings p label input[type=password],
     margin: 10px 0 !important;
     box-sizing: border-box !important;
   }
+
   #inv_top_navi {
     display: flex;
     flex-direction: column;
@@ -35470,6 +35423,7 @@ table.invitations_settings p label input[type=password],
   #inv_top_navi > #inv_step_nav.yellow .inv_step_space {
     display: none;
   }
+
   #inv_recipients_profiles_holder,
 #inv_import_list_container,
 #inv_messages_profiles_holder,
@@ -35490,6 +35444,7 @@ table.invitations_settings p label input[type=password],
 #inv_select_mail_preview textarea {
     width: 100%;
   }
+
   #inv_msg_preview table th {
     height: auto !important;
     width: 100% !important;
@@ -35501,6 +35456,7 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
+
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -35515,9 +35471,11 @@ table.invitations_settings p label input[type=password],
   .addthis_toolbox .addthis_separator {
     font-size: 16px;
   }
+
   #inv_field_container ul li {
     width: 45%;
   }
+
   /* grafika ko ni podatkov */
   div.no_data_alert img {
     width: 100%;
@@ -35529,6 +35487,7 @@ table.invitations_settings p label input[type=password],
     flex-direction: column;
     align-items: center;
   }
+
   .page_data .data_table_top_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -35599,9 +35558,11 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     margin-bottom: 16px;
   }
+
   body.data_fullscreen #analiza_data {
     top: 68px;
   }
+
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -35642,6 +35603,7 @@ table.invitations_settings p label input[type=password],
     clear: both;
     margin: 40px 0 0 0 !important;
   }
+
   .subpage_quick_edit #quick_edit_top_line {
     flex-direction: column-reverse;
   }
@@ -35661,6 +35623,7 @@ table.invitations_settings p label input[type=password],
   .subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
     justify-content: center;
   }
+
   .analysis_bottom_settings {
     flex-wrap: wrap;
   }
@@ -35670,13 +35633,16 @@ table.invitations_settings p label input[type=password],
     margin: 0 0 16px 0 !important;
     border: 0;
   }
+
   .div_analiza_icons,
 .div_analiza_scale {
     opacity: 1 !important;
   }
+
   .analysis_icons_holder {
     display: none;
   }
+
   .chart_holder {
     width: 100%;
     box-sizing: border-box;
@@ -35699,6 +35665,7 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
+
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -35715,12 +35682,14 @@ table.analysis_reports > tbody > tr > td {
   table.analysis_reports fieldset {
     margin-bottom: 0 !important;
   }
+
   .reports_holder {
     flex-direction: column;
   }
   .reports_holder fieldset {
     width: 100%;
   }
+
   .noSurvey_sequence {
     padding: 0;
   }
@@ -35742,11 +35711,13 @@ table.analysis_reports > tbody > tr > td {
   .noSurvey_sequence .buttons_holder a .button {
     margin: 10px 30px;
   }
+
   #table-horizontal-scroll-wrapper1-userchanges {
     display: table;
     table-layout: fixed;
     width: 100%;
   }
+
   #table-horizontal-scroll-wrapper2-userchanges {
     display: table-cell;
     overflow-x: auto;
@@ -35757,6 +35728,7 @@ table.analysis_reports > tbody > tr > td {
     border-collapse: collapse;
     white-space: nowrap;
   }
+
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,
diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
index 7ecc394af..0828bd0e9 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
@@ -757,34 +757,56 @@ div.page_komentarji_anketa {
 
         cursor: auto !important;
 
-        .title {
-            width: 100%;
-            margin-bottom: 16px;
-            padding-bottom: 12px;
-
-            font-weight: 600;
-            font-size: 16px;
-            text-transform: uppercase;
-
-            border-bottom: 1px $gray solid;
-
-            font-size: 14px !important;
-            color: $black;
+        .comment_dropdown_top {
 
             display: flex;
             flex-direction: row;
+            justify-content: space-between;
             align-content: center;
 
-            span.faicon.comment_dropdown {
-                margin-right: 6px;
-                line-height: 17px !important;
-                &::before{
-                    color: $blue !important;
-                    font-weight: 400;
-                    font-size: 14px !important;
-                    content: "\f27a";
+            border-bottom: 1px $gray solid;
+            margin-bottom: 16px;
+            padding-bottom: 12px;
+
+            .title {
+                width: 100%;
+                padding-top: 4px;
+    
+                font-weight: 600;
+                font-size: 16px;
+                text-transform: uppercase;
+    
+                font-size: 14px !important;
+                color: $black;
+    
+                display: flex;
+                flex-direction: row;
+                align-content: center;
+    
+                span.faicon.comment_dropdown {
+                    margin-right: 6px;
+                    line-height: 17px !important;
+                    &::before{
+                        color: $blue !important;
+                        font-weight: 400;
+                        font-size: 14px !important;
+                        content: "\f27a";
+                    }
                 }
             }
+
+            .settings {
+                span.faicon {
+                    &::before{
+                        color: $blue !important;
+                        font-size: 16px !important;
+                        content: "\f013";
+                        line-height: 17px !important;
+                    }
+                }
+            }
+
+
         }
 
         .links {
@@ -802,12 +824,17 @@ div.page_komentarji_anketa {
             width: fit-content;
 
 
-            span.faicon {
-                margin-left: 8px;
-                line-height: 17px !important;
-                &::before{
-                    color: $blue !important;
-                    font-size: 14px !important;
+            span {
+                font-size: 14px;
+
+                &.faicon {
+                    margin-left: 8px;
+                    padding-top: 1px;
+                    line-height: 18px !important;
+                    &::before{
+                        color: $blue !important;
+                        font-size: 14px !important;
+                    }
                 }
             }
 
@@ -876,148 +903,6 @@ div.page_komentarji_anketa {
         }
     }
 }
-
-span#test_comments {
-    position: relative;
-
-    #comment_dropdown {
-        position: absolute;
-        background-color: $white;
-        top: 35px;
-        right: 0;
-        width: 305px;
-
-        z-index: 9999;
-
-        box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
-        border-radius: 2px;
-
-        font-family: $font_family;
-
-        padding: 12px;
-
-        cursor: auto !important;
-
-        .title {
-            width: 100%;
-            margin-bottom: 16px;
-            padding-bottom: 12px;
-
-            font-weight: 600;
-            font-size: 16px;
-            text-transform: uppercase;
-
-            border-bottom: 1px $gray solid;
-
-            font-size: 14px !important;
-            color: $black;
-
-            display: flex;
-            flex-direction: row;
-            align-content: center;
-
-            span.faicon.comment_dropdown {
-                margin-right: 6px;
-                line-height: 17px !important;
-                &::before{
-                    color: $blue !important;
-                    font-weight: 400;
-                    font-size: 14px !important;
-                    content: "\f27a";
-                }
-            }
-        }
-
-        .links {
-            margin-bottom: 16px;
-            color: $blue;
-
-            font-weight: 400;
-            font-size: 14px !important;
-
-            display: flex;
-            flex-direction: row;
-            align-content: center;
-
-            cursor: pointer;
-            width: fit-content;
-
-
-            span.faicon {
-                margin-left: 8px;
-                line-height: 17px !important;
-                &::before{
-                    color: $blue !important;
-                    font-size: 14px !important;
-                }
-            }
-
-        }
-
-        #comment_field {
-
-            padding-top: 16px;
-            border-top: 1px solid $gray;
-            margin-bottom: 10px;
-
-            textarea {
-                height: 130px;
-                width: 100%;
-                margin: 0;
-            }
-        }
-
-        .button_holder {
-            display: flex;
-            flex-direction: row;
-            justify-content: space-between;
-            padding-top: 8px;
-            border-top: 1px solid $gray;
-
-            margin-bottom: 0;
-
-            button {
-                min-width: 128px;
-            }
-
-            .options {
-                display: flex;
-                flex-direction: row;
-
-                .square {
-                    box-sizing: border-box;
-                    border: 1px solid $blue;
-                    width: 28px;
-                    height: 28px;
-                    margin-left: 8px;
-
-                    display: flex;
-                    justify-content: center;
-                    align-content: center;
-
-                    color: $blue;
-                    font-size: 14px !important;
-
-                    cursor: pointer;
-
-                    &.blue {
-                        background-color: $blue;
-                        span.faicon::before {
-                            font-size: 14px !important;
-                            color: $white;
-                        }
-                    }
-
-                    span.faicon::before {
-                        $font_weight: 400;
-                        font-size: 16px !important;
-                    }
-                }
-            }
-        }
-    }
-}
-
 #quick_comments_link.newCss {
 	text-align: center;