diff --git a/app/src/main/java/com/fastaccess/helper/ViewHelper.java b/app/src/main/java/com/fastaccess/helper/ViewHelper.java
index 54ad7046..eff8dbee 100644
--- a/app/src/main/java/com/fastaccess/helper/ViewHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/ViewHelper.java
@@ -135,9 +135,11 @@ public class ViewHelper {
     }
 
     @ColorInt public static int generateTextColor(int color) {
-        return Color.rgb(255 - Color.red(color),
-                255 - Color.green(color),
-                255 - Color.blue(color));
+        int red = Color.red(color);
+        int green = Color.green(color);
+        int blue = Color.blue(color);
+        double lum = (((0.299 * red) + ((0.587 * green) + (0.114 * blue))));
+        return lum > 186 ? 0xFF000000 : 0xFFFFFFFF;
     }
 
 }
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueTimelineViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueTimelineViewHolder.java
index 234f53db..af118683 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueTimelineViewHolder.java
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueTimelineViewHolder.java
@@ -59,9 +59,7 @@ public class IssueTimelineViewHolder extends BaseViewHolder<IssueEventAdapterMod
                 int color = Color.parseColor("#" + labelModel.getColor());
                 spannableBuilder
                         .append(" ")
-                        .background(SpannableBuilder.builder()
-                                .append("  " + labelModel.getName() + "  ",
-                                        new RoundBackgroundSpan(color, 4)), color);
+                        .append(" " + labelModel.getName() + " ", new RoundBackgroundSpan(color, 5));
             } else if (event == IssueEventType.assigned || event == IssueEventType.unassigned) {
                 spannableBuilder
                         .append(" ")
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestTimelineViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestTimelineViewHolder.java
index 83c3dac6..4a01085a 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestTimelineViewHolder.java
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestTimelineViewHolder.java
@@ -59,9 +59,7 @@ public class PullRequestTimelineViewHolder extends BaseViewHolder<PullRequestAda
                 int color = Color.parseColor("#" + labelModel.getColor());
                 spannableBuilder
                         .append(" ")
-                        .background(SpannableBuilder.builder()
-                                .append("  " + labelModel.getName() + "  ",
-                                        new RoundBackgroundSpan(color, 4)), color);
+                        .append(" " + labelModel.getName() + " ", new RoundBackgroundSpan(color, 5));
             } else if (event == IssueEventType.assigned || event == IssueEventType.unassigned) {
                 spannableBuilder
                         .append(" ")
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/RoundBackgroundSpan.java b/app/src/main/java/com/fastaccess/ui/widgets/RoundBackgroundSpan.java
index 20a37bad..0b377c1d 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/RoundBackgroundSpan.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/RoundBackgroundSpan.java
@@ -7,26 +7,29 @@ import android.graphics.RectF;
 import android.support.annotation.NonNull;
 import android.text.style.ReplacementSpan;
 
-public class RoundBackgroundSpan extends ReplacementSpan {
-    private Paint mPaint = new Paint();
-    private float mRadius;
-    private RectF mRectF = new RectF();
-    private int mWidth = -1;
+import com.fastaccess.helper.ViewHelper;
 
-    public RoundBackgroundSpan(int i, float f) {
-        this.mPaint.setColor(i);
-        this.mPaint.setAntiAlias(true);
-        this.mRadius = f;
+public class RoundBackgroundSpan extends ReplacementSpan {
+    private Paint paint = new Paint();
+    private Paint empty = new Paint();
+    private float radius;
+    private int width = -1;
+
+    public RoundBackgroundSpan(int color, float radius) {
+        this.paint.setColor(color);
+        this.paint.setAntiAlias(true);
+        this.radius = radius;
     }
 
     public int getSize(@NonNull Paint paint, CharSequence charSequence, int i, int i2, FontMetricsInt fontMetricsInt) {
-        this.mWidth = Math.round((float) ((int) paint.measureText(charSequence, i, i2)));
-        this.mWidth = (int) (((float) this.mWidth) + (this.mRadius * 4.0f));
-        return this.mWidth;
+        this.width = Math.round((float) ((int) paint.measureText(charSequence, i, i2)));
+        this.width = (int) (((float) this.width) + (this.radius * 4.0f));
+        return this.width;
     }
 
     public void draw(@NonNull Canvas canvas, CharSequence charSequence, int i, int i2, float f, int i3, int i4, int i5, @NonNull Paint paint) {
-        canvas.drawRoundRect(new RectF(f, (float) i3, ((float) this.mWidth) + f, (float) i5), this.mRadius, this.mRadius, this.mPaint);
-        canvas.drawText(charSequence, i, i2, f + (this.mRadius * 2.0f), (float) i4, paint);
+        canvas.drawRoundRect(new RectF(f, (float) i3, ((float) this.width) + f, (float) i5), this.radius, this.radius, this.paint);
+        paint.setColor(ViewHelper.generateTextColor(this.paint.getColor()));
+        canvas.drawText(charSequence, i, i2, f + (this.radius * 2.0f), (float) i4, paint);
     }
 }
\ No newline at end of file