diff --git a/src/main/ui/buttons/BoxButton.java b/src/main/ui/buttons/BoxButton.java
index 4ae2ad3..f0abd39 100644
--- a/src/main/ui/buttons/BoxButton.java
+++ b/src/main/ui/buttons/BoxButton.java
@@ -7,6 +7,8 @@ import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.StackPane;
 
+import java.io.File;
+
 public class BoxButton extends StackPane {
 
     private ImageView imageView;
@@ -15,9 +17,9 @@ public class BoxButton extends StackPane {
     private boolean isVisible;
 
     //paths zijn relatief aan deze classpath
-    public BoxButton(String imagePath, String imageOnHoverPath) {
-        this.image = new Image(getClass().getResourceAsStream(imagePath));
-        this.imageOnHover = new Image(getClass().getResourceAsStream(imageOnHoverPath));
+    public BoxButton(String imageName, String imageOnHoverName) {
+        this.image = new Image(getClass().getResourceAsStream("files" + File.separator + imageName));
+        this.imageOnHover = new Image(getClass().getResourceAsStream("files" + File.separator + imageOnHoverName));
         this.imageView = new ImageView();
 
         setCursor(Cursor.DEFAULT);
diff --git a/src/main/ui/buttons/DeleteButton.java b/src/main/ui/buttons/DeleteButton.java
index 47ac9f9..2d91f52 100644
--- a/src/main/ui/buttons/DeleteButton.java
+++ b/src/main/ui/buttons/DeleteButton.java
@@ -1,5 +1,9 @@
 package main.ui.buttons;
 
+import org.omg.CORBA.Environment;
+
+import java.io.File;
+
 public class DeleteButton extends BoxButton {
 
     public DeleteButton() {
diff --git a/src/main/ui/buttons/ExitButton.java b/src/main/ui/buttons/ExitButton.java
new file mode 100644
index 0000000..faaccd8
--- /dev/null
+++ b/src/main/ui/buttons/ExitButton.java
@@ -0,0 +1,10 @@
+package main.ui.buttons;
+
+/**
+ * Created by Jonas on 26/09/18.
+ */
+public class ExitButton extends BoxButton {
+    public ExitButton() {
+        super("ButtonExit.png", "ButtonExitHover.png");
+    }
+}
diff --git a/src/main/ui/buttons/FireButton.java b/src/main/ui/buttons/FireButton.java
new file mode 100644
index 0000000..798dbb3
--- /dev/null
+++ b/src/main/ui/buttons/FireButton.java
@@ -0,0 +1,10 @@
+package main.ui.buttons;
+
+/**
+ * Created by Jonas on 26/09/18.
+ */
+public class FireButton extends BoxButton {
+    public FireButton() {
+        super("ButtonFire.png", "ButtonFireHover.png");
+    }
+}
diff --git a/src/main/ui/buttons/PauseResumeButton.java b/src/main/ui/buttons/PauseResumeButton.java
index 779a88e..d8ca648 100644
--- a/src/main/ui/buttons/PauseResumeButton.java
+++ b/src/main/ui/buttons/PauseResumeButton.java
@@ -8,6 +8,7 @@ import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.StackPane;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,10 +32,10 @@ public class PauseResumeButton extends StackPane{
     public PauseResumeButton(boolean isPaused) {
         this.isPaused[0] = isPaused;
 
-        this.imagePause = new Image(getClass().getResourceAsStream("ButtonPause.png"));
-        this.imagePauseOnHover = new Image(getClass().getResourceAsStream("ButtonPauseHover.png"));
-        this.imageResume = new Image(getClass().getResourceAsStream("ButtonResume.png"));
-        this.imageResumeOnHover = new Image(getClass().getResourceAsStream("ButtonResumeHover.png"));
+        this.imagePause = new Image(getClass().getResourceAsStream("files"+ File.separator+"ButtonPause.png"));
+        this.imagePauseOnHover = new Image(getClass().getResourceAsStream("files"+ File.separator+"ButtonPauseHover.png"));
+        this.imageResume = new Image(getClass().getResourceAsStream("files"+ File.separator+"ButtonResume.png"));
+        this.imageResumeOnHover = new Image(getClass().getResourceAsStream("files"+ File.separator+"ButtonResumeHover.png"));
         this.imageView = new ImageView();
 
         setCursor(Cursor.DEFAULT);
diff --git a/src/main/ui/buttons/ReloadButton.java b/src/main/ui/buttons/ReloadButton.java
new file mode 100644
index 0000000..e294fba
--- /dev/null
+++ b/src/main/ui/buttons/ReloadButton.java
@@ -0,0 +1,9 @@
+package main.ui.buttons;
+
+/**
+ * Created by Jonas on 26/09/18.
+ */
+public class ReloadButton extends BoxButton {
+    public ReloadButton() {
+        super("ButtonReload.png", "ButtonReloadHover.png");    }
+}
diff --git a/src/main/ui/buttons/ButtonDelete.png b/src/main/ui/buttons/files/ButtonDelete.png
similarity index 100%
rename from src/main/ui/buttons/ButtonDelete.png
rename to src/main/ui/buttons/files/ButtonDelete.png
diff --git a/src/main/ui/buttons/ButtonDeleteHover.png b/src/main/ui/buttons/files/ButtonDeleteHover.png
similarity index 100%
rename from src/main/ui/buttons/ButtonDeleteHover.png
rename to src/main/ui/buttons/files/ButtonDeleteHover.png
diff --git a/src/main/ui/buttons/ButtonEdit.png b/src/main/ui/buttons/files/ButtonEdit.png
similarity index 100%
rename from src/main/ui/buttons/ButtonEdit.png
rename to src/main/ui/buttons/files/ButtonEdit.png
diff --git a/src/main/ui/buttons/ButtonEditHover.png b/src/main/ui/buttons/files/ButtonEditHover.png
similarity index 100%
rename from src/main/ui/buttons/ButtonEditHover.png
rename to src/main/ui/buttons/files/ButtonEditHover.png
diff --git a/src/main/ui/buttons/files/ButtonExit.png b/src/main/ui/buttons/files/ButtonExit.png
new file mode 100644
index 0000000..4b92915
Binary files /dev/null and b/src/main/ui/buttons/files/ButtonExit.png differ
diff --git a/src/main/ui/buttons/files/ButtonExitHover.png b/src/main/ui/buttons/files/ButtonExitHover.png
new file mode 100644
index 0000000..49987cf
Binary files /dev/null and b/src/main/ui/buttons/files/ButtonExitHover.png differ
diff --git a/src/main/ui/buttons/files/ButtonFire.png b/src/main/ui/buttons/files/ButtonFire.png
new file mode 100644
index 0000000..90ee3fd
Binary files /dev/null and b/src/main/ui/buttons/files/ButtonFire.png differ
diff --git a/src/main/ui/buttons/files/ButtonFireHover.png b/src/main/ui/buttons/files/ButtonFireHover.png
new file mode 100644
index 0000000..8a14c82
Binary files /dev/null and b/src/main/ui/buttons/files/ButtonFireHover.png differ
diff --git a/src/main/ui/buttons/ButtonPause.png b/src/main/ui/buttons/files/ButtonPause.png
similarity index 100%
rename from src/main/ui/buttons/ButtonPause.png
rename to src/main/ui/buttons/files/ButtonPause.png
diff --git a/src/main/ui/buttons/ButtonPauseHover.png b/src/main/ui/buttons/files/ButtonPauseHover.png
similarity index 100%
rename from src/main/ui/buttons/ButtonPauseHover.png
rename to src/main/ui/buttons/files/ButtonPauseHover.png
diff --git a/src/main/ui/buttons/files/ButtonReload.png b/src/main/ui/buttons/files/ButtonReload.png
new file mode 100644
index 0000000..4440bc2
Binary files /dev/null and b/src/main/ui/buttons/files/ButtonReload.png differ
diff --git a/src/main/ui/buttons/files/ButtonReloadHover.png b/src/main/ui/buttons/files/ButtonReloadHover.png
new file mode 100644
index 0000000..365372d
Binary files /dev/null and b/src/main/ui/buttons/files/ButtonReloadHover.png differ
diff --git a/src/main/ui/buttons/ButtonResume.png b/src/main/ui/buttons/files/ButtonResume.png
similarity index 100%
rename from src/main/ui/buttons/ButtonResume.png
rename to src/main/ui/buttons/files/ButtonResume.png
diff --git a/src/main/ui/buttons/ButtonResumeHover.png b/src/main/ui/buttons/files/ButtonResumeHover.png
similarity index 100%
rename from src/main/ui/buttons/ButtonResumeHover.png
rename to src/main/ui/buttons/files/ButtonResumeHover.png
diff --git a/src/main/ui/extensions/ExtensionItemContainer.java b/src/main/ui/extensions/ExtensionItemContainer.java
index 6c1172f..0e15a53 100644
--- a/src/main/ui/extensions/ExtensionItemContainer.java
+++ b/src/main/ui/extensions/ExtensionItemContainer.java
@@ -2,17 +2,15 @@ package main.ui.extensions;
 
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
+import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.*;
 import javafx.scene.text.Font;
-import main.ui.buttons.SimpleClickButton;
+import main.ui.buttons.*;
 import main.ui.scheduler.ScheduleItem;
-import main.ui.buttons.DeleteButton;
-import main.ui.buttons.EditButton;
-import main.ui.buttons.PauseResumeButton;
 
 /**
  * Created by Jonas on 19/07/18.
@@ -66,22 +64,22 @@ public class ExtensionItemContainer extends GridPane {
 
 
 
-        DeleteButton deleteButton = new DeleteButton();
+        ExitButton exitButton = new ExitButton();
         Tooltip delete = new Tooltip("Close connection with this extension");
-        Tooltip.install(deleteButton,delete);
-        deleteButton.show();
-        deleteButton.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> item.isRemoveClickTrigger());
+        Tooltip.install(exitButton,delete);
+        exitButton.show();
+        exitButton.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> item.isRemoveClickTrigger());
         SimpleClickButton clickButton = new SimpleClickButton();
         clickButton.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> item.isClickTrigger());
 
-        HBox buttonsBox = new HBox(clickButton, deleteButton);
+        HBox buttonsBox = new HBox(clickButton, exitButton);
         if (item.isFireButtonUsed()) {
             clickButton.show();
         }
         else {
-            HBox.setMargin(deleteButton, new Insets(0,0,0,26));
+            HBox.setMargin(exitButton, new Insets(0,0,0,24));
         }
-        buttonsBox.setSpacing(item.isFireButtonUsed() ? 10 : 0);
+        buttonsBox.setSpacing(item.isFireButtonUsed() ? 8 : 0);
         buttonsBox.setAlignment(Pos.CENTER);
         GridPane.setMargin(buttonsBox, new Insets(0, 5, 0, 5));
         add(buttonsBox, 4, 0);