diff --git a/src/main/gui/net/sf/jailer/ui/UIUtil.java b/src/main/gui/net/sf/jailer/ui/UIUtil.java
index f2d120369..3a3a57be3 100644
--- a/src/main/gui/net/sf/jailer/ui/UIUtil.java
+++ b/src/main/gui/net/sf/jailer/ui/UIUtil.java
@@ -1700,21 +1700,6 @@ public void actionPerformed(ActionEvent e) {
 			});
 			plafMenu.add(item);
 		}
-		
-		if (plafMenu.getComponentCount() < 5) {
-			// TODO
-			Container p = plafMenu.getParent();
-			if (p instanceof JPopupMenu) {
-				for (int i = 0; i < ((JPopupMenu) p).getComponentCount(); ++i) {
-					Component comp = ((JPopupMenu) p).getComponent(i);
-					if (comp == plafMenu) {
-						for (int pmi = 0; pmi < plafMenu.getComponentCount(); ++pmi) {
-							((JPopupMenu) p).add(plafMenu.getComponent(pmi), i + pmi);
-						}
-					}
-				}
-			}
-		}
 	}
 
 	public static String format(long number) {
diff --git a/src/main/gui/net/sf/jailer/ui/pathfinder/PathFinderView.java b/src/main/gui/net/sf/jailer/ui/pathfinder/PathFinderView.java
index 08a2f4e8f..df1c35b31 100644
--- a/src/main/gui/net/sf/jailer/ui/pathfinder/PathFinderView.java
+++ b/src/main/gui/net/sf/jailer/ui/pathfinder/PathFinderView.java
@@ -1385,13 +1385,6 @@ public void initFocus() {
 
 }
 
-
-// TODO
-// TODO check references of this SmallButton
-
-//TODO
-//TODO pathfinderview: icon "exclude all" is too saturated
-
 //TODO
 //TODO lupenstiel in dark nicht gut zu sehen
 
diff --git a/src/main/gui/net/sf/jailer/ui/resource/Cancel2.png b/src/main/gui/net/sf/jailer/ui/resource/Cancel2.png
index ac47ae756..b2418a55c 100644
Binary files a/src/main/gui/net/sf/jailer/ui/resource/Cancel2.png and b/src/main/gui/net/sf/jailer/ui/resource/Cancel2.png differ
diff --git a/src/main/gui/net/sf/jailer/ui/resource/Close-16-1dark.png b/src/main/gui/net/sf/jailer/ui/resource/Close-16-1dark.png
new file mode 100644
index 000000000..a985c8f6a
Binary files /dev/null and b/src/main/gui/net/sf/jailer/ui/resource/Close-16-1dark.png differ