diff --git a/_includes/samples/badges.md b/_includes/samples/badges.md
index b0ac4b427cd..26fc1bfbf9f 100644
--- a/_includes/samples/badges.md
+++ b/_includes/samples/badges.md
@@ -1,4 +1,17 @@
-{% include badge.html link="[ci](#ci-icon)" %}
-{% include badge.html link="[fork](#forkme-icon)" %}
-{% include badge.html link="[etc](#)" %}
-{% include badge.html link="[etc](#)" %}
+{% capture cilink %}
+<a href="https://drone.io/github.com/springframework-meta/gs-rest-service/latest">
+  <img src="https://drone.io/github.com/springframework-meta/gs-rest-service/status.png">
+</a>
+{% endcapture %}
+
+{% capture travislink %}
+[![Build Status](https://travis-ci.org/SpringSource/spring-boot.png)](https://travis-ci.org/SpringSource/spring-boot)
+{% endcapture %}
+
+{% capture bamboostatus %}
+[Bamboo Status](https://build.springsource.org/browse/XD)
+{% endcapture %}
+
+{% include badge.html link=cilink %}
+{% include badge.html link=travislink %}
+{% include badge.html link=bamboostatus %}
diff --git a/css/projects.css.css b/css/projects.css.css
index d0444609d78..1ece73600a4 100644
--- a/css/projects.css.css
+++ b/css/projects.css.css
@@ -305,8 +305,7 @@
   padding: 20px 20px 18px;
 }
 .project-sub-link--wrapper .project-sub-link {
-  background-color: #cbcaca;
-  width: 30px;
+  min-width: 30px;
   height: 30px;
   display: inline-block;
   margin-right: 2.9%;