diff --git a/CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties b/CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties
index e8afc0023b69b2d683df2a7280c7121ed2f8213e..0073eb0f49567c15246d92e287601d7131b41da5 100644
--- a/CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties
+++ b/CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties
@@ -114,7 +114,8 @@ ZipEntryPicker.ioError=Unable to access file
 ZipEntryPicker.filesizeLbl=Filesize:
 ZipEntryPicker.validatedLbl=Validated:
 ZipEntryPicker.objectCountLbl=Object count:
-ZipEntryPicker.loadBtn=Load entry
+ZipEntryPicker.loadBtn=Load CityGML model
+ZipEntryPicker.decompressBtn=Unpack file
 ZipEntryPicker.cancelBtn=Cancel
 ZipEntryPicker.unknownValue=N/A
 ZipEntryPicker.yes=Yes
diff --git a/CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization_de.properties b/CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization_de.properties
index 887758d8a0f2fa9dec92e4a61ca647169a69560a..300ec5a0d36e71801245222d481cd4dc6e9d3edb 100644
--- a/CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization_de.properties
+++ b/CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization_de.properties
@@ -112,7 +112,8 @@ ZipEntryPicker.ioError=Dateizugriff fehlgeschlagen
 ZipEntryPicker.filesizeLbl=Dateigr\u00f6\u00DFe:
 ZipEntryPicker.validatedLbl=Validiert:
 ZipEntryPicker.objectCountLbl=Objektanzahl:
-ZipEntryPicker.loadBtn=Eintrag laden
+ZipEntryPicker.loadBtn=CityGML Modell laden
+ZipEntryPicker.decompressBtn=Datei entpacken
 ZipEntryPicker.cancelBtn=Abbruch
 ZipEntryPicker.unknownValue=Unbekannt
 ZipEntryPicker.yes=Ja
diff --git a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryPicker.java b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryPicker.java
index f305460d31536bfbd92e7f28f4ad93cdb6bda3c8..d94e67bed23463a6485094ae6cc75deef74e7298 100644
--- a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryPicker.java
+++ b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryPicker.java
@@ -15,7 +15,9 @@ import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
 import javafx.scene.control.TextField;
 import javafx.scene.control.TitledPane;
+import javafx.scene.control.Tooltip;
 import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.VBox;
@@ -66,8 +68,16 @@ public class ZipEntryPicker {
 
     @FXML
     private Button cancelBtn;
+
     @FXML
     private Button loadBtn;
+    @FXML
+    private ImageView loadImageView;
+
+    @FXML
+    private Button decompressBtn;
+    @FXML
+    private Button decompressImageView;
 
     @FXML
     private ListView<ZipEntryNode> entryList;
@@ -127,7 +137,8 @@ public class ZipEntryPicker {
         validatedValue.setText(unknownValueText);
         objectCountValue.setText(unknownValueText);
 
-        loadBtn.setText(Localization.getText("ZipEntryPicker.loadBtn"));
+        loadBtn.setTooltip(new Tooltip(Localization.getText("ZipEntryPicker.loadBtn")));
+        decompressBtn.setTooltip(new Tooltip(Localization.getText("ZipEntryPicker.decompressBtn")));
         cancelBtn.setText(Localization.getText("ZipEntryPicker.cancelBtn"));
     }