--- old/apps/toys/Hello/src/main/java/hello/dialog/dialogs/CommandLinksDialog.java	2015-11-15 16:22:19.889869395 +0200
+++ new/apps/toys/Hello/src/main/java/hello/dialog/dialogs/CommandLinksDialog.java	2015-11-15 16:22:18.817333358 +0200
@@ -28,7 +28,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javafx.scene.control.skin.AccordionSkin;
 import com.sun.javafx.scene.control.skin.resources.ControlResources;
 import hello.HelloAccordion;
 import javafx.beans.binding.DoubleBinding;
@@ -98,7 +97,7 @@
         setTitle(ControlResources.getString("Dialog.info.title"));
 
         // FIXME extract to CSS
-        dialogPane.setGraphic(new ImageView(new Image(AccordionSkin.class.getResource("modena/dialog-information.png").toExternalForm())));
+        dialogPane.setGraphic(new ImageView(new Image(HelloAccordion.class.getResource("dialog/dialog-information.png").toExternalForm())));
         dialogPane.getButtonTypes().addAll(links);
         
         dialogPane.contentProperty().addListener(o -> updateGrid());
--- old/apps/toys/Hello/src/main/java/hello/dialog/dialogs/ExceptionDialog.java	2015-11-15 16:22:24.744295562 +0200
+++ new/apps/toys/Hello/src/main/java/hello/dialog/dialogs/ExceptionDialog.java	2015-11-15 16:22:23.771809529 +0200
@@ -24,10 +24,10 @@
  */
 package hello.dialog.dialogs;
 
+import hello.HelloAccordion;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import javafx.scene.control.skin.AccordionSkin;
 import javafx.scene.Node;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
@@ -45,7 +45,7 @@
         final DialogPane dialogPane = getDialogPane();
         
         setTitle("Exception Details");
-        dialogPane.setGraphic(new ImageView(new Image(AccordionSkin.class.getResource("modena/dialog-error.png").toExternalForm())));
+        dialogPane.setGraphic(new ImageView(new Image(HelloAccordion.class.getResource("dialog/dialog-error.png").toExternalForm())));
         dialogPane.getButtonTypes().addAll(ButtonType.OK);
         dialogPane.setContentText(exception == null? "":  exception.getMessage());
         dialogPane.setExpandableContent(buildExceptionDetails(exception));
--- old/apps/toys/Hello/src/main/java/hello/dialog/dialogs/FontSelectorDialog.java	2015-11-15 16:22:29.126485712 +0200
+++ new/apps/toys/Hello/src/main/java/hello/dialog/dialogs/FontSelectorDialog.java	2015-11-15 16:22:28.153999678 +0200
@@ -24,6 +24,7 @@
  */
 package hello.dialog.dialogs;
 
+import hello.HelloAccordion;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -31,8 +32,6 @@
 import java.util.Set;
 import java.util.function.Predicate;
 
-import javafx.scene.control.skin.AccordionSkin;
-
 import javafx.application.Platform;
 import javafx.beans.binding.DoubleBinding;
 import javafx.beans.value.ChangeListener;
@@ -79,7 +78,7 @@
         dialogPane.setHeaderText("Select font");
 
         // FIXME extract to CSS
-        dialogPane.setGraphic(new ImageView(new Image(AccordionSkin.class.getResource("modena/dialog-confirm.png").toExternalForm())));
+        dialogPane.setGraphic(new ImageView(new Image(HelloAccordion.class.getResource("dialog/dialog-confirm.png").toExternalForm())));
         dialogPane.getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
         dialogPane.setContent(fontPanel);
     }
--- old/apps/toys/Hello/src/main/java/hello/dialog/wizard/Wizard.java	2015-11-15 16:22:34.068955882 +0200
+++ new/apps/toys/Hello/src/main/java/hello/dialog/wizard/Wizard.java	2015-11-15 16:22:32.940391842 +0200
@@ -24,12 +24,12 @@
  */
 package hello.dialog.wizard;
 
+import hello.HelloAccordion;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 import java.util.Stack;
 
-import javafx.scene.control.skin.AccordionSkin;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
@@ -400,7 +400,7 @@
         
         public WizardPane() {
             // TODO extract to CSS
-            setGraphic(new ImageView(new Image(AccordionSkin.class.getResource("modena/dialog-confirm.png").toExternalForm())));
+            setGraphic(new ImageView(new Image(HelloAccordion.class.getResource("dialog/dialog-confirm.png").toExternalForm())));
         }
 
         // TODO we want to change this to an event-based API eventually
Binary files /dev/null and new/apps/toys/Hello/src/main/java/hello/dialog/dialog-confirm.png differ
Binary files /dev/null and new/apps/toys/Hello/src/main/java/hello/dialog/dialog-error.png differ
Binary files /dev/null and new/apps/toys/Hello/src/main/java/hello/dialog/dialog-information.png differ