diff --git a/module/execution/css/testcase.css b/module/execution/css/testcase.css
index 4037191ccc..c9414375a6 100644
--- a/module/execution/css/testcase.css
+++ b/module/execution/css/testcase.css
@@ -3,3 +3,5 @@
 #pageNav #dropMenu .col-left {padding-bottom: 0px;}
 #currentBranch + #dropMenu .col-left {padding-bottom: 30px;}
 .status-blocked {left: -5px;}
+
+.icon-ztf,.icon-test {color: #888fa1; font-size: 12px;}
diff --git a/module/execution/view/testcase.html.php b/module/execution/view/testcase.html.php
index 52a4c4d11b..1727697fcb 100644
--- a/module/execution/view/testcase.html.php
+++ b/module/execution/view/testcase.html.php
@@ -77,8 +77,8 @@
             </td>
             <?php $params = "testcaseID=$caseID&version=$case->version";?>
             <?php if($type == 'assigntome') $params .= "&from=testtask&taskID=$case->task";?>
-            <?php $autoIcon = $case->auto == 'auto' ? " <i class='icon icon-ztf'></i>" : '';?>
-            <td class='c-title text-left' title="<?php echo $case->title?>"><?php echo html::a($this->createLink('testcase', 'view', $params, '', '', $case->project), $case->title . $autoIcon, null, "style='color: $case->color' data-app='{$this->app->tab}'");?></td>
+            <?php $icon = $case->auto == 'auto' ? "<i class='icon icon-ztf'></i> " : "<i class='icon icon-test'></i> ";?>
+            <td class='c-title text-left' title="<?php echo $case->title?>"><?php echo $icon . html::a($this->createLink('testcase', 'view', $params, '', '', $case->project), $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'");?></td>
             <td><span class='label-pri <?php echo 'label-pri-' . $case->pri?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
             <td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
             <td>
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 4b88e25861..3971ec56c9 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -280,7 +280,7 @@ class testcaseModel extends model
             ->beginIF($browseType == 'wait')->andWhere('t1.status')->eq($browseType)->fi()
             ->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi()
             ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi()
-            ->beginIF(!$this->cookie->showAutoCase)->andWhere('t1.auto')->ne('auto')->fi()
+            ->beginIF($this->cookie->showAutoCase)->andWhere('t1.auto')->eq('auto')->fi()
             ->beginIF($caseType)->andWhere('t1.type')->eq($caseType)->fi()
             ->andWhere('t1.deleted')->eq('0')
             ->orderBy($orderBy)
@@ -319,7 +319,7 @@ class testcaseModel extends model
             ->beginIF($browseType == 'wait')->andWhere('t2.status')->eq($browseType)->fi()
             ->beginIF($auto == 'unit')->andWhere('t2.auto')->eq('unit')->fi()
             ->beginIF($auto != 'unit')->andWhere('t2.auto')->ne('unit')->fi()
-            ->beginIF(!$this->cookie->showAutoCase)->andWhere('t2.auto')->ne('auto')->fi()
+            ->beginIF($this->cookie->showAutoCase)->andWhere('t2.auto')->eq('auto')->fi()
             ->beginIF($caseType)->andWhere('t2.type')->eq($caseType)->fi()
             ->andWhere('t2.deleted')->eq('0')
             ->orderBy($orderBy)
@@ -588,7 +588,7 @@ class testcaseModel extends model
                 ->beginIF($modules)->andWhere('t1.module')->in($modules)->fi()
                 ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi()
                 ->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi()
-                ->beginIF(!$this->cookie->showAutoCase)->andWhere('t1.auto')->ne('auto')->fi()
+                ->beginIF($this->cookie->showAutoCase)->andWhere('t1.auto')->eq('auto')->fi()
                 ->beginIF($caseType)->andWhere('t1.type')->eq($caseType)->fi()
                 ->orderBy($sort)
                 ->page($pager, 't1.id')
@@ -3372,8 +3372,7 @@ class testcaseModel extends model
                 ->beginIF($this->app->tab == 'project')->andWhere('t2.project')->eq($this->session->project)->fi()
                 ->beginIF($branch !== 'all')->andWhere('t1.branch')->eq($branch)->fi()
                 ->beginIF($modules)->andWhere('t1.module')->in($modules)->fi()
-                ->beginIF($this->cookie->showAutoCase)->andWhere('t1.auto')->ne('unit')->fi()
-                ->beginIF(!$this->cookie->showAutoCase)->andWhere('t1.auto')->notIN('unit,auto')->fi()
+                ->beginIF($this->cookie->showAutoCase)->andWhere('t1.auto')->eq('auto')->fi()
                 ->beginIF($caseType)->andWhere('t1.type')->eq($caseType)->fi()
                 ->orderBy($orderBy)
                 ->fetchAll('id');