diff --git a/PHPCI/Controller/BuildStatusController.php b/PHPCI/Controller/BuildStatusController.php
index f7304413..5b6cdfd9 100644
--- a/PHPCI/Controller/BuildStatusController.php
+++ b/PHPCI/Controller/BuildStatusController.php
@@ -68,23 +68,15 @@ class BuildStatusController extends \PHPCI\Controller
     }
 
     /**
-    * Returns the appropriate build status image for a given project.
+    * Returns the appropriate build status image in SVG format for a given project.
     */
     public function image($projectId)
     {
         $status = $this->getStatus($projectId);
-        header('Content-Type: image/png');
-        die(file_get_contents(APPLICATION_PATH . 'public/assets/img/build-' . $status . '.png'));
-    }
-
-    /**
-    * Returns the appropriate build status image in SVG format for a given project.
-    */
-    public function svg($projectId)
-    {
-        $status = $this->getStatus($projectId);
+        $color = ($status == 'passing') ? 'green' : 'red';
+        
         header('Content-Type: image/svg+xml');
-        die(file_get_contents(APPLICATION_PATH . 'public/assets/img/build-' . $status . '.svg'));
+        die(file_get_contents('http://img.shields.io/badge/build-' . $status . '-' . $color . '.svg'));
     }
 
     public function view($projectId)
diff --git a/public/assets/img/build-error.svg b/public/assets/img/build-error.svg
deleted file mode 100644
index a6567a32..00000000
--- a/public/assets/img/build-error.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="76" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="76" height="18" fill="#555"/><rect rx="4" x="37" width="39" height="18" fill="#fe7d37"/><path fill="#fe7d37" d="M37 0h4v18h-4z"/><rect rx="4" width="76" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="13" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="12">build</text><text x="55.5" y="13" fill="#010101" fill-opacity=".3">error</text><text x="55.5" y="12">error</text></g></svg>
\ No newline at end of file
diff --git a/public/assets/img/build-failed.png b/public/assets/img/build-failed.png
deleted file mode 100644
index 2aa1e125..00000000
Binary files a/public/assets/img/build-failed.png and /dev/null differ
diff --git a/public/assets/img/build-failed.svg b/public/assets/img/build-failed.svg
deleted file mode 100644
index c7afed21..00000000
--- a/public/assets/img/build-failed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="78" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="78" height="18" fill="#555"/><rect rx="4" x="37" width="41" height="18" fill="#e05d44"/><path fill="#e05d44" d="M37 0h4v18h-4z"/><rect rx="4" width="78" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="13" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="12">build</text><text x="56.5" y="13" fill="#010101" fill-opacity=".3">failed</text><text x="56.5" y="12">failed</text></g></svg>
\ No newline at end of file
diff --git a/public/assets/img/build-passing.png b/public/assets/img/build-passing.png
deleted file mode 100644
index e74657b7..00000000
Binary files a/public/assets/img/build-passing.png and /dev/null differ
diff --git a/public/assets/img/build-passing.svg b/public/assets/img/build-passing.svg
deleted file mode 100644
index 42f797eb..00000000
--- a/public/assets/img/build-passing.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="90" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="90" height="18" fill="#555"/><rect rx="4" x="37" width="53" height="18" fill="#97CA00"/><path fill="#97CA00" d="M37 0h4v18h-4z"/><rect rx="4" width="90" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="13" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="12">build</text><text x="62.5" y="13" fill="#010101" fill-opacity=".3">passing</text><text x="62.5" y="12">passing</text></g></svg>
\ No newline at end of file