diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java
index c9379f99..bb77cbcc 100644
--- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java
+++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java
@@ -258,17 +258,12 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler {
                     double maxV = fluidIcon.getMaxV();
 
                     Tessellator tessellator = Tessellator.instance;
+                    final double u = minU + (maxU - minU) * drawWidth / 16F;
+                    final double v = minV + (maxV - minV) * drawHeight / 16F;
                     tessellator.startDrawingQuads();
-                    tessellator.addVertexWithUV(
-                            drawX, drawY + drawHeight, 0, minU, minV + (maxV - minV) * drawHeight / 16F);
-                    tessellator.addVertexWithUV(
-                            drawX + drawWidth,
-                            drawY + drawHeight,
-                            0,
-                            minU + (maxU - minU) * drawWidth / 16F,
-                            minV + (maxV - minV) * drawHeight / 16F);
-                    tessellator.addVertexWithUV(
-                            drawX + drawWidth, drawY, 0, minU + (maxU - minU) * drawWidth / 16F, minV);
+                    tessellator.addVertexWithUV(drawX, drawY + drawHeight, 0, minU, v);
+                    tessellator.addVertexWithUV(drawX + drawWidth, drawY + drawHeight, 0, u, v);
+                    tessellator.addVertexWithUV(drawX + drawWidth, drawY, 0, u, minV);
                     tessellator.addVertexWithUV(drawX, drawY, 0, minU, minV);
                     tessellator.draw();
                 }
diff --git a/src/main/java/tconstruct/tools/gui/BattlesignGui.java b/src/main/java/tconstruct/tools/gui/BattlesignGui.java
index c6ac35b2..f6eab745 100644
--- a/src/main/java/tconstruct/tools/gui/BattlesignGui.java
+++ b/src/main/java/tconstruct/tools/gui/BattlesignGui.java
@@ -72,19 +72,18 @@ public class BattlesignGui extends GuiScreen {
 
         float lum = calcLuminance(bgColR, bgColG, bgColB);
         for (int i = 0; i < text.length; i++) {
+            final EnumChatFormatting chatFormatting = lum >= 35F
+                    ? EnumChatFormatting.BLACK
+                    : lum >= 31F ? EnumChatFormatting.GRAY : EnumChatFormatting.WHITE;
             fontRendererObj.drawString(
-                    (lum >= 35F
-                                    ? EnumChatFormatting.BLACK
-                                    : lum >= 31F ? EnumChatFormatting.GRAY : EnumChatFormatting.WHITE)
+                    chatFormatting
                             + (i == currentLine ? "> " : "")
                             + text[i]
                             + (i == currentLine
-                                    ? " \u00A7r"
-                                            + (lum >= 35F
-                                                    ? EnumChatFormatting.BLACK
-                                                    : lum >= 31F ? EnumChatFormatting.GRAY : EnumChatFormatting.WHITE)
-                                            + "<"
-                                    : ""),
+                            ? " " + EnumChatFormatting.RESET
+                            + chatFormatting
+                            + "<"
+                            : ""),
                     k
                             - fontRendererObj.getStringWidth(
                                             (i == currentLine ? "> " : "") + text[i] + (i == currentLine ? " <" : ""))