diff --git a/src/main/scala/model/Labels.scala b/src/main/scala/model/Labels.scala
index 73ba1b7..47c6a2b 100644
--- a/src/main/scala/model/Labels.scala
+++ b/src/main/scala/model/Labels.scala
@@ -29,9 +29,9 @@
     val b = color.substring(4, 6)
 
     if(Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408){
-      "black"
+      "000000"
     } else {
-      "white"
+      "ffffff"
     }
   }
 }
diff --git a/src/main/twirl/issues/labels/label.scala.html b/src/main/twirl/issues/labels/label.scala.html
index 4ff82b2..3b0e60b 100644
--- a/src/main/twirl/issues/labels/label.scala.html
+++ b/src/main/twirl/issues/labels/label.scala.html
@@ -10,8 +10,8 @@
       <div class="span8">
         <div style="margin-top: 6px">
           <a href="@url(repository)/issues?labels=@urlEncode(label.labelName)" id="label-row-content-@label.labelId">
-            <span style="background-color: #@label.color; color: @label.fontColor; padding: 8px; font-size: 120%; border-radius: 4px;">
-              <img src="@assets/common/images/label_@(label.fontColor).png" style="width: 12px;"/>
+            <span style="background-color: #@label.color; color: #@label.fontColor; padding: 8px; font-size: 120%; border-radius: 4px;">
+              <img src="@assets/common/images/label_@(if(label.fontColor == "ffffff") "white" else "black").png" style="width: 12px;"/>
               @label.labelName
             </span>
           </a>