diff --git a/lib/DDG/Goodie/Zodiac.pm b/lib/DDG/Goodie/Zodiac.pm
index e7b57d8d4..fb50bd5d8 100644
--- a/lib/DDG/Goodie/Zodiac.pm
+++ b/lib/DDG/Goodie/Zodiac.pm
@@ -30,17 +30,27 @@ handle remainder => sub {
 
     # Return Nothing if the User Provided Date is Invalid
     return unless $zodiacdate;
+    
+    #Star Sign
+    my $zodiacsign = ucfirst(zodiac_date_name($zodiacdate));
 
     # Return the Star Sign
-    my $result="Zodiac for " . date_output_string($zodiacdate) . ": " . ucfirst(zodiac_date_name($zodiacdate));
+    my $result="Zodiac for " . date_output_string($zodiacdate) . ": " . $zodiacsign;
 
     # Input String
     my $input = date_output_string($zodiacdate);
 
     return $result, structured_answer => {
-            input	=> [html_enc($input)],
-            operation => 'Zodiac',
-            result	=> html_enc(ucfirst(zodiac_date_name($zodiacdate)))
+            id => "zodiac",
+            name => "Zodiac",
+            data => {
+                image => "/share/goodie/zodiac/" . lc($zodiacsign) . ".png",
+                title => $zodiacsign,
+                subtitle => $input
+            },
+            templates => {
+                group => "icon",
+            }
         };
 };
 
diff --git a/share/goodie/zodiac/aries.png b/share/goodie/zodiac/aries.png
new file mode 100644
index 000000000..d5b5878e2
Binary files /dev/null and b/share/goodie/zodiac/aries.png differ
diff --git a/share/goodie/zodiac/cancer.png b/share/goodie/zodiac/cancer.png
new file mode 100644
index 000000000..bf8753212
Binary files /dev/null and b/share/goodie/zodiac/cancer.png differ
diff --git a/share/goodie/zodiac/capricornus.png b/share/goodie/zodiac/capricornus.png
new file mode 100644
index 000000000..9c8271424
Binary files /dev/null and b/share/goodie/zodiac/capricornus.png differ
diff --git a/share/goodie/zodiac/gemini.png b/share/goodie/zodiac/gemini.png
new file mode 100644
index 000000000..f1e6afb5f
Binary files /dev/null and b/share/goodie/zodiac/gemini.png differ
diff --git a/share/goodie/zodiac/leo.png b/share/goodie/zodiac/leo.png
new file mode 100644
index 000000000..6fd28c698
Binary files /dev/null and b/share/goodie/zodiac/leo.png differ
diff --git a/share/goodie/zodiac/libra.png b/share/goodie/zodiac/libra.png
new file mode 100644
index 000000000..0c05e7de8
Binary files /dev/null and b/share/goodie/zodiac/libra.png differ
diff --git a/share/goodie/zodiac/pisces.png b/share/goodie/zodiac/pisces.png
new file mode 100644
index 000000000..41c1619d3
Binary files /dev/null and b/share/goodie/zodiac/pisces.png differ
diff --git a/share/goodie/zodiac/sagittarius.png b/share/goodie/zodiac/sagittarius.png
new file mode 100644
index 000000000..1241633a9
Binary files /dev/null and b/share/goodie/zodiac/sagittarius.png differ
diff --git a/share/goodie/zodiac/scorpio.png b/share/goodie/zodiac/scorpio.png
new file mode 100644
index 000000000..681112841
Binary files /dev/null and b/share/goodie/zodiac/scorpio.png differ
diff --git a/share/goodie/zodiac/taurus.png b/share/goodie/zodiac/taurus.png
new file mode 100644
index 000000000..76c5201a5
Binary files /dev/null and b/share/goodie/zodiac/taurus.png differ
diff --git a/share/goodie/zodiac/virgo.png b/share/goodie/zodiac/virgo.png
new file mode 100644
index 000000000..4b98061e6
Binary files /dev/null and b/share/goodie/zodiac/virgo.png differ