diff --git a/jOOQ-console/src/main/java/org/jooq/debug/console/Console.java b/jOOQ-console/src/main/java/org/jooq/debug/console/Console.java
index 2492bd60be..2a15f098e7 100644
--- a/jOOQ-console/src/main/java/org/jooq/debug/console/Console.java
+++ b/jOOQ-console/src/main/java/org/jooq/debug/console/Console.java
@@ -38,6 +38,7 @@ package org.jooq.debug.console;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.Desktop;
@@ -403,7 +404,8 @@ public class Console extends JFrame {
         final JPanel tabComponent = new JPanel(new BorderLayout());
         tabComponent.setOpaque(false);
         tabComponent.add(new JLabel(title), BorderLayout.CENTER);
-        final JLabel closeLabel = new JLabel(new ImageIcon(getClass().getResource("/org/jooq/debug/console/resources/CloseGray16.png")));
+        final JLabel closeLabel = new JLabel(new ImageIcon(getClass().getResource("/org/jooq/debug/console/resources/TabCloseInactive14.png")));
+        closeLabel.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));
         closeLabel.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseReleased(MouseEvent e) {
@@ -428,12 +430,20 @@ public class Console extends JFrame {
             @Override
             public void mouseEntered(MouseEvent e) {
                 if(editorTabbedPane.getTabCount() > 2) {
-                    closeLabel.setIcon(new ImageIcon(getClass().getResource("/org/jooq/debug/console/resources/Close16.png")));
+                    closeLabel.setIcon(new ImageIcon(getClass().getResource("/org/jooq/debug/console/resources/TabCloseActive14.png")));
                 }
             }
             @Override
             public void mouseExited(MouseEvent e) {
-                closeLabel.setIcon(new ImageIcon(getClass().getResource("/org/jooq/debug/console/resources/CloseGray16.png")));
+                closeLabel.setIcon(new ImageIcon(getClass().getResource("/org/jooq/debug/console/resources/TabCloseInactive14.png")));
+            }
+        });
+        editorTabbedPane.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                int selectedIndex = editorTabbedPane.getSelectedIndex();
+                Component tabComponent2 = editorTabbedPane.getTabComponentAt(selectedIndex);
+                closeLabel.setVisible(tabComponent2 == tabComponent && editorTabbedPane.getTabCount() > 2);
             }
         });
         tabComponent.add(closeLabel, BorderLayout.EAST);
diff --git a/jOOQ-console/src/main/java/org/jooq/debug/console/EditorPane.java b/jOOQ-console/src/main/java/org/jooq/debug/console/EditorPane.java
index db49803411..a08911ed35 100644
--- a/jOOQ-console/src/main/java/org/jooq/debug/console/EditorPane.java
+++ b/jOOQ-console/src/main/java/org/jooq/debug/console/EditorPane.java
@@ -215,7 +215,7 @@ public class EditorPane extends JPanel {
                         }
                         break;
                     case KeyEvent.VK_F5:
-                        if(startButton.isEnabled()) {
+                        if(startButton.isVisible()) {
                             evaluateInternal();
                         }
                         break;
@@ -564,6 +564,7 @@ public class EditorPane extends JPanel {
                 public void run() {
                     startButton.setVisible(true);
                     stopButton.setVisible(false);
+                    stopButton.setToolTipText(null);
                 }
             });
             if(!isDBEditable) {
diff --git a/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/Close16.png b/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/Close16.png
deleted file mode 100644
index 41d4d9bc96..0000000000
Binary files a/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/Close16.png and /dev/null differ
diff --git a/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/CloseGray16.png b/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/TabCloseActive14.png
similarity index 72%
rename from jOOQ-console/src/main/resources/org/jooq/debug/console/resources/CloseGray16.png
rename to jOOQ-console/src/main/resources/org/jooq/debug/console/resources/TabCloseActive14.png
index 01f65c52d9..00c16c43d9 100644
Binary files a/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/CloseGray16.png and b/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/TabCloseActive14.png differ
diff --git a/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/TabCloseInactive14.png b/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/TabCloseInactive14.png
new file mode 100644
index 0000000000..4fcb259b85
Binary files /dev/null and b/jOOQ-console/src/main/resources/org/jooq/debug/console/resources/TabCloseInactive14.png differ