diff --git a/controllers/CharactergroupsqueststationsController.inc b/controllers/CharactergroupsqueststationsController.inc
index 6e67ebc8..73cf7fc3 100644
--- a/controllers/CharactergroupsqueststationsController.inc
+++ b/controllers/CharactergroupsqueststationsController.inc
@@ -211,7 +211,10 @@
             {
                 // Mark Station as solved
                 if(!is_null($charactergroup)) {
-                    $this->Charactergroupsqueststations->setStationSolved($station['id'], $charactergroup['id']);
+                    $this->Charactergroupsqueststations->setStationSolved(
+                        $station['id'],
+                        $charactergroup['id']
+                    );
                 }
             }
 
@@ -219,9 +222,15 @@
             $solved = false;
             $tried = false;
             if(!is_null($charactergroup)) {
-                $tried = $this->Charactergroupsqueststations->hasCharactergroupTriedStation($station['id'], $charactergroup['id']);
+                $tried = $this->Charactergroupsqueststations->hasCharactergroupTriedStation(
+                    $station['id'],
+                    $charactergroup['id']
+                );
                 if($tried) {
-                    $solved = $this->Charactergroupsqueststations->hasCharactergroupSolvedStation($station['id'], $charactergroup['id']);
+                    $solved = $this->Charactergroupsqueststations->hasCharactergroupSolvedStation(
+                        $station['id'],
+                        $charactergroup['id']
+                    );
                 }
             }
 
@@ -239,6 +248,7 @@
             $this->set('station', $station);
             $this->set('task', $task);
             $this->set('groups', $groups);
+            $this->set('stationgroup', $charactergroup);
             $this->set('solved', $solved);
             $this->set('tried', $tried);
         }
diff --git a/views/html/charactergroupsqueststations/station.tpl b/views/html/charactergroupsqueststations/station.tpl
index 32360c70..d0406c14 100644
--- a/views/html/charactergroupsqueststations/station.tpl
+++ b/views/html/charactergroupsqueststations/station.tpl
@@ -6,6 +6,26 @@
     <li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('charactergroupsquests','quest',$seminary['url'],$groupsgroup['url'],$quest['url']))?>"><?=$quest['title']?></a></li>
 </ul>
 
+<div class="grpqsicon">
+<?php if($tried) : ?>
+<?php if($solved) : ?>
+<?php if($station['stationpicture_id']) : ?>
+    <img title="<?=$station['title']?>" src="<?=$linker->link(array('media','charactergroupsqueststation',$seminary['url'],$groupsgroup['url'],$quest['url'],$station['url']))?>" />
+<?php else : ?>
+    <i class="fa fa-circle"></i>
+<?php endif ?>
+<?php else : ?>
+    <i class="fa fa-times-circle"></i>
+<?php endif ?>
+<?php else : ?>
+<?php if(!is_null($stationgroup)) : ?>
+    <img title="<?=$station['title']?>" src="<?=$linker->link(array('media','charactergroupsqueststation',$seminary['url'],$groupsgroup['url'],$quest['url'],$station['url']),0,true,array('stationgroup'=>$stationgroup['id']))?>" />
+<?php else : ?>
+    <img title="<?=$station['title']?>" src="<?=$linker->link(array('media','charactergroupsqueststation',$seminary['url'],$groupsgroup['url'],$quest['url'],$station['url']),0,true)?>" />
+<?php endif ?>
+<?php endif ?>
+</div>
+
 <h1><?=$station['title']?></h1>
 <?php if(count(array_intersect(array('admin', 'moderator'), \hhu\z\controllers\SeminaryController::$character['characterroles'])) > 0) : ?>
 <nav class="admin">
diff --git a/www/css/desktop.css b/www/css/desktop.css
index 94c2f13e..1854ccd3 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -302,6 +302,7 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .grpqslist li{float:left;width:100px;height:100px;text-align:center;margin:5px}
 .grpqslist li a{color:#5e5c58}
 .grpqslist li i{font-size:100px;padding:0}
+.grpqsicon{float:right;box-shadow:0 0 5px gray}
 
 
 /** Achievements **/