diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index fa94edbd4..eb4c2afce 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -1398,10 +1398,16 @@ class SurveyAdmin
                     echo '<div id="quick_comments_link" class="newCss">';
                     
                     if($userAccess->checkUserAccess('komentarji')){
-                        if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 0)
-                            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
-                        else
-                            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
+                        if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 0) {
+                            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments" title="' . $lang['srv_view_comment'] . '">';
+                            echo '<span class="comment_number">99+</span>';
+                            echo '</span></div></a>';
+                        }
+                        else {
+                            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments" title="' . $lang['srv_view_comment'] . '">';
+                            echo '<span class="comment_number">99+</span>';
+                            echo '</span></div></a>';
+                        }
                     }
                     else{
                         if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 0)
@@ -1420,8 +1426,9 @@ class SurveyAdmin
 
                     // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
                     
-                    if($userAccess->checkUserAccess('komentarji'))
+                    if($userAccess->checkUserAccess('komentarji')) {
                         echo '<a href="' . $site_url . 'admin/survey/ajax.php?anketa='.$row['id'].'&a=comments_onoff&do=on" title="' . $lang['srv_preview_comments'] . '"><div class="fa-stack"><span class="faicon comments" title="' . $lang['srv_preview_comments'] . '">';
+                    }
                     else
                         echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=urejanje" title="' . $lang['srv_preview_comments'] . '"><div class="fa-stack"><span class="faicon comments user_access_locked" title="' . $lang['srv_preview_comments'] . '">';
 
@@ -1431,13 +1438,13 @@ class SurveyAdmin
                     echo '</li>';
                 }
 
-                if (($admin_type <= $survey_comment && $survey_comment != '') || $sas->testiranje_komentarji_komentarji_na_anketo(false) > 0) {
+                /*if (($admin_type <= $survey_comment && $survey_comment != '') || $sas->testiranje_komentarji_komentarji_na_anketo(false) > 0) {
                     echo '<li>';
                     echo '<div id="quick_comments_link" class="newCss">';
                     $this->survey_icon_add_comment();
                     echo '</div>';
                     echo '</li>';
-                }
+                }*/
             }
 
             echo '</ol>';
@@ -4350,7 +4357,7 @@ class SurveyAdmin
                 if($userAccess->checkUserAccess('komentarji')){
                     echo '<a href="#" onclick="return false;" class="surveycomment srv_ico" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
                     
-                    echo '<div class="fa-stack"><span class="faicon comments_empty" title="' . $lang['srv_survey_general_comment'] . '"></span></div>';
+                    //echo '<div class="fa-stack"><span class="faicon comments_empty" title="' . $lang['srv_survey_general_comment'] . '"></span></div>';
 
                     // ali prikazemo okno odprto - je dodan tak admin komentar
                     $sqlf1 = sisplet_query("SELECT id FROM post p WHERE p.tid='$row[thread]' AND p.ocena='5'");
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index e27b7a93c..4f66943e2 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10016,7 +10016,7 @@ textarea:focus {
 }
 .box-container .num_box {
   border: 1px solid #E5E5E5;
-  background-color: white;
+  background-color: #FFFF;
   border-radius: 2px;
   cursor: pointer;
   margin: 0px;
@@ -10478,9 +10478,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;
 }
 
@@ -10508,8 +10508,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;
@@ -20968,10 +20968,10 @@ div.page_tema div.theme_list div.options div.buttons-window {
   position: absolute;
   bottom: 20px;
   max-width: 113px;
-  box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
+  box-shadow: 0px 0px 7px 0px #0000001F;
   border-radius: 2px;
   margin-right: 5px;
-  background-color: white;
+  background-color: #FFFF;
 }
 div.page_tema div.theme_list div.options div.buttons-window .button {
   border: none;
@@ -21278,7 +21278,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;
@@ -25591,6 +25591,9 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment .
   margin: 0px 3px;
 }
 
+#quick_comments_link a {
+  text-decoration: none;
+}
 #quick_comments_link a span.link {
   display: inline-block;
   padding: 3px !important;
@@ -25598,6 +25601,32 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment .
   font-size: 11px;
   vertical-align: top;
 }
+#quick_comments_link a .fa-stack .comments {
+  position: relative;
+}
+#quick_comments_link a .fa-stack .comments .comment_number {
+  position: absolute;
+  color: #1E88E5;
+  left: 0;
+  transform: translateX(-50%);
+  top: 35%;
+  transform: translateY(-50%);
+  z-index: 99;
+  font-family: Source Sans Pro, sans-serif;
+  font-size: 14px;
+  font-weight: 400;
+  text-align: center;
+  width: 100%;
+}
+#quick_comments_link a .fa-stack::after {
+  content: "•";
+  font-size: 50px;
+  color: #FF8787;
+  position: relative;
+  top: -45px;
+  right: -13px;
+  z-index: 999;
+}
 
 #quick_comments_link.newCss {
   text-align: center;
@@ -25962,6 +25991,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;
   }
@@ -30117,7 +30147,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;
@@ -30406,15 +30436,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 {
@@ -33902,19 +33932,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;
   }
@@ -34008,6 +34043,7 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
+
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -34037,36 +34073,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*/
@@ -34322,6 +34366,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;
@@ -34343,6 +34388,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
+
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -34353,6 +34399,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;
@@ -34363,10 +34410,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;
   }
@@ -34441,6 +34490,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;
@@ -34524,6 +34574,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;
   }
@@ -34536,16 +34587,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;
@@ -34650,9 +34704,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;
@@ -34672,6 +34728,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;
@@ -34725,6 +34782,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;
@@ -34777,6 +34835,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;
@@ -34789,6 +34848,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 {
@@ -34804,15 +34864,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;
@@ -34830,6 +34893,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;
   }
@@ -34856,6 +34920,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;
   }
@@ -34863,6 +34928,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
+
   #srv_diagnostic br {
     display: none;
   }
@@ -34883,6 +34949,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;
   }
@@ -34896,6 +34963,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;
   }
@@ -34903,6 +34971,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;
@@ -34927,6 +34996,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;
@@ -34994,6 +35064,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,
@@ -35077,6 +35148,7 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
+
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -35084,6 +35156,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;
@@ -35122,6 +35195,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,
@@ -35142,6 +35216,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;
@@ -35153,6 +35228,7 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
+
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -35167,9 +35243,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%;
@@ -35181,6 +35259,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;
@@ -35251,9 +35330,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,
@@ -35294,6 +35375,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;
   }
@@ -35313,6 +35395,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;
   }
@@ -35322,13 +35405,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;
@@ -35351,6 +35437,7 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
+
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -35367,12 +35454,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;
   }
@@ -35394,11 +35483,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;
@@ -35409,6 +35500,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/basic/colors.scss b/resources/sass/admin_new/basic/colors.scss
index 68273ab81..3929e1a7c 100644
--- a/resources/sass/admin_new/basic/colors.scss
+++ b/resources/sass/admin_new/basic/colors.scss
@@ -26,6 +26,7 @@ $yellow: #FFC700;
 
 $red: #FF0000;
 $light-red: #FFEFEF;
+$coral: #FF8787;
 
 $dark-green: #00752F;
 $green: #00C437;
diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
index 4e831c060..e24d26457 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
@@ -608,6 +608,43 @@ div.page_komentarji_anketa {
 			font-size: 11px;
 			vertical-align: top;
 		}
+        
+        text-decoration: none;
+
+        .fa-stack {
+            .comments {
+                position: relative;
+                .comment_number {
+                    position: absolute;
+                    color: $blue;
+                    left: 0;
+                    transform: translateX(-50%);
+                    top: 35%;
+                    transform: translateY(-50%);
+                    z-index: 99;
+
+                    font-family: $font_family;
+                    font-size: 14px;
+                    font-weight: 400;
+
+                    text-align: center;
+                    width: 100%;
+                }
+                
+            }
+
+            &::after {
+                content: "•";
+                font-size: 50px;
+                color: $coral;
+    
+                position: relative;
+                top: -45px;
+                right: -13px;
+                z-index: 999;
+    
+            }
+        }
 	}
 }
 #quick_comments_link.newCss {