diff --git a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/MainToolBar.fxml b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/MainToolBar.fxml
index d2e0302e65f91eccc06277ad50d3b28aa5cef151..4cf90fff910acf63b9d70da64a989c2e594d990f 100644
--- a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/MainToolBar.fxml
+++ b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/MainToolBar.fxml
@@ -16,6 +16,13 @@
                   <ImageView fx:id="openImageView" fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true" />
                </graphic>
             </Button>
+            <Button id="loadBtn" fx:id="zipManagerBtn" disable="true" mnemonicParsing="false">
+               <graphic>
+                  <ImageView fx:id="zipManagerView" fitHeight="32.0" fitWidth="32.0" pickOnBounds="true"
+                             preserveRatio="true"/>
+               </graphic>
+            </Button>
+            <Separator layoutX="381.0" layoutY="10.0" orientation="VERTICAL"/>
             <Button fx:id="checkBtn" mnemonicParsing="false">
                <graphic>
                   <ImageView fx:id="checkImageView" fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true" />
@@ -26,6 +33,7 @@
                   <ImageView fx:id="reportImageView" disable="true" fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true" />
                </graphic>
             </Button>
+            <Separator layoutX="116.0" layoutY="10.0" orientation="VERTICAL"/>
             <ToggleButton fx:id="gridButton" disable="true" mnemonicParsing="false">
                <graphic>
                   <ImageView fx:id="gridImageView" fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true" />
@@ -78,12 +86,6 @@
       </HBox>
       <HBox fx:id="spacer" alignment="TOP_RIGHT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="5.0" HBox.hgrow="ALWAYS">
          <children>
-            <Button id="loadBtn" fx:id="zipManagerBtn" disable="true" mnemonicParsing="false">
-               <graphic>
-                  <ImageView fx:id="zipManagerView" fitHeight="32.0" fitWidth="32.0" pickOnBounds="true"
-                             preserveRatio="true"/>
-               </graphic>
-            </Button>
             <Separator orientation="VERTICAL"/>
             <Button id="loadBtn" fx:id="saveBtn" disable="true" mnemonicParsing="false">
                <graphic>
diff --git a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/ZipEntryManager.fxml b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/ZipEntryManager.fxml
index bacff771ab4f1df96592fdac5ed8d563828c8530..835c0024137d57b20757c044d81485b2cc37b952 100644
--- a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/ZipEntryManager.fxml
+++ b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/ZipEntryManager.fxml
@@ -21,26 +21,25 @@
                 <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
             </padding>
             <children>
-                <Button fx:id="decompressBtn" alignment="CENTER" layoutX="15.0" layoutY="15.0"
-                        maxWidth="1.7976931348623157E308" mnemonicParsing="false">
+                <Button fx:id="loadBtn" alignment="CENTER" maxWidth="1.7976931348623157E308" mnemonicParsing="false">
                     <font>
                         <Font size="14.0"/>
                     </font>
                     <graphic>
-                        <ImageView fx:id="decompressImageView" fitHeight="32.0" fitWidth="32.0" pickOnBounds="true"
+                        <ImageView fx:id="loadImageView" fitHeight="32.0" fitWidth="32.0" pickOnBounds="true"
                                    preserveRatio="true"/>
                     </graphic>
                 </Button>
-                <Button fx:id="loadBtn" alignment="CENTER" maxWidth="1.7976931348623157E308" mnemonicParsing="false">
+                <Button fx:id="decompressBtn" alignment="CENTER" layoutX="15.0" layoutY="15.0"
+                        maxWidth="1.7976931348623157E308" mnemonicParsing="false">
                     <font>
                         <Font size="14.0"/>
                     </font>
                     <graphic>
-                        <ImageView fx:id="loadImageView" fitHeight="32.0" fitWidth="32.0" pickOnBounds="true"
+                        <ImageView fx:id="decompressImageView" fitHeight="32.0" fitWidth="32.0" pickOnBounds="true"
                                    preserveRatio="true"/>
                     </graphic>
                 </Button>
-                <Separator orientation="VERTICAL" prefHeight="200.0"/>
                 <Button fx:id="decompressAllBtn" alignment="CENTER" layoutX="70.0" layoutY="15.0"
                         maxWidth="1.7976931348623157E308" mnemonicParsing="false">
                     <font>
@@ -51,6 +50,7 @@
                                    preserveRatio="true"/>
                     </graphic>
                 </Button>
+                <Separator orientation="VERTICAL" prefHeight="200.0"/>
             </children>
         </HBox>
         <HBox fillHeight="false" prefHeight="200.0" prefWidth="600.0" VBox.vgrow="ALWAYS">