diff --git a/lib/QUI/Bricks/Controls/Image.css b/lib/QUI/Bricks/Controls/Image.css
index 7068cde4d17e9f6c8158b5bf818f296d7fefcaa1..d5ca41dbc0d75f4595fca09663af7382b06131cc 100644
--- a/lib/QUI/Bricks/Controls/Image.css
+++ b/lib/QUI/Bricks/Controls/Image.css
@@ -1 +1,14 @@
-/**/
\ No newline at end of file
+.brick-image > p {
+    margin-bottom: 20px;
+}
+
+a.brick-image-link:hover {
+    outline: none;
+    background: none;
+    border: none;
+    box-shadow: none;
+}
+
+a.brick-image-link {
+    display: block;
+}
\ No newline at end of file
diff --git a/lib/QUI/Bricks/Controls/Image.html b/lib/QUI/Bricks/Controls/Image.html
index e442680c50de3a50d64f50f64e515143c7711c9a..76b87c6bab70190913920a6330236d2bc6a70102 100644
--- a/lib/QUI/Bricks/Controls/Image.html
+++ b/lib/QUI/Bricks/Controls/Image.html
@@ -1,6 +1,17 @@
 {assign var=img value=$brickImage}
-<section>
+{assign var=link value=$brickLink}
+<section class="content-body grid-100 mobile-grid-100 grid-parent brick-image">
 
-    {image src=$brickImage}
+    {$this->getAttribute('content')}
+
+    {if $link != ""}
+    <a class="brick-image-link" href="{$link}">
+    {/if}
+
+        {image src=$img}
+
+    {if $link != ""}
+    </a>
+    {/if}
 
 </section>
\ No newline at end of file
diff --git a/lib/QUI/Bricks/Controls/Image.php b/lib/QUI/Bricks/Controls/Image.php
index 4b4469b19d4c1837389ff117a6e5e489fcd9654c..0ee2f1e00562c7aed4515384cce214b9ef014da9 100644
--- a/lib/QUI/Bricks/Controls/Image.php
+++ b/lib/QUI/Bricks/Controls/Image.php
@@ -27,8 +27,7 @@ public function __construct($attributes = array())
         // default options
         $this->setAttributes(array(
             'title'       => 'Image Brick',
-            'contentList' => false,
-            'entries'     => array()
+            'contentList' => false
         ));
 
         parent::__construct($attributes);
@@ -46,14 +45,14 @@ public function __construct($attributes = array())
      */
     public function getBody()
     {
-        $Engine = QUI::getTemplateManager()->getEngine();
-        $entries = $this->getAttribute('entries');
+        $Engine     = QUI::getTemplateManager()->getEngine();
         $brickImage = $this->getAttribute('picture');
+        $brickLink  = $this->getAttribute('link');
 
         $Engine->assign(array(
-            'this'      => $this,
-            'entries'   => $entries,
-            'brickImag' => $brickImage
+            'this'          => $this,
+            'brickImage'    => $brickImage,
+            'brickLink'     => $brickLink
         ));