diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php
index 427eb42c2..53e54a1e1 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php
@@ -836,6 +836,7 @@ class SurveyCrosstabs {
 									$sub_q1 = '<span class="anl_variabla'.$sccFloat.'">';
 									$sub_q1 .= '<a href="/" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $v_first['spr'] . '\'); return false;">';
 									$sub_q1 .= strip_tags($spr1['naslov']);
+
 									if ($show_variables_values == true ) {
 										$sub_q1 .= '<span class="anl_variabla'.$sccFloat.'">';
 										
@@ -843,10 +844,13 @@ class SurveyCrosstabs {
 										
 										$sub_q1 .= '</span>';
 									}
+
 									if ($spr1['tip'] == '16') {
 										$sub_q1 .= '<br/>' . strip_tags($grid1['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($grid1['variable']) . ')' : '');
-									} else {
-										$sub_q1 .= '<br/>' . strip_tags($variable['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($variable['variable']) . ')' : '');
+									} 
+                                    else {
+                                        if(strip_tags($variable['naslov']) != $lang['srv_new_text'] && strip_tags($variable['naslov']) != $lang['srv_new_vprasanje'])
+										    $sub_q1 .= '<br/>' . strip_tags($variable['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($variable['variable']) . ')' : '');
 									}
 									$sub_q1 .= '</a>';
 									$sub_q1 .=  '</span>' . NEW_LINE;
@@ -878,8 +882,10 @@ class SurveyCrosstabs {
 									}
 									if ($spr2['tip'] == '16') {
 										$sub_q2.= '<br/>' . strip_tags($grid2['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($grid2['variable']) . ')' : '');
-									} else {
-										$sub_q2.= '<br/>' . strip_tags($variable['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($variable['variable']) . ')' : '');
+									} 
+                                    else {
+                                        if(strip_tags($variable['naslov']) != $lang['srv_new_text'] && strip_tags($variable['naslov']) != $lang['srv_new_vprasanje'])
+										    $sub_q2.= '<br/>' . strip_tags($variable['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($variable['variable']) . ')' : '');
 									}
 									$sub_q2 .= '</a>';
 									$sub_q2 .= '</span>' . NEW_LINE;
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index d9b24c059..036b3328b 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8759,6 +8759,12 @@ select.dropdown {
   margin-top: 4px;
   background-color: #FFFFFF;
 }
+select.dropdown option {
+  color: #333333;
+}
+select.dropdown option:disabled {
+  color: #A0A0A0;
+}
 select.dropdown.large {
   width: 229px;
   height: 40px;
@@ -8768,7 +8774,6 @@ select.dropdown.large {
 select.dropdown.large option {
   font-size: 16px;
   line-height: 20px;
-  color: #333333;
   padding: 0;
 }
 select.dropdown.medium {
@@ -8780,7 +8785,6 @@ select.dropdown.medium {
 select.dropdown.medium option {
   font-size: 14px;
   line-height: 18px;
-  color: #333333;
 }
 select.dropdown.small {
   width: 229px;
@@ -8791,7 +8795,6 @@ select.dropdown.small {
 select.dropdown.small option {
   font-size: 14px;
   line-height: 18px;
-  color: #333333;
 }
 select.dropdown.w200 {
   width: 200px;
diff --git a/resources/sass/admin_new/components/form/dropdown.scss b/resources/sass/admin_new/components/form/dropdown.scss
index e9dc1aaf1..b515aa922 100644
--- a/resources/sass/admin_new/components/form/dropdown.scss
+++ b/resources/sass/admin_new/components/form/dropdown.scss
@@ -14,6 +14,14 @@ select.dropdown {
 
     background-color: $white;
 
+    option {                
+        color: $black;  
+        
+        &:disabled{
+            color: #A0A0A0;
+        }
+    }
+
     &.large {
         width: 229px;
         height: 40px;
@@ -23,7 +31,6 @@ select.dropdown {
         option {                
             font-size: 16px;
             line-height: 20px;
-            color: $black;
             padding: 0;                
         }
     }
@@ -35,8 +42,7 @@ select.dropdown {
 
         option {
             font-size: 14px;
-            line-height: 18px;
-            color: $black;               
+            line-height: 18px;             
         }
     }
     &.small {
@@ -47,8 +53,7 @@ select.dropdown {
 
         option {
             font-size: 14px;
-            line-height: 18px;
-            color: $black;                
+            line-height: 18px;             
         }
     }