2 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java
index 91f611b9b6..9de9b03df4 100644
--- a/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java
+++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java
@@ -13,7 +13,6 @@ public class GT_GuiIconButton extends GuiButton implements IGuiScreen.IGuiElemen
     protected GT_GuiIcon icon;
     private int x0, y0;
     protected IGuiScreen gui;
-    private String[] tooltipText;
 
     private GT_GuiTooltip tooltip;
 
@@ -107,7 +106,6 @@ public class GT_GuiIconButton extends GuiButton implements IGuiScreen.IGuiElemen
             tooltip = new GT_GuiTooltip(getBounds(), text);
         else
             tooltip.setToolTipText(text);
-        this.tooltipText = text;
         return this;
     }
 
diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java
index 815970c754..b18811af05 100644
--- a/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java
+++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java
@@ -3,7 +3,9 @@ package gregtech.api.gui.widgets;
 import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import org.lwjgl.input.Keyboard;
 
@@ -78,7 +80,7 @@ public class GT_GuiTooltip {
     /**
      * Used to set a "dynamic" tooltip that respects verbosity levels and responds to the shift key
      * 
-     * @param text
+     * @param data
      */
     public void setToolTipText(TooltipData data) {
         // Trust that the tooltips have already been formatted and colored, just make sure it has no nulls
@@ -96,13 +98,14 @@ public class GT_GuiTooltip {
         if (text != null) {
             list = new ArrayList<>(text.length);
             for (int i = 0; i < text.length; i++) {
-                if (i == 0)
+                if (text[i] == null) continue;
+                if (list.isEmpty())
                     list.add("\u00a7f" + text[i]);
                 else
                     list.add("\u00a77" + text[i]);
             }
         } else {
-            list = Arrays.asList(new String[0]);
+            list = Collections.emptyList();
         }
         return new TooltipData(list, list) ;
     }