diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/ConditionalBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/ConditionalBreakpointsTests.java
index 7f66bbd..17209a9 100755
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/ConditionalBreakpointsTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/ConditionalBreakpointsTests.java
@@ -479,7 +479,7 @@
 	 */
 	public void testSystracelBreakpoint() throws Exception {
 		String typeName = "HitCountLooper";
-		IJavaLineBreakpoint bp = createConditionalLineBreakpoint(16, typeName, "System.out.println(\"enclosing_type.enclosing_method()\");", true);
+		createConditionalLineBreakpoint(16, typeName, "System.out.println(\"enclosing_type.enclosing_method()\");", true);
 		IJavaLineBreakpoint bp1 = createConditionalLineBreakpoint(17, typeName, "return true", true);
 
 		IJavaThread thread = null;
@@ -488,7 +488,71 @@
 
 		}
 		finally {
-			bp.delete();
+			assertNotNull(thread);
+			terminateAndRemove(thread);
+			removeAllBreakpoints();
+		}
+	}
+
+	/**
+	 * Tests a breakpoint with a simple code which returns Integer Object, Launch should don't suspend for non true boolean returns
+	 * 
+	 * @throws Exception
+	 */
+	public void testConditionBreakpointReturnNonBooleanObject() throws Exception {
+		String typeName = "HitCountLooper";
+		createConditionalLineBreakpoint(16, typeName, "return new Integer(1)", true);
+		IJavaLineBreakpoint bp1 = createConditionalLineBreakpoint(17, typeName, "return true", true);
+
+		IJavaThread thread = null;
+		try {
+			thread = launchToLineBreakpoint(typeName, bp1);
+
+		}
+		finally {
+			assertNotNull(thread);
+			terminateAndRemove(thread);
+			removeAllBreakpoints();
+		}
+	}
+
+	/**
+	 * Tests a breakpoint with a simple code which returns Boolean Object with true, Launch should suspend for true Boolean returns
+	 * 
+	 * @throws Exception
+	 */
+	public void testConditionBreakpointReturnBooleanObjectTrue() throws Exception {
+		String typeName = "HitCountLooper";
+		IJavaLineBreakpoint bp = createConditionalLineBreakpoint(16, typeName, "return new Boolean(true)", true);
+
+		IJavaThread thread = null;
+		try {
+			thread = launchToLineBreakpoint(typeName, bp);
+
+		}
+		finally {
+			assertNotNull(thread);
+			terminateAndRemove(thread);
+			removeAllBreakpoints();
+		}
+	}
+
+	/**
+	 * Tests a breakpoint with a simple code which returns Boolean Object with false, Launch should not suspend for false Boolean returns
+	 * 
+	 * @throws Exception
+	 */
+	public void testConditionBreakpointReturnBooleanObjectFalse() throws Exception {
+		String typeName = "HitCountLooper";
+		createConditionalLineBreakpoint(16, typeName, "return new Boolean(false)", true);
+		IJavaLineBreakpoint bp1 = createConditionalLineBreakpoint(17, typeName, "return true", true);
+
+		IJavaThread thread = null;
+		try {
+			thread = launchToLineBreakpoint(typeName, bp1);
+
+		}
+		finally {
 			assertNotNull(thread);
 			terminateAndRemove(thread);
 			removeAllBreakpoints();
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/constant_co.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/constant_co.png
index cfbdd66..fa4da80 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/constant_co.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/constant_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/constant_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/constant_co@2x.png
new file mode 100644
index 0000000..05ba9d5
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/constant_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/deadlock_view.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/deadlock_view.png
new file mode 100644
index 0000000..fb5d5ee
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/deadlock_view.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/deadlock_view@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/deadlock_view@2x.png
new file mode 100644
index 0000000..67f16ad
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/deadlock_view@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch.png
index aaa0c1a..87c9b44 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/final_co.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/final_co.png
new file mode 100644
index 0000000..dc3a5f1
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/final_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/final_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/final_co@2x.png
new file mode 100644
index 0000000..cafef28
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/final_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/monitor_view.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/monitor_view.png
new file mode 100644
index 0000000..5a86150
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/monitor_view.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/monitor_view@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/monitor_view@2x.png
new file mode 100644
index 0000000..5b748fb
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/monitor_view@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/resume_co.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/resume_co.png
new file mode 100644
index 0000000..11b6ca8
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/resume_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/resume_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/resume_co@2x.png
new file mode 100644
index 0000000..e3793c2
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/resume_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co.png
index dedb799..e8e595e 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co@2x.png
new file mode 100644
index 0000000..ef581db
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co.png
index 3df9a2d..15a69ab 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co@2x.png
index 7d3411b..0a587c8 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co@2x.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co.png
index 9f90ea8..594c7e0 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co@2x.png
index 0c3524a..5dd502a 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co@2x.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/thread_view.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/thread_view.png
new file mode 100644
index 0000000..5758aaf
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/thread_view.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/thread_view@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/thread_view@2x.png
new file mode 100644
index 0000000..4bf10c6
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/thread_view@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/debug_exc.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/debug_exc.png
new file mode 100644
index 0000000..07904b7
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/debug_exc.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/debug_exc@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/debug_exc@2x.png
new file mode 100644
index 0000000..522659a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/debug_exc@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook.png
index 0157f6e..73b5aac 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook@2x.png
new file mode 100644
index 0000000..d426c9c
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook.png
index fa1fe6b..1ea0d26 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook@2x.png
new file mode 100644
index 0000000..f99e66d
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app.png
index c3b0a18..b5b9174 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app@2x.png
new file mode 100644
index 0000000..91dfad9
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_applet.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_applet.png
index d329a42..e5e797a 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_applet.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_applet.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_applet@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_applet@2x.png
new file mode 100644
index 0000000..24e88ee
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_applet@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach.png
index 002a532..24e095a 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach@2x.png
new file mode 100644
index 0000000..4589567
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_exc.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_exc.png
new file mode 100644
index 0000000..0ed3ed4
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_exc.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_exc@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_exc@2x.png
new file mode 100644
index 0000000..37f0d32
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_exc@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook.png
index 2279f74..64a3417 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook@2x.png
new file mode 100644
index 0000000..3fd8eb8
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook.png
index d3a0590..ed5e848 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook@2x.png
new file mode 100644
index 0000000..561447b
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/watch_exp.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/watch_exp.png
index 52c00d0..80b5801 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/watch_exp.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/watch_exp.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_instances.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_instances.png
index 0c64ad1..929392e 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_instances.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_instances.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_instances@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_instances@2x.png
new file mode 100644
index 0000000..441d8b3
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_instances@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_references.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_references.png
index fad6f83..d87e483 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_references.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_references.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_references@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_references@2x.png
new file mode 100644
index 0000000..7e9887e
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_references@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/autoform_menu.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/autoform_menu.png
index a93e894..3dc38a8 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/autoform_menu.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/autoform_menu.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/autoform_menu@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/autoform_menu@2x.png
new file mode 100644
index 0000000..38d0f87
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/autoform_menu@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/constant_co.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/constant_co.png
index 8c72bed..5b4f948 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/constant_co.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/constant_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/constant_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/constant_co@2x.png
new file mode 100644
index 0000000..f9471ee
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/constant_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/deadlock_view.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/deadlock_view.png
new file mode 100644
index 0000000..54b7e3a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/deadlock_view.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/deadlock_view@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/deadlock_view@2x.png
new file mode 100644
index 0000000..9ca79ec
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/deadlock_view@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch.png
index eda907d..2962f6e 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch@2x.png
index e5ebb00..b943d36 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch@2x.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/final_co.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/final_co.png
new file mode 100644
index 0000000..96bb95f
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/final_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/final_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/final_co@2x.png
new file mode 100644
index 0000000..d431d2c
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/final_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/monitor_view.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/monitor_view.png
new file mode 100644
index 0000000..85d4419
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/monitor_view.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/monitor_view@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/monitor_view@2x.png
new file mode 100644
index 0000000..fca6821
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/monitor_view@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/resume_co.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/resume_co.png
new file mode 100644
index 0000000..56aa01f
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/resume_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/resume_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/resume_co@2x.png
new file mode 100644
index 0000000..c41333a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/resume_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co.png
index dd0497a..6c0855a 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co@2x.png
index cbf5e1c..d7c09ac 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co@2x.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co.png
index 2c8726a..01261d5 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co@2x.png
new file mode 100644
index 0000000..bf6b4a4
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co.png
index 7eaf952..f3c6a4e 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co@2x.png
index 101bd11..7a14c6f 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co@2x.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co.png
index f7c9eae..7d8d5d7 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co@2x.png
index 9952c26..e307856 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co@2x.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/thread_view.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/thread_view.png
new file mode 100644
index 0000000..2dacf9c
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/thread_view.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/thread_view@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/thread_view@2x.png
new file mode 100644
index 0000000..b348f31
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/thread_view@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr.png
index 0aa158d..1e6a4c6 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr@2x.png
index ef3ac83..d590954 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr@2x.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/debug_exc.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/debug_exc.png
new file mode 100644
index 0000000..17bb448
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/debug_exc.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/debug_exc@2x.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/debug_exc@2x.png
new file mode 100644
index 0000000..8c168ee
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/debug_exc@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.png
index 694fe36..48ada2e 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook@2x.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook@2x.png
new file mode 100644
index 0000000..60f5657
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook.png
index e936fba..bb17580 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook@2x.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook@2x.png
new file mode 100644
index 0000000..8ac8239
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app copy.gif b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app copy.gif
new file mode 100644
index 0000000..a42a7c8
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app copy.gif
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app.png
index e491d06..3b1b4b5 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app@2x.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app@2x.png
new file mode 100644
index 0000000..ed5ecee
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_applet.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_applet.png
index dad7e1e..59c44e9 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_applet.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_applet.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_applet@2x.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_applet@2x.png
new file mode 100644
index 0000000..53800fd
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_applet@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach.png
index b3cb48b..178a211 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach@2x.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach@2x.png
new file mode 100644
index 0000000..1d28891
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/new_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/new_sbook.png
new file mode 100644
index 0000000..2b2d0d9
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/new_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/new_sbook@2x.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/new_sbook@2x.png
new file mode 100644
index 0000000..7661fc2
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/new_sbook@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/run_exc.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/run_exc.png
new file mode 100644
index 0000000..c06ce07
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/run_exc.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/run_exc@2x.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/run_exc@2x.png
new file mode 100644
index 0000000..d1a4b91
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/run_exc@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook.png
index 9d7dbbe..6ca22a5 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook@2x.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook@2x.png
new file mode 100644
index 0000000..f36b75a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook.png
index cfbf9d1..032a26c 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook@2x.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook@2x.png
new file mode 100644
index 0000000..a7dc14c
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/watch_exp.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/watch_exp.png
index a9327be..54bc4b3 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/watch_exp.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/watch_exp.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/eview16/thread_and_monitor_view.png b/org.eclipse.jdt.debug.ui/icons/full/eview16/thread_and_monitor_view.png
new file mode 100644
index 0000000..28db2de
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/eview16/thread_and_monitor_view.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/eview16/thread_and_monitor_view@2x.png b/org.eclipse.jdt.debug.ui/icons/full/eview16/thread_and_monitor_view@2x.png
new file mode 100644
index 0000000..585da37
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/eview16/thread_and_monitor_view@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/eview16/variable_tab.png b/org.eclipse.jdt.debug.ui/icons/full/eview16/variable_tab.png
index 9a44e10..7d9f913 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/eview16/variable_tab.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/eview16/variable_tab.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/eview16/variable_tab@2x.png b/org.eclipse.jdt.debug.ui/icons/full/eview16/variable_tab@2x.png
new file mode 100644
index 0000000..118737c
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/eview16/variable_tab@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/brkpi_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/brkpi_obj.png
new file mode 100644
index 0000000..af367fb
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/brkpi_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/brkpi_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/brkpi_obj@2x.png
new file mode 100644
index 0000000..2437168
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/brkpi_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/classpath_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/classpath_obj.png
index 9557b04..4f3e003 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/classpath_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/classpath_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/classpath_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/classpath_obj@2x.png
new file mode 100644
index 0000000..15eedb0
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/classpath_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/contended_monitor_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/contended_monitor_obj.png
index 1f5638b..2cfa409 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/contended_monitor_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/contended_monitor_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/contended_monitor_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/contended_monitor_obj@2x.png
new file mode 100644
index 0000000..af6ab69
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/contended_monitor_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/insp_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/insp_sbook.png
index 1a9271c..bb17580 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/insp_sbook.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/insp_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/insp_sbook@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/insp_sbook@2x.png
new file mode 100644
index 0000000..8ac8239
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/insp_sbook@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj.png
index 785eb8a..e0ee1be 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj@2x.png
index 0be6aa1..b952054 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj@2x.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jline_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jline_obj.png
index fe55c43..47141e9 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jline_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jline_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jline_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jline_obj@2x.png
new file mode 100644
index 0000000..a69d064
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jline_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jload_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jload_obj.png
index 8c6a3e1..70442ce 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jload_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jload_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jload_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jload_obj@2x.png
new file mode 100644
index 0000000..4d3b266
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jload_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jmeth_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jmeth_obj.png
index 5f1afe6..08b6def 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jmeth_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jmeth_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jmeth_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jmeth_obj@2x.png
new file mode 100644
index 0000000..6c6c7fc
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jmeth_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj.png
index b89a649..9eaf92b 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj@2x.png
new file mode 100644
index 0000000..b86c1cd
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj.png
index de97cd7..943f2b3 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj@2x.png
new file mode 100644
index 0000000..0a75744
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jspbrkpt_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jspbrkpt_obj.png
index 6644b96..224b570 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jspbrkpt_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jspbrkpt_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jspbrkpt_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jspbrkpt_obj@2x.png
new file mode 100644
index 0000000..087b430
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jspbrkpt_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jwatch_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jwatch_obj.png
index 8307428..b75ff31 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jwatch_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jwatch_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jwatch_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jwatch_obj@2x.png
new file mode 100644
index 0000000..d941a1d
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jwatch_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/methodresult_obj_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/methodresult_obj_disabled.png
index 238a9d1..a88d42c 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/methodresult_obj_disabled.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/methodresult_obj_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/methodresult_obj_disabled@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/methodresult_obj_disabled@2x.png
index f11687b..b0cf94f 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/methodresult_obj_disabled@2x.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/methodresult_obj_disabled@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/monitor_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/monitor_obj.png
index c11b767..85d4419 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/monitor_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/monitor_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/monitor_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/monitor_obj@2x.png
new file mode 100644
index 0000000..fca6821
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/monitor_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/owned_monitor_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/owned_monitor_obj.png
index cfb8a11..d3834fc 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/owned_monitor_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/owned_monitor_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/owned_monitor_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/owned_monitor_obj@2x.png
new file mode 100644
index 0000000..347f5b1
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/owned_monitor_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/reference_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/reference_obj.png
new file mode 100644
index 0000000..c3a3da5
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/reference_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/reference_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/reference_obj@2x.png
new file mode 100644
index 0000000..9531066
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/reference_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_and_monitor_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_and_monitor_obj.png
index ed03ca0..28db2de 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_and_monitor_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_and_monitor_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_and_monitor_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_and_monitor_obj@2x.png
new file mode 100644
index 0000000..585da37
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_and_monitor_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_obj.png
index 60ccb7e..ae34454 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/threadgroup_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/threadgroup_obj.png
index c7db78e..af34cac 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/threadgroup_obj.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/threadgroup_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/threadgroup_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/threadgroup_obj@2x.png
new file mode 100644
index 0000000..fdf2762
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/threadgroup_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr.png
index 97faa0b..ef27865 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr@2x.png
new file mode 100644
index 0000000..101c78e
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled.png
index 27f7dd9..1969994 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled@2x.png
new file mode 100644
index 0000000..ee52c14
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr.png
index fbb326a..04c1ed7 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr@2x.png
new file mode 100644
index 0000000..4125335
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.png
index d9a1f0d..8f9a0af 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled@2x.png
new file mode 100644
index 0000000..304dbfc
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/contention_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/contention_ovr.png
index a9fb776..4025e87 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/contention_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/contention_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/contention_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/contention_ovr@2x.png
new file mode 100644
index 0000000..ddedd86
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/contention_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/contentionformonitor_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/contentionformonitor_ovr.png
index c5b975e..0b86009 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/contentionformonitor_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/contentionformonitor_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/contentionformonitor_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/contentionformonitor_ovr@2x.png
new file mode 100644
index 0000000..df549fb
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/contentionformonitor_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/deadlock_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/deadlock_ovr.png
index 3ad81a1..fbf65d3 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/deadlock_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/deadlock_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/deadlock_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/deadlock_ovr@2x.png
new file mode 100644
index 0000000..32e9111
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/deadlock_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr.png
index d57e6f2..a54644d 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr@2x.png
new file mode 100644
index 0000000..87cfc40
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled.png
index 2f22f66..af19290 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled@2x.png
new file mode 100644
index 0000000..8a6edbe
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr.png
index d7f0d5a..5afbd2a 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr@2x.png
new file mode 100644
index 0000000..7d265bd
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled.png
index 08bb335..1931f2a 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled@2x.png
new file mode 100644
index 0000000..d3364a7
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr.png
index 1764c9a..aaefd92 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr@2x.png
new file mode 100644
index 0000000..01df5e8
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.png
index 1cdb362..bfccf49 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled@2x.png
new file mode 100644
index 0000000..411c42f
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/owned_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/owned_ovr.png
index d15e6e8..ffeb68f 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/owned_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/owned_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/owned_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/owned_ovr@2x.png
new file mode 100644
index 0000000..cd6751f
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/owned_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/ownsmonitor_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/ownsmonitor_ovr.png
index a3bc4c6..568fb41 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/ownsmonitor_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/ownsmonitor_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/ownsmonitor_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/ownsmonitor_ovr@2x.png
new file mode 100644
index 0000000..56e2b7f
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/ownsmonitor_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr.png
index 13de7f2..07d6c2a 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr@2x.png
new file mode 100644
index 0000000..aa01734
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled.png
index fb5815c..193c33d 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled@2x.png
new file mode 100644
index 0000000..c9af363
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/sync_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/sync_ovr.png
index 9809abb..b18796e 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/sync_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/sync_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/sync_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/sync_ovr@2x.png
new file mode 100644
index 0000000..473bacb
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/sync_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_ovr.png
index e0bf7d7..908cb01 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_ovr@2x.png
new file mode 100644
index 0000000..2e5f6bc
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_suppressed_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_suppressed_ovr.png
index f05654f..ad53988 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_suppressed_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_suppressed_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_suppressed_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_suppressed_ovr@2x.png
new file mode 100644
index 0000000..5473394
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/trigger_suppressed_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr.png
index cc7ad8d..313d26b 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr@2x.png
new file mode 100644
index 0000000..3c586c9
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled.png
index fbc3432..9f32ed4 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled@2x.png
new file mode 100644
index 0000000..c051616
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/wizban/java_app_wiz.png b/org.eclipse.jdt.debug.ui/icons/full/wizban/java_app_wiz.png
index d2ebfe3..0bfddbc 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/wizban/java_app_wiz.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/wizban/java_app_wiz.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/wizban/java_app_wiz@2x.png b/org.eclipse.jdt.debug.ui/icons/full/wizban/java_app_wiz@2x.png
new file mode 100644
index 0000000..184736f
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/wizban/java_app_wiz@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/wizban/java_attach_wiz.png b/org.eclipse.jdt.debug.ui/icons/full/wizban/java_attach_wiz.png
index 3ec71ff..fb159d3 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/wizban/java_attach_wiz.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/wizban/java_attach_wiz.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/wizban/java_attach_wiz@2x.png b/org.eclipse.jdt.debug.ui/icons/full/wizban/java_attach_wiz@2x.png
new file mode 100644
index 0000000..bf90db4
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/wizban/java_attach_wiz@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/wizban/library_wiz.png b/org.eclipse.jdt.debug.ui/icons/full/wizban/library_wiz.png
index 705dc30..030584a 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/wizban/library_wiz.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/wizban/library_wiz.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/wizban/library_wiz@2x.png b/org.eclipse.jdt.debug.ui/icons/full/wizban/library_wiz@2x.png
new file mode 100644
index 0000000..cfeb81b
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/wizban/library_wiz@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/wizban/newsbook_wiz.png b/org.eclipse.jdt.debug.ui/icons/full/wizban/newsbook_wiz.png
index db5c70c..2f8147e 100644
--- a/org.eclipse.jdt.debug.ui/icons/full/wizban/newsbook_wiz.png
+++ b/org.eclipse.jdt.debug.ui/icons/full/wizban/newsbook_wiz.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/wizban/newsbook_wiz@2x.png b/org.eclipse.jdt.debug.ui/icons/full/wizban/newsbook_wiz@2x.png
new file mode 100644
index 0000000..1bf10da
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/wizban/newsbook_wiz@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/plugin.xml b/org.eclipse.jdt.debug.ui/plugin.xml
index afe28cd..ad34e67 100644
--- a/org.eclipse.jdt.debug.ui/plugin.xml
+++ b/org.eclipse.jdt.debug.ui/plugin.xml
@@ -142,7 +142,7 @@
                class="org.eclipse.jdt.internal.debug.ui.breakpoints.AddClassPrepareBreakpointAction"
                menubarPath="org.eclipse.ui.run/breakpointGroup"
                id="org.eclipse.jdt.debug.ui.actions.AddClassPrepareBreakpoint">
-         </action>         
+         </action>
          <action
                definitionId="org.eclipse.jdt.debug.ui.commands.AddExceptionBreakpoint"
                label="%exceptionAction.accel.label"
@@ -168,13 +168,13 @@
                   <systemProperty
                       name="org.eclipse.jdt.debug.ui.supportsForceReturn"
                       value="true">
-                  </systemProperty>                  
+                  </systemProperty>
                   <objectClass
                         name="org.eclipse.jface.text.ITextSelection">
                   </objectClass>
                </and>
             </enablement>
-         </action>         
+         </action>
          <action
                id="org.eclipse.jdt.debug.ui.actions.Execute"
                hoverIcon="$nl$/icons/full/etool16/run_sbook.png"
@@ -326,7 +326,7 @@
                                  </or>
                               </and>
             </enablement>
-         </action>         
+         </action>
          <action
                class="org.eclipse.jdt.internal.debug.ui.heapwalking.AllInstancesActionDelegate"
                definitionId="org.eclipse.jdt.debug.ui.commands.AllInstances"
@@ -397,7 +397,7 @@
          </action>
       </actionSet>
    </extension>
-   <extension 
+   <extension
          point="org.eclipse.ui.menus">
        <menuContribution
             locationURI="menu:navigate?endof=open.ext">
@@ -513,7 +513,7 @@
             targetID="org.eclipse.jdt.ui.JavaPerspective">
 		 <actionSet
                id="org.eclipse.debug.ui.breakpointActionSet">
-         </actionSet>                            
+         </actionSet>
          <actionSet
                id="org.eclipse.jdt.debug.ui.JDTDebugActionSet">
          </actionSet>
@@ -522,7 +522,7 @@
             targetID="org.eclipse.jdt.ui.JavaHierarchyPerspective">
          <actionSet
                id="org.eclipse.debug.ui.breakpointActionSet">
-         </actionSet>         
+         </actionSet>
          <actionSet
                id="org.eclipse.jdt.debug.ui.JDTDebugActionSet">
          </actionSet>
@@ -531,7 +531,7 @@
             targetID="org.eclipse.jdt.ui.JavaBrowsingPerspective">
          <actionSet
                id="org.eclipse.debug.ui.breakpointActionSet">
-         </actionSet>         
+         </actionSet>
          <actionSet
                id="org.eclipse.jdt.debug.ui.JDTDebugActionSet">
          </actionSet>
@@ -761,7 +761,7 @@
             </not>
           </and>
          </visibility>
-         
+
       </objectContribution>
       <objectContribution
             id="org.eclipse.jdt.debug.ui.FilteredJavaVariableActions"
@@ -1102,7 +1102,7 @@
                menubarPath="java.debug"
                tooltip="%allInstances.tooltip">
          </action>
-      </viewerContribution>      
+      </viewerContribution>
       <viewerContribution
             targetID="#ClassFileEditorContext"
             id="org.eclipse.jdt.debug.ui.CFPopupActions">
@@ -1125,7 +1125,7 @@
                id="org.eclipse.jdt.debug.ui.cuPopup.RunToLine"
                label="%runToLineAction.label"
                menubarPath="additions">
-         </action>            
+         </action>
          <action
                label="%Execute.label"
                icon="$nl$/icons/full/etool16/run_sbook.png"
@@ -1208,12 +1208,12 @@
                menubarPath="additions"
                tooltip="%allInstances.tooltip">
          </action>
-      </viewerContribution>      
+      </viewerContribution>
       <objectContribution
             objectClass="org.eclipse.jdt.core.IMethod"
             id="org.eclipse.jdt.debug.ui.MethodBreakpointActions">
          <visibility>
-            <and>						
+            <and>
 	            	   <not>
 	                  <objectState name="MemberActionFilter" value="isAbstract"/>
 	               </not>
@@ -1259,7 +1259,7 @@
                       </objectState>
                    </not>
                 </and>
-         </visibility>            
+         </visibility>
          <action
                class="org.eclipse.debug.ui.actions.ToggleWatchpointActionDelegate"
                enablesFor="+"
@@ -1298,7 +1298,7 @@
                </not>
             </and>
          </visibility>
-      </objectContribution>   
+      </objectContribution>
       <objectContribution
             objectClass="org.eclipse.jdt.debug.core.IJavaVariable"
             id="org.eclipse.jdt.debug.ui.InstanceFiltersActions">
@@ -1446,11 +1446,11 @@
                menubarPath="emptyThreadGroup"
                enablesFor="1"
                id="org.eclipse.jdt.debug.ui.actions.ShowStratum">
-        </action>    
+        </action>
         <enablement>
          	<test property="org.eclipse.jdt.debug.isMultiStrata" value="true"/>
-        </enablement>        
-      </objectContribution>         
+        </enablement>
+      </objectContribution>
       <objectContribution
             objectClass="org.eclipse.jdt.debug.core.IJavaMethodBreakpoint"
             id="org.eclipse.jdt.debug.MethodBreakpointToggleActions">
@@ -1590,7 +1590,7 @@
                menubarPath="emptyThreadGroup"
                enablesFor="+"
                id="org.eclipse.jdt.debug.ui.actions.EditStepFiltersAction">
-         </action>              
+         </action>
       </objectContribution>
       <viewerContribution
             targetID="org.eclipse.debug.ui.VariableView.detail"
@@ -1618,7 +1618,7 @@
                      value="true">
                </systemProperty>
             </enablement>
-         </action>         
+         </action>
          <action
                label="%Execute.label"
                icon="$nl$/icons/full/etool16/run_sbook.png"
@@ -1718,7 +1718,7 @@
                   </objectClass>
                </and>
             </enablement>
-         </action>         
+         </action>
          <action
                label="%Execute.label"
                icon="$nl$/icons/full/etool16/run_sbook.png"
@@ -1911,7 +1911,7 @@
                menubarPath="org.eclipse.jdt.debug.ui.VariableView.javaSubmenu/javaPart"
                style="toggle"
                tooltip="%allReferencesInView.tooltip">
-         </action>         
+         </action>
          <action
                style="toggle"
                id="org.eclipse.jdt.debug.ui.variableViewActions.ShowNullEntries"
@@ -1920,7 +1920,7 @@
                label="%showNullEntriesAction.label"
                menubarPath="org.eclipse.jdt.debug.ui.VariableView.javaSubmenu/javaPart"
                tooltip="%showNullEntriesAction.tooltip">
-         </action>                  
+         </action>
          <action
                style="toggle"
                id="org.eclipse.jdt.debug.ui.variableViewActions.ShowQualified"
@@ -1976,7 +1976,7 @@
                label="%allReferencesInView.label"
                menubarPath="org.eclipse.jdt.debug.ui.expSubmenu/javaPart"
                style="toggle"
-               tooltip="%allReferencesInView.label"/>               
+               tooltip="%allReferencesInView.label"/>
          <action
                style="toggle"
                id="org.eclipse.jdt.debug.ui.variableViewActions.ShowNullEntries"
@@ -1985,7 +1985,7 @@
                label="%showNullEntriesAction.label"
                menubarPath="org.eclipse.jdt.debug.ui.expSubmenu/javaPart"
                tooltip="%showNullEntriesAction.tooltip">
-         </action>                  
+         </action>
          <action
                style="toggle"
                id="org.eclipse.jdt.debug.ui.expressionViewActions.ShowQualified"
@@ -2060,7 +2060,7 @@
                label="%showThreadGroupsAction.label"
                menubarPath="org.eclipse.jdt.debug.ui.LaunchView.javaSubmenu/javaPart"
                tooltip="%showThreadGroupsAction.tooltip">
-         </action>            
+         </action>
          <action
                style="toggle"
                id="org.eclipse.jdt.debug.ui.launchViewActions.ShowQualified"
@@ -2097,7 +2097,7 @@
      <groupMarker
            name="org.eclipse.jdt.debug.ui.javaPart">
      </groupMarker>
-  </menu>         
+  </menu>
       </viewContribution>
       <viewContribution
             targetID="org.eclipse.jdt.debug.ui.DisplayView"
@@ -2291,8 +2291,8 @@
                </adapt>
             </or>
          </enabledWhen>
-      </page>      
-      
+      </page>
+
       <page
             name="%filteringPage.label"
             class="org.eclipse.jdt.internal.debug.ui.propertypages.JavaExceptionBreakpointAdvancedPage"
@@ -2379,7 +2379,7 @@
             class="org.eclipse.jdt.internal.debug.ui.JavaPrimitivesPreferencePage"
             id="org.eclipse.jdt.debug.ui.JavaPrimitivesPreferencePage">
          <keywordReference id="org.eclipse.jdt.debug.ui.primitiveOptions"/>
-      </page>   
+      </page>
       <page
             name="%javaDetailFormattersPrefName"
             category="org.eclipse.jdt.debug.ui.JavaDebugPreferencePage"
@@ -2436,7 +2436,7 @@
             helpContextId="org.eclipse.jdt.debug.ui.local_java_application_type_context"
             class="org.eclipse.jdt.internal.debug.ui.launcher.LocalJavaApplicationTabGroup"
             id="org.eclipse.jdt.debug.ui.launchConfigurationTabGroup.localJavaApplication">
-            <launchMode 
+            <launchMode
                   mode="debug"
                   perspective="org.eclipse.debug.ui.DebugPerspective"
                   description="%localJavaApplicationTabGroupDescription.debug">
@@ -2458,7 +2458,7 @@
             helpContextId="org.eclipse.jdt.debug.ui.java_applet_type_context"
             class="org.eclipse.jdt.internal.debug.ui.launcher.JavaAppletTabGroup"
             id="org.eclipse.jdt.debug.ui.launchConfigurationTabGroup.javaApplet">
-            <launchMode 
+            <launchMode
                   mode="debug"
                   perspective="org.eclipse.debug.ui.DebugPerspective"
                   description="%appletTabGroupDescription.debug">
@@ -2499,7 +2499,7 @@
             code="111"
             class="org.eclipse.jdt.internal.debug.ui.EvaluationStackFrameContextStatusHandler"
             id="org.eclipse.jdt.debug.ui.statusHandler.evaluationStackFrameContextStatusHandler"
-            plugin="org.eclipse.jdt.debug"/>        
+            plugin="org.eclipse.jdt.debug"/>
    </extension>
    <extension
          point="org.eclipse.debug.core.sourceLocators">
@@ -2589,9 +2589,9 @@
    </extension>
 <!-- commands and their bindings
 NOTE:
-M1 = CTRL/COMMAND 
-M2 = SHIFT 
-M3 = ALT 
+M1 = CTRL/COMMAND
+M2 = SHIFT
+M3 = ALT
 M4 = Platform-specific fourth key
 -->
    <extension point="org.eclipse.ui.commands">
@@ -2637,7 +2637,7 @@
             description="%ActionDefinition.forceReturn.description"
             categoryId="org.eclipse.debug.ui.category.run"
             id="org.eclipse.jdt.debug.ui.commands.ForceReturn">
-      </command>      
+      </command>
  <!-- views -->
 <!-- launch shortcuts -->
       <command
@@ -2668,7 +2668,7 @@
             categoryId="org.eclipse.debug.ui.category.run"
             description="%ActionDefinition.watch.description"
             id="org.eclipse.jdt.debug.ui.commands.Watch"
-            name="%ActionDefinition.watch.name"/> 
+            name="%ActionDefinition.watch.name"/>
       <command
             categoryId="org.eclipse.debug.ui.category.run"
             description="%ActionDefinition.allReferences.description"
@@ -2689,13 +2689,13 @@
             helpContextId="all_instances_action_context"
             id="org.eclipse.jdt.debug.ui.commands.InstanceCount"
             name="%ActionDefinition.instanceCount.name">
-      </command>      
+      </command>
       <command
             categoryId="org.eclipse.debug.ui.category.run"
             description="%ActionDefinition.breakpointproperties.description"
             id="org.eclipse.jdt.debug.ui.breakpoint.properties"
             name="%CommandDefinition.breakpointproperties.name">
-      </command> 
+      </command>
       <command
             categoryId="org.eclipse.ui.category.navigate"
             description="%OpenFromClipboardAction.description"
@@ -2724,16 +2724,16 @@
       <key
             sequence="M2+M3+F"
             commandId="org.eclipse.jdt.debug.ui.commands.ForceReturn"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>            
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
       <key
             platform="carbon"
             sequence="M2+M3+F"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>            
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
       <key
             platform="carbon"
             sequence="M1+M3+F"
             commandId="org.eclipse.jdt.debug.ui.commands.ForceReturn"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>            
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
 	  <key
             sequence="M1+U"
             commandId="org.eclipse.jdt.debug.ui.commands.Execute"
@@ -2765,61 +2765,61 @@
        <key
             platform="carbon"
             sequence="M1+M3+M4+D J"
-            
+
             commandId="org.eclipse.jdt.debug.ui.localJavaShortcut.debug"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
        <key
             sequence="M2+M3+X J"
-            
+
             commandId="org.eclipse.jdt.debug.ui.localJavaShortcut.run"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
        <key
             platform="carbon"
             sequence="M2+M3+X J"
-            
+
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
        <key
             platform="carbon"
             sequence="M1+M3+X J"
-            
+
             commandId="org.eclipse.jdt.debug.ui.localJavaShortcut.run"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
       <key
             sequence="M2+M3+D A"
-            
+
             commandId="org.eclipse.jdt.debug.ui.javaAppletShortcut.debug"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
       <!-- On carbon: Shift+Option+D is a character, Command+Option+D is Show/Hide Dock, Command+Control+D is dictionary lookup -->
       <key
             platform="carbon"
             sequence="M2+M3+D A"
-            
+
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
       <key
             platform="carbon"
             sequence="M1+M3+M4+D A"
-            
+
             commandId="org.eclipse.jdt.debug.ui.javaAppletShortcut.debug"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
 	  <key
             sequence="M2+M3+X A"
-            
+
             commandId="org.eclipse.jdt.debug.ui.javaAppletShortcut.run"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
 	  <key
             platform="carbon"
             sequence="M2+M3+X A"
-            
+
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
 	  <key
             platform="carbon"
             sequence="M1+M3+X A"
-            
+
             commandId="org.eclipse.jdt.debug.ui.javaAppletShortcut.run"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
    <key
          commandId="org.eclipse.jdt.debug.ui.commands.AllInstances"
-         
+
          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
          sequence="M1+M2+N">
    </key>
@@ -2947,14 +2947,14 @@
          </part>
       </actionSetPartAssociation>
    </extension>
-   
+
 <!-- refactoring -->
-   
+
    <extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
       <renameParticipant
             class="org.eclipse.jdt.internal.debug.core.refactoring.LaunchConfigurationITypeRenameParticipant"
             name="%LaunchConfigurationITypeRenameParticipant.name"
-            id="org.eclipse.jdt.debug.refactoring.launchConfiguration.typeRename"> 
+            id="org.eclipse.jdt.debug.refactoring.launchConfiguration.typeRename">
          <enablement>
            <with variable="affectedNatures">
              <iterate operator="or">
@@ -3161,7 +3161,7 @@
             autoOpen="false">
       </contextViewBinding>
    </extension>
-   
+
    <!-- Source Lookup -->
    <extension
          point="org.eclipse.debug.ui.sourceContainerPresentations">
@@ -3182,89 +3182,89 @@
             containerTypeID="org.eclipse.jdt.launching.sourceContainer.javaProject"
             icon="$nl$/icons/full/obj16/prj_obj.png"
             id="org.eclipse.jdt.debug.ui.sourceContainerPresentation.javaProject">
-      </sourceContainerPresentation>      
+      </sourceContainerPresentation>
       <sourceContainerPresentation
             containerTypeID="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"
             icon="$nl$/icons/full/obj16/jar_obj.png"
             id="org.eclipse.jdt.debug.ui.sourceContainerPresentation.packageFragmentRoot">
-      </sourceContainerPresentation>      
+      </sourceContainerPresentation>
    </extension>
 	<extension point="org.eclipse.core.runtime.adapters">
-         <factory 
-            class="org.eclipse.jdt.internal.debug.ui.sourcelookup.WorkbenchAdapterFactory" 
+         <factory
+            class="org.eclipse.jdt.internal.debug.ui.sourcelookup.WorkbenchAdapterFactory"
             adaptableType="org.eclipse.jdt.launching.sourcelookup.containers.PackageFragmentRootSourceContainer">
             <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
          </factory>
-         <factory 
-            class="org.eclipse.jdt.internal.debug.ui.sourcelookup.WorkbenchAdapterFactory" 
+         <factory
+            class="org.eclipse.jdt.internal.debug.ui.sourcelookup.WorkbenchAdapterFactory"
             adaptableType="org.eclipse.jdt.launching.sourcelookup.containers.JavaProjectSourceContainer">
             <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
-         </factory>         
-         <factory 
-            class="org.eclipse.jdt.internal.debug.ui.sourcelookup.WorkbenchAdapterFactory" 
+         </factory>
+         <factory
+            class="org.eclipse.jdt.internal.debug.ui.sourcelookup.WorkbenchAdapterFactory"
             adaptableType="org.eclipse.jdt.launching.sourcelookup.containers.ClasspathVariableSourceContainer">
             <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
-         </factory>                  
-         <factory 
-            class="org.eclipse.jdt.internal.debug.ui.sourcelookup.WorkbenchAdapterFactory" 
+         </factory>
+         <factory
+            class="org.eclipse.jdt.internal.debug.ui.sourcelookup.WorkbenchAdapterFactory"
             adaptableType="org.eclipse.jdt.launching.sourcelookup.containers.ClasspathContainerSourceContainer">
             <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
-         </factory>   
-  		<factory 
-            class="org.eclipse.jdt.internal.debug.ui.sourcelookup.SourceElementLabelProviderAdapterFactory" 
+         </factory>
+  		<factory
+            class="org.eclipse.jdt.internal.debug.ui.sourcelookup.SourceElementLabelProviderAdapterFactory"
             adaptableType="org.eclipse.jdt.core.IJavaElement">
             <adapter type="org.eclipse.debug.internal.ui.sourcelookup.SourceElementLabelProvider"/>
   		</factory>
-    
+
     <!-- Adapters for runtime classpath entries -->
-         <factory 
-            class="org.eclipse.jdt.internal.debug.ui.classpath.VariableClasspathEntryAdapterFactory" 
+         <factory
+            class="org.eclipse.jdt.internal.debug.ui.classpath.VariableClasspathEntryAdapterFactory"
             adaptableType="org.eclipse.jdt.internal.launching.VariableClasspathEntry">
             <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
-         </factory>  
-         
+         </factory>
+
      <!-- Adapters for contextual launch -->
-     	 <factory 
-            class="" 
+     	 <factory
+            class=""
             adaptableType="org.eclipse.jdt.core.IJavaElement">
             <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/>
          </factory>
-         <factory 
-            class="" 
+         <factory
+            class=""
             adaptableType="org.eclipse.core.resources.IResource">
             <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/>
          </factory>
-         <factory 
-            class="" 
+         <factory
+            class=""
             adaptableType="org.eclipse.jdt.internal.ui.javaeditor.IClassFileEditorInput">
             <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/>
-         </factory>   
-         
+         </factory>
+
      <!-- Adapters for retargettable actions -->
-     	  <factory 
-            class="org.eclipse.jdt.internal.debug.ui.actions.RetargettableActionAdapterFactory" 
+     	  <factory
+            class="org.eclipse.jdt.internal.debug.ui.actions.RetargettableActionAdapterFactory"
             adaptableType="org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor">
             <adapter type="org.eclipse.debug.ui.actions.IRunToLineTarget"/>
             <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
          </factory>
-         <factory 
-            class="org.eclipse.jdt.internal.debug.ui.actions.RetargettableActionAdapterFactory" 
+         <factory
+            class="org.eclipse.jdt.internal.debug.ui.actions.RetargettableActionAdapterFactory"
             adaptableType="org.eclipse.jdt.internal.ui.javaeditor.ClassFileEditor">
             <adapter type="org.eclipse.debug.ui.actions.IRunToLineTarget"/>
             <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
-         </factory>         
-         <factory 
-            class="org.eclipse.jdt.internal.debug.ui.actions.RetargettableActionAdapterFactory" 
+         </factory>
+         <factory
+            class="org.eclipse.jdt.internal.debug.ui.actions.RetargettableActionAdapterFactory"
             adaptableType="org.eclipse.jdt.core.IMethod">
             <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
-         </factory>         
-         <factory 
-            class="org.eclipse.jdt.internal.debug.ui.actions.RetargettableActionAdapterFactory" 
+         </factory>
+         <factory
+            class="org.eclipse.jdt.internal.debug.ui.actions.RetargettableActionAdapterFactory"
             adaptableType="org.eclipse.jdt.core.IField">
             <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
-         </factory>         
-         <factory 
-            class="org.eclipse.jdt.internal.debug.ui.actions.RetargettableActionAdapterFactory" 
+         </factory>
+         <factory
+            class="org.eclipse.jdt.internal.debug.ui.actions.RetargettableActionAdapterFactory"
             adaptableType="org.eclipse.jdt.debug.core.IJavaFieldVariable">
             <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
          </factory>
@@ -3277,9 +3277,9 @@
             <adapter
                   type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider">
             </adapter>
-         </factory>                            
-      </extension>     	   
-   
+         </factory>
+      </extension>
+
    <!-- Dynamic (String Substitution) Variables -->
    <extension
          point="org.eclipse.core.variables.dynamicVariables">
@@ -3293,8 +3293,8 @@
           name="java_extensions_regex"
           resolver="org.eclipse.jdt.internal.debug.ui.console.JavaLikeExtensionsResolver"
           supportsArgument="false"/>
-   </extension> 
-       
+   </extension>
+
 	<extension
          point="org.eclipse.ui.newWizards">
       <category
@@ -3304,7 +3304,7 @@
       </category>
       <wizard
             name="%NewJavaScrapbookPage.label"
-            icon="$nl$/icons/full/etool16/new_sbook.gif"
+            icon="$nl$/icons/full/etool16/new_sbook.png"
             category="org.eclipse.jdt.ui.java/org.eclipse.jdt.debug.ui.java"
             class="org.eclipse.jdt.internal.debug.ui.snippeteditor.NewSnippetFileCreationWizard"
             id="org.eclipse.jdt.debug.ui.snippetEditor.NewSnippetFileCreationWizard">
@@ -3313,7 +3313,7 @@
          </description>
       </wizard>
    </extension>
-   
+
    <extension
          id="org.eclipse.jdt.debug.ui.SnippetDocumentSetupParticipant"
          name="%snippetDocumentSetupParticipant.name"
@@ -3323,7 +3323,7 @@
             class="org.eclipse.jdt.internal.debug.ui.snippeteditor.SnippetDocumentSetupParticipant">
       </participant>
    </extension>
-   
+
    <!-- Scrapbook Source Lookup -->
    <extension point="org.eclipse.jdt.launching.classpathProviders">
        <classpathProvider
@@ -3331,11 +3331,11 @@
           class="org.eclipse.jdt.internal.debug.ui.snippeteditor.ScrapbookSourcepathProvider">
        </classpathProvider>
    </extension>
-   
+
    <!--Java Stack Trace Console-->
    <extension
          point="org.eclipse.ui.console.consoleFactories">
-      <consoleFactory 
+      <consoleFactory
             label="%javaStackTraceConsole.label"
             class="org.eclipse.jdt.debug.ui.console.JavaStackTraceConsoleFactory">
       </consoleFactory>
@@ -3384,7 +3384,7 @@
             </or>
          </enablement>
       </consolePatternMatchListener>
-   </extension>   
+   </extension>
    <extension
          point="org.eclipse.ui.console.consolePageParticipants">
       <consolePageParticipant
@@ -3398,7 +3398,7 @@
 	<extension point="org.eclipse.core.runtime.preferences">
 		<initializer class="org.eclipse.jdt.internal.debug.ui.JDIDebugUIPreferenceInitializer"/>
 	</extension>
-	
+
  <extension
        point="org.eclipse.ui.themes">
     <colorDefinition
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties
index 4b0bf61..9e68739 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties
@@ -17,7 +17,7 @@
 ImageDescriptorRegistry_Allocating_image_for_wrong_display_1=Allocating image for wrong display
 
 JavaDebugPreferencePage_description=General settings for Java Debugging.
-JavaDebugPreferencePage_Enable_hot_code_replace_1=Enable hot code replace
+JavaDebugPreferencePage_Enable_hot_code_replace_1=Enable hot co&de replace
 JavaDebugPreferencePage_Alert_me_when_hot_code_replace_fails_1=Show error when hot code replace &fails
 JavaDebugPreferencePage_Alert_me_when_hot_code_replace_is_not_supported_1=Show error when hot code replace is not &supported
 JavaDebugPreferencePage_Alert_me_when_obsolete_methods_remain_1=Show error when &obsolete methods remain after hot code replace
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDISourceViewer.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDISourceViewer.java
index 4a92484..9d6e4c6 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDISourceViewer.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDISourceViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
 
 
 import org.eclipse.jdt.internal.debug.ui.display.DisplayViewerConfiguration;
+import org.eclipse.jdt.ui.PreferenceConstants;
 import org.eclipse.jdt.ui.text.IJavaPartitions;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
@@ -94,10 +95,10 @@
 		IPreferenceStore store= getPreferenceStore();
 		if (store != null) {
 			FontData data= null;
-			if (store.contains(JFaceResources.TEXT_FONT) && !store.isDefault(JFaceResources.TEXT_FONT)) {
-				data= PreferenceConverter.getFontData(store, JFaceResources.TEXT_FONT);
+			if (store.contains(PreferenceConstants.EDITOR_TEXT_FONT) && !store.isDefault(PreferenceConstants.EDITOR_TEXT_FONT)) {
+				data= PreferenceConverter.getFontData(store, PreferenceConstants.EDITOR_TEXT_FONT);
 			} else {
-				data= PreferenceConverter.getDefaultFontData(store, JFaceResources.TEXT_FONT);
+				data = PreferenceConverter.getDefaultFontData(store, PreferenceConstants.EDITOR_TEXT_FONT);
 			}
 			if (data != null) {
 				Font font= new Font(getTextWidget().getDisplay(), data);
@@ -248,7 +249,7 @@
 		}
 		String property= event.getProperty();
 		
-		if (JFaceResources.TEXT_FONT.equals(property)) {
+		if (PreferenceConstants.EDITOR_TEXT_FONT.equals(property)) {
 			updateViewerFont();
 		}
 		if (AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND.equals(property) || AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND_SYSTEM_DEFAULT.equals(property) ||
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugImages.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugImages.java
index 9317aa7..d5648b4 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugImages.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugImages.java
@@ -26,80 +26,80 @@
 public class JavaDebugImages {
 
     private static String ICONS_PATH = "$nl$/icons/full/"; //$NON-NLS-1$
-	
+
 	// The plugin registry
 	private static ImageRegistry fgImageRegistry = null;
 
 	/*
 	 * Available cached Images in the Java debug plug-in image registry.
-	 */	
+	 */
 	public static final String IMG_OBJS_EXCEPTION= "IMG_OBJS_EXCEPTION";			//$NON-NLS-1$
 	public static final String IMG_OBJS_EXCEPTION_DISABLED= "IMG_OBJS_EXCEPTION_DISABLED";			//$NON-NLS-1$
-	public static final String IMG_OBJS_ERROR= "IMG_OBJS_ERROR";			//$NON-NLS-1$	
-	
+	public static final String IMG_OBJS_ERROR= "IMG_OBJS_ERROR";			//$NON-NLS-1$
+
 	public static final String IMG_OVR_BREAKPOINT_INSTALLED= "IMG_OBJS_BREAKPOINT_INSTALLED";	//$NON-NLS-1$
 	public static final String IMG_OVR_BREAKPOINT_INSTALLED_DISABLED= "IMG_OBJS_BREAKPOINT_INSTALLED_DISABLED";	//$NON-NLS-1$
-		
+
 	public static final String IMG_OBJS_LOCAL_VARIABLE = "IMG_OBJS_LOCAL_VARIABLE";	//$NON-NLS-1$
 	public static final String IMG_OBJS_METHOD_RESULT = "IMG_OBJS_METHOD_RESULT"; //$NON-NLS-1$
 	public static final String IMG_OBJS_METHOD_RESULT_DISABLED = "IMG_OBJS_METHOD_RESULT_DISABLED"; //$NON-NLS-1$
-	
+
 	public static final String IMG_OVR_METHOD_BREAKPOINT_ENTRY= "IMG_OBJS_METHOD_BREAKPOINT_ENTRY";	//$NON-NLS-1$
 	public static final String IMG_OVR_METHOD_BREAKPOINT_ENTRY_DISABLED= "IMG_OBJS_METHOD_BREAKPOINT_ENTRY_DISABLED";	//$NON-NLS-1$
 	public static final String IMG_OVR_METHOD_BREAKPOINT_EXIT= "IMG_OBJS_METHOD_BREAKPOINT_EXIT";	//$NON-NLS-1$
 	public static final String IMG_OVR_METHOD_BREAKPOINT_EXIT_DISABLED= "IMG_OBJS_METHOD_BREAKPOINT_EXIT_DISABLED";	//$NON-NLS-1$
-	
+
 	public static final String IMG_OVR_CONDITIONAL_BREAKPOINT= "IMG_OBJS_CONDITIONAL_BREAKPOINT";	//$NON-NLS-1$
 	public static final String IMG_OVR_CONDITIONAL_BREAKPOINT_DISABLED= "IMG_OBJS_CONDITIONAL_BREAKPOINT_DISABLED";	//$NON-NLS-1$
 
 	public static final String IMG_OVR_SCOPED_BREAKPOINT= "IMG_OBJS_SCOPED_BREAKPOINT";	//$NON-NLS-1$
 	public static final String IMG_OVR_SCOPED_BREAKPOINT_DISABLED= "IMG_OBJS_SCOPED_BREAKPOINT_DISABLED";	//$NON-NLS-1$
-	
+
 	public static final String IMG_OVR_UNCAUGHT_BREAKPOINT= "IMG_OBJS_UNCAUGHT_BREAKPOINT";	//$NON-NLS-1$
 	public static final String IMG_OVR_UNCAUGHT_BREAKPOINT_DISABLED= "IMG_OBJS_UNCAUGHT_BREAKPOINT_DISABLED";	//$NON-NLS-1$
-	
+
 	public static final String IMG_OVR_CAUGHT_BREAKPOINT= "IMG_OBJS_CAUGHT_BREAKPOINT";	//$NON-NLS-1$
 	public static final String IMG_OVR_CAUGHT_BREAKPOINT_DISABLED= "IMG_OBJS_CAUGHT_BREAKPOINT_DISABLED";	//$NON-NLS-1$
-	
+
 	public static final String IMG_OBJS_SNIPPET_EVALUATING= "IMG_OBJS_SNIPPET_EVALUATING";	//$NON-NLS-1$
-	
+
 	public static final String IMG_VIEW_ARGUMENTS_TAB= "IMG_VIEW_ARGUMENTS_TAB";  //$NON-NLS-1$
-	
+
 	public static final String IMG_OBJS_MONITOR = "IMG_OBJS_MONITOR";  //$NON-NLS-1$
 	public static final String IMG_OBJS_CONTENDED_MONITOR = "IMG_OBJS_CONTENDED_MONITOR";  //$NON-NLS-1$
 	public static final String IMG_OBJS_OWNED_MONITOR = "IMG_OBJS_OWNED_MONITOR";  //$NON-NLS-1$
-	
+
 	public static final String IMG_OBJS_REFERENCE = "IMG_OBJS_REFERENCE";  //$NON-NLS-1$
-	
+
 	public static final String IMG_OVR_OWNED = "IMG_OVR_OWNED";			//$NON-NLS-1$
 	public static final String IMG_OVR_OWNS_MONITOR = "IMG_OVR_OWNS_MONITOR";		//$NON-NLS-1$
 	public static final String IMG_OVR_IN_CONTENTION = "IMG_OVR_IN_CONTENTION";			//$NON-NLS-1$
 	public static final String IMG_OVR_IN_CONTENTION_FOR_MONITOR = "IMG_OVR_IN_CONTENTION_FOR_MONITOR";		//$NON-NLS-1$
 	public static final String IMG_OVR_IN_DEADLOCK = "IMG_OVR_IN_DEADLOCK"; //$NON-NLS-1$
-	
+
 	public static final String IMG_OBJS_EXCEPTION_BRKPT_TYPE = "IMG_OBJS_EXCEPTION_BRKPT_TYPE";  //$NON-NLS-1$
 	public static final String IMG_OBJS_LINE_BRKPT_TYPE = "IMG_OBJS_LINE_BRKPT_TYPE";  //$NON-NLS-1$
 	public static final String IMG_OBJS_CLASSLOAD_BRKPT_TYPE = "IMG_OBJS_CLASSLOAD_BRKPT_TYPE";  //$NON-NLS-1$
 	public static final String IMG_OBJS_WATCHPOINT_TYPE = "IMG_OBJS_WATCHPOINT_TYPE";  //$NON-NLS-1$
 	public static final String IMG_OBJS_JSP_BRKPT_TYPE = "IMG_OBJS_JSP_BRKPT_TYPE";  //$NON-NLS-1$
 	public static final String IMG_OBJS_METHOD_BRKPT_TYPE = "IMG_OBJS_METHOD_BRKPT_TYPE";  //$NON-NLS-1$
-	public static final String IMG_OBJS_THREAD_GROUP = "IMG_OBJS_THREAD_GROUP";  //$NON-NLS-1$	
-	
+	public static final String IMG_OBJS_THREAD_GROUP = "IMG_OBJS_THREAD_GROUP";  //$NON-NLS-1$
+
 	public static final String IMG_OBJS_CLASSPATH = "IMG_OBJS_CLASSPATH"; //$NON-NLS-1$
-	
+
 	public static final String IMG_OVR_OUT_OF_SYNCH = "IMG_OVR_OUT_OF_SYNCH"; //$NON-NLS-1$
 	public static final String IMG_OVR_MAY_BE_OUT_OF_SYNCH = "IMG_OVR_MAY_BE_OUT_OF_SYNCH"; //$NON-NLS-1$
 	public static final String IMG_OVR_SYNCHRONIZED = "IMG_OVR_SYNCHRONIZED"; //$NON-NLS-1$
-	
+
 	public static final String IMG_WIZBAN_NEWSCRAPPAGE = "IMG_WIZBAN_NEWSCRAPPAGE"; //$NON-NLS-1$
 	public static final String IMG_WIZBAN_LIBRARY = "IMG_WIZBAN_LIBRARY"; //$NON-NLS-1$
 	public static final String IMG_TOOL_TERMSNIPPET = "IMG_TOOL_TERMSNIPPET"; //$NON-NLS-1$
 	public static final String IMG_TOOL_TERMSNIPPET_HOVER = "IMG_TOOL_TERMSNIPPET_HOVER"; //$NON-NLS-1$
 	public static final String IMG_TOOL_TERMSNIPPET_DISABLED = "IMG_TOOL_TERMSNIPPET_DISABLED"; //$NON-NLS-1$
 	public static final String IMG_OBJ_JAVA_INSPECT_EXPRESSION = "IMG_OBJ_JAVA_INSPECT_EXPRESSION"; //$NON-NLS-1$
-    
+
     public static final String IMG_ELCL_AUTO_FORMAT = "IMG_ELCL_AUTO_FORMAT"; //$NON-NLS-1$
-    
+
     public static final String IMG_ELCL_ALL_REFERENCES = "IMG_ELCL_ALL_REFERENCES"; //$NON-NLS-1$
 
 	public static final String IMG_OVR_IN_TRIGGER_POINT = "IMG_OVR_IN_TRIGGER_POINT"; //$NON-NLS-1$
@@ -119,22 +119,22 @@
 
 	/**
 	 * Returns the image managed under the given key in this registry.
-	 * 
+	 *
 	 * @param key the image's key
 	 * @return the image managed under the given key
-	 */ 
+	 */
 	public static Image get(String key) {
 		return getImageRegistry().get(key);
 	}
-	
+
 	/**
 	 * Returns the <code>ImageDescriptor</code> identified by the given key,
 	 * or <code>null</code> if it does not exist.
 	 */
 	public static ImageDescriptor getImageDescriptor(String key) {
 		return getImageRegistry().getDescriptor(key);
-	}	
-	
+	}
+
 	/*
 	 * Helper method to access the image registry from the JDIDebugUIPlugin class.
 	 */
@@ -144,50 +144,50 @@
 		}
 		return fgImageRegistry;
 	}
-	
+
 	private static void initializeImageRegistry() {
 		fgImageRegistry= new ImageRegistry(JDIDebugUIPlugin.getStandardDisplay());
 		declareImages();
 	}
-	
+
 	private static void declareImages() {
 		declareRegistryImage(IMG_OBJS_EXCEPTION, T_OBJ + "jexception_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OBJS_EXCEPTION_DISABLED, T_OBJ + "jexceptiond_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OVR_BREAKPOINT_INSTALLED, T_OVR + "installed_ovr.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OVR_BREAKPOINT_INSTALLED_DISABLED, T_OVR + "installed_ovr_disabled.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OBJS_REFERENCE, T_OBJ + "reference_obj.gif"); //$NON-NLS-1$
-			
+
 		declareRegistryImage(IMG_OBJS_LOCAL_VARIABLE, T_OBJ + "localvariable_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OBJS_METHOD_RESULT, T_OBJ + "methodresult_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OBJS_METHOD_RESULT_DISABLED, T_OBJ + "methodresult_obj_disabled.png"); //$NON-NLS-1$
-		
+
 		declareRegistryImage(IMG_OVR_METHOD_BREAKPOINT_ENTRY, T_OVR + "entry_ovr.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OVR_METHOD_BREAKPOINT_ENTRY_DISABLED, T_OVR + "entry_ovr_disabled.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OVR_METHOD_BREAKPOINT_EXIT, T_OVR + "exit_ovr.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OVR_METHOD_BREAKPOINT_EXIT_DISABLED, T_OVR + "exit_ovr_disabled.png"); //$NON-NLS-1$
-		
+
 		declareRegistryImage(IMG_OVR_CONDITIONAL_BREAKPOINT, T_OVR + "conditional_ovr.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OVR_CONDITIONAL_BREAKPOINT_DISABLED, T_OVR + "conditional_ovr_disabled.png"); //$NON-NLS-1$
-		
+
 		declareRegistryImage(IMG_OVR_SCOPED_BREAKPOINT, T_OVR + "scoped_ovr.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OVR_SCOPED_BREAKPOINT_DISABLED, T_OVR + "scoped_ovr_disabled.png"); //$NON-NLS-1$
-		
+
 		declareRegistryImage(IMG_OVR_UNCAUGHT_BREAKPOINT, T_OVR + "uncaught_ovr.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OVR_UNCAUGHT_BREAKPOINT_DISABLED, T_OVR + "uncaught_ovr_disabled.png"); //$NON-NLS-1$
-		
+
 		declareRegistryImage(IMG_OVR_CAUGHT_BREAKPOINT, T_OVR + "caught_ovr.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OVR_CAUGHT_BREAKPOINT_DISABLED, T_OVR + "caught_ovr_disabled.png"); //$NON-NLS-1$
-		
+
 		declareRegistryImage(IMG_OBJS_ERROR, T_OBJ + "jrtexception_obj.png"); //$NON-NLS-1$
-		
+
 		declareRegistryImage(IMG_OBJS_SNIPPET_EVALUATING, T_OBJ + "jsbook_run_obj.png"); //$NON-NLS-1$
-		
+
 		declareRegistryImage(IMG_VIEW_ARGUMENTS_TAB, T_EVIEW + "variable_tab.png"); //$NON-NLS-1$
 
 		declareRegistryImage(IMG_OVR_OUT_OF_SYNCH, T_OVR + "error_co.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OVR_MAY_BE_OUT_OF_SYNCH, T_OVR + "warning_co.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OVR_SYNCHRONIZED, T_OVR + "sync_ovr.png"); //$NON-NLS-1$
-		
+
 		declareRegistryImage(IMG_OBJS_MONITOR, T_OBJ + "monitor_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OVR_OWNED, T_OVR + "owned_ovr.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OVR_OWNS_MONITOR, T_OVR + "ownsmonitor_ovr.png"); //$NON-NLS-1$
@@ -197,26 +197,26 @@
 		declareRegistryImage(IMG_OBJS_CONTENDED_MONITOR, T_OBJ + "contended_monitor_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OBJS_OWNED_MONITOR, T_OBJ + "owned_monitor_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OBJS_THREAD_GROUP, T_OBJ + "threadgroup_obj.png"); //$NON-NLS-1$
-				
+
 		declareRegistryImage(IMG_WIZBAN_NEWSCRAPPAGE, T_WIZBAN + "newsbook_wiz.png");		//$NON-NLS-1$
 		declareRegistryImage(IMG_WIZBAN_LIBRARY, T_WIZBAN + "library_wiz.png"); 	//$NON-NLS-1$
-				
+
 		declareRegistryImage(IMG_TOOL_TERMSNIPPET, T_ELCL + "term_sbook.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_TOOL_TERMSNIPPET_HOVER, T_ELCL + "term_sbook.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_TOOL_TERMSNIPPET_DISABLED, T_DLCL + "term_sbook.png"); //$NON-NLS-1$
-		
+
 		declareRegistryImage(IMG_OBJ_JAVA_INSPECT_EXPRESSION, T_OBJ + "insp_sbook.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OBJS_CLASSPATH, T_OBJ + "classpath_obj.png"); //$NON-NLS-1$
-		
-		declareRegistryImage(IMG_OBJS_EXCEPTION_BRKPT_TYPE, T_OBJ + "jexcept_obj.png"); //$NON-NLS-1$
+
+		declareRegistryImage(IMG_OBJS_EXCEPTION_BRKPT_TYPE, T_OBJ + "jexception_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OBJS_LINE_BRKPT_TYPE, T_OBJ + "jline_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OBJS_CLASSLOAD_BRKPT_TYPE, T_OBJ + "jload_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OBJS_METHOD_BRKPT_TYPE, T_OBJ + "jmeth_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OBJS_JSP_BRKPT_TYPE, T_OBJ + "jspbrkpt_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IMG_OBJS_WATCHPOINT_TYPE, T_OBJ + "jwatch_obj.png"); //$NON-NLS-1$
-        
+
 		declareRegistryImage(IMG_ELCL_AUTO_FORMAT, E_LCL + "autoform_menu.png"); //$NON-NLS-1$
-        
+
 		declareRegistryImage(IMG_ELCL_ALL_REFERENCES, E_LCL + "all_references.png"); //$NON-NLS-1$
 
 		declareRegistryImage(IMG_OVR_IN_TRIGGER_POINT, T_OVR + "trigger_ovr.png"); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectMessages.properties b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectMessages.properties
index a10c8bd..d09cc7d 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectMessages.properties
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/ConnectMessages.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2016 IBM Corporation and others.
+# Copyright (c) 2000, 2017 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -14,9 +14,9 @@
 PacketReceiveManager_Got_IOException_from_Virtual_Machine_2=Got IOException from Virtual Machine
 PacketSendManager_Got_IOException_from_Virtual_Machine_1=Got IOException from Virtual Machine
 SocketAttachingConnectorImpl_Machine_name_to_which_to_attach_for_VM_connections_1=Machine name to which to attach for VM connections
-SocketAttachingConnectorImpl_Host_2=Host:
+SocketAttachingConnectorImpl_Host_2=&Host:
 SocketAttachingConnectorImpl_Port_number_to_which_to_attach_for_VM_connections_3=Port number to which to attach for VM connections
-SocketAttachingConnectorImpl_Port_4=Port:
+SocketAttachingConnectorImpl_Port_4=Po&rt:
 SocketAttachingConnectorImpl_1=Connection Timeout
 SocketAttachingConnectorImpl_2=Connection Timeout:
 SocketAttachingConnectorImpl_Attaches_by_socket_to_other_VMs_5=Attaches by socket to other VMs
@@ -40,14 +40,14 @@
 SocketLaunchingConnectorImpl_Necessary_connection_argument_is_null_15=Necessary connection argument is null
 SocketLaunchingConnectorImpl_Connection_argument_is_not_a_number_16=Connection argument is not a number
 SocketListeningConnectorImpl_Port_number_at_which_to_listen_for_VM_connections_1=Port number at which to listen for VM connections
-SocketListeningConnectorImpl_Port_2=Port:
+SocketListeningConnectorImpl_Port_2=Po&rt:
 SocketListeningConnectorImpl_Timeout_before_accept_returns_3=Timeout before accept returns
 SocketListeningConnectorImpl_Timeout_4=Timeout:
 SocketListeningConnectorImpl_Accepts_socket_connections_initiated_by_other_VMs_5=Accepts socket connections initiated by other VMs
 SocketListeningConnectorImpl_Connection_argument_is_not_of_the_right_type_6=Connection argument is not of the right type
 SocketListeningConnectorImpl_Necessary_connection_argument_is_null_7=Necessary connection argument is null
 SocketListeningConnectorImpl_Connection_argument_is_not_a_number_8=Connection argument is not a number
-SocketListeningConnectorImpl_Limit=Connection limit:
+SocketListeningConnectorImpl_Limit=Connection &limit:
 SocketListeningConnectorImpl_Limit_incoming_connections=Limit incoming connections (0 = no limit)
 SocketListeningConnectorImpl_ListeningConnector_Socket_Port=ListeningConnector Socket Port=
 SocketRawLaunchingConnectorImpl_Raw_command_to_start_the_debugged_application_VM_1=Raw command to start the debugged application VM
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java
index ee90a07..94c2465 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2016 IBM Corporation and others.
+ * Copyright (c) 2009, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -23,6 +23,7 @@
 import org.eclipse.jdt.debug.core.IJavaBreakpointListener;
 import org.eclipse.jdt.debug.core.IJavaDebugTarget;
 import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
+import org.eclipse.jdt.debug.core.IJavaObject;
 import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
 import org.eclipse.jdt.debug.core.IJavaStackFrame;
 import org.eclipse.jdt.debug.core.IJavaThread;
@@ -33,6 +34,7 @@
 import org.eclipse.jdt.debug.eval.IEvaluationResult;
 import org.eclipse.jdt.internal.debug.core.JDIDebugPlugin;
 import org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget;
+import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
 import org.eclipse.jdt.internal.debug.core.model.JDIThread;
 import org.eclipse.jdt.internal.debug.core.model.JDIValue;
 
@@ -124,17 +126,23 @@
 							return DONT_SUSPEND;
 						}
 					}
-					if (value instanceof JDIValue) {
+					if ((value instanceof JDIValue) && !(value instanceof JDINullValue)) {
 						JDIValue jdiValue = (JDIValue)value;
-						// If return is void, don't suspend (no error dialog)
-						if (jdiValue.getJavaType().getName().equals("void")) //$NON-NLS-1$
+						// Suspend if return is Boolean(true) else don't suspend (no error dialog)
+						if (jdiValue.getJavaType().getName().equals("java.lang.Boolean")) {//$NON-NLS-1$
+							IJavaPrimitiveValue javaValue = (IJavaPrimitiveValue) ((IJavaObject) jdiValue).getField("value", false).getValue(); //$NON-NLS-1$
+							if (javaValue.getBooleanValue()) {
+								return SUSPEND;
+							}
 							return DONT_SUSPEND;
+						}
+						return DONT_SUSPEND;
 					}
 					IStatus status = new Status(
 							IStatus.ERROR,
 							JDIDebugPlugin.getUniqueIdentifier(),
 							MessageFormat.format(JDIDebugBreakpointMessages.ConditionalBreakpointHandler_1, value.getReferenceTypeName()));
-					// result was not boolean
+					// result was not JDIValue
 					fireConditionHasRuntimeErrors(fBreakpoint, new DebugException(status));
 					return SUSPEND;
 				} 
diff --git a/org.eclipse.jdt.launching/forceQualifierUpdate.txt b/org.eclipse.jdt.launching/forceQualifierUpdate.txt
new file mode 100644
index 0000000..be16b62
--- /dev/null
+++ b/org.eclipse.jdt.launching/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 509973 - Comparator errors in I20170105-0320