diff --git a/src/main/java/org/fenix/llanfair/Run.java b/src/main/java/org/fenix/llanfair/Run.java
index f59436b..abe45c7 100644
--- a/src/main/java/org/fenix/llanfair/Run.java
+++ b/src/main/java/org/fenix/llanfair/Run.java
@@ -976,7 +976,7 @@ public class Run implements TableModel, Serializable {
 		Segment segment = getSegment(row);
 		switch (column) {
 			case COLUMN_ICON:
-				segment.setIcon((Icon) value);
+				segment.setIcon((ImageIcon) value);
 				tmSupport.fireTableCellUpdated(row, column);
 				break;
 
diff --git a/src/main/java/org/fenix/llanfair/Segment.java b/src/main/java/org/fenix/llanfair/Segment.java
index 9a00be1..1115aad 100644
--- a/src/main/java/org/fenix/llanfair/Segment.java
+++ b/src/main/java/org/fenix/llanfair/Segment.java
@@ -91,7 +91,7 @@ public class Segment implements Cloneable, Serializable {
 	 * Icon associated with this segment. Can be {@code null} if no icon is to
 	 * be displayed.
 	 */
-	private Icon icon;
+	private ImageIcon icon;
 
 	/**
 	 * Registered time for this segment during the best run.
@@ -155,7 +155,7 @@ public class Segment implements Cloneable, Serializable {
 	 *
 	 * @return  the icon of the segment or {@code null}.
 	 */
-	public Icon getIcon() {
+	public ImageIcon getIcon() {
 		return icon;
 	}
 
@@ -240,7 +240,7 @@ public class Segment implements Cloneable, Serializable {
 	 *
 	 * @param   icon    - the new icon for this segment.
 	 */
-	public void setIcon(Icon icon) {
+	public void setIcon(ImageIcon icon) {
 		if (icon == null) {
 			this.icon = null;
 		} else {
diff --git a/src/main/java/org/fenix/llanfair/gui/Core.java b/src/main/java/org/fenix/llanfair/gui/Core.java
index fcff916..639be79 100644
--- a/src/main/java/org/fenix/llanfair/gui/Core.java
+++ b/src/main/java/org/fenix/llanfair/gui/Core.java
@@ -515,7 +515,7 @@ class Core extends JPanel implements ActionListener {
 		}
 		if ((identifier & ICON) == ICON) {
 			if (hasCurrent) {
-				Icon img = currentSgt.getIcon();
+				ImageIcon img = currentSgt.getIcon();
 				if (img != null) {
 					icon.setIcon(
 							Images.rescale(img, Settings.coreIconSize.get()));
diff --git a/src/main/java/org/fenix/llanfair/gui/History.java b/src/main/java/org/fenix/llanfair/gui/History.java
index ea8faa1..e11752b 100644
--- a/src/main/java/org/fenix/llanfair/gui/History.java
+++ b/src/main/java/org/fenix/llanfair/gui/History.java
@@ -1,29 +1,21 @@
 package org.fenix.llanfair.gui;
 
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.GridBagLayout;
+import org.fenix.llanfair.Run;
+import org.fenix.llanfair.Run.State;
+import org.fenix.llanfair.Segment;
+import org.fenix.llanfair.Time;
+import org.fenix.llanfair.config.Merge;
+import org.fenix.llanfair.config.Settings;
+import org.fenix.utils.Images;
+import org.fenix.utils.gui.GBC;
+
+import javax.swing.*;
+import javax.swing.event.TableModelEvent;
+import java.awt.*;
 import java.beans.PropertyChangeEvent;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.Icon;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.event.TableModelEvent;
-
-import org.fenix.llanfair.Run;
-import org.fenix.llanfair.Segment;
-import org.fenix.llanfair.config.Settings;
-import org.fenix.llanfair.Time;
-import org.fenix.llanfair.Run.State;
-import org.fenix.llanfair.config.Merge;
-import org.fenix.utils.gui.GBC;
-import org.fenix.utils.Images;
-
 /**
  * A scrolling pane capable of displaying a specific number of segments with
  * information concerning their times. This pane contains a viewport on
@@ -535,7 +527,7 @@ public class History extends JPanel {
 			}
 			if ((identifier & ICON) == ICON) {
 				int  iconSize = Settings.historyIconSize.get();
-				Icon runIcon  = run.getSegment(index).getIcon();
+				ImageIcon runIcon  = run.getSegment(index).getIcon();
 				if (runIcon != null) {
 					icon.setIcon(Images.rescale(runIcon, iconSize));
 				} else {
diff --git a/src/main/java/org/fenix/utils/Images.java b/src/main/java/org/fenix/utils/Images.java
index d15e8be..d150de3 100644
--- a/src/main/java/org/fenix/utils/Images.java
+++ b/src/main/java/org/fenix/utils/Images.java
@@ -13,7 +13,7 @@ public class Images {
 	public Images() {
 	}
 
-	public static Icon rescale(Icon icon, int size) {
+	public static ImageIcon rescale(ImageIcon icon, int size) {
 		if(icon == null) {
 			throw new NullPointerException("Icon is null");
 		} else if(size <= 0) {