diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php
index 482811fd2..90dee36a2 100644
--- a/admin/survey/classes/class.SurveyStaticHtml.php
+++ b/admin/survey/classes/class.SurveyStaticHtml.php
@@ -504,11 +504,19 @@ class SurveyStaticHtml
                 echo '</select>';
                 echo '</div>';
 
-                // Nastavitve za filtre (po spr, zoom, statusi...)
-                echo '<div title="' . $lang['settings'] . '" id="analiza_right_options2" class="spaceRight spaceLeft">';
-                echo '<span id="filters_span2" class="faicon wheel_32"></span>';
-                $this->displayAnalizaRightOptions2($podstran);
-                echo '</div>';
+                // Nastavitve pri grafih
+                if(in_array($podstran, array('charts'))){
+                    echo '<div title="' . $lang['settings'] . '" id="analiza_right_options2" class="spaceRight spaceLeft">';
+                    echo '<span id="filters_span2" class="faicon wheel_32"></span>';
+                    $this->displayAnalizaRightOptions2($podstran);
+                    echo '</div>';
+                }
+                // Nastavitve pri analizah - brez popupa - samo klik na zobnik
+                else{
+                    echo '<div title="' . $lang['settings'] . '" id="analiza_right_options2" class="spaceRight spaceLeft">';
+                    echo '  <span id="filters_span2" class="faicon wheel_32" onClick="dataSettingProfileAction(\'showProfiles\');"></span>';
+                    echo '</div>';
+                }
             } 
             elseif ($podstran == 'data' || $podstran == 'export') {
                 // Ikona za ponovno generiranje datoteke
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 7359f9971..dd37db427 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -9213,6 +9213,11 @@ header #topSettingsHolder .right_options_holder#analiza_right_options_holder #an
   float: left;
   display: inline;
 }
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #filters_span:hover:before,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #filters_span2:hover:before {
+  color: #0059ab;
+  transition: 0.2s;
+}
 header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right,
 header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 {
   padding: 16px;
diff --git a/resources/sass/admin_new/components/header/navigation.scss b/resources/sass/admin_new/components/header/navigation.scss
index 868f79cce..c1a94f6ae 100644
--- a/resources/sass/admin_new/components/header/navigation.scss
+++ b/resources/sass/admin_new/components/header/navigation.scss
@@ -489,6 +489,15 @@ header{
                     float:left;
                     display: inline;
                 }
+
+                #filters_span,
+                #filters_span2{
+
+                    &:hover:before{
+                        color: $dark-blue;
+                        transition: 0.2s;
+                    }
+                }
     
                 #div_analiza_filtri_right,
                 #div_analiza_filtri_right2{