diff --git a/src/main/java/gui/CharacterAnalysisTab.java b/src/main/java/gui/CharacterAnalysisTab.java
index 4567ba0..4e96fc1 100755
--- a/src/main/java/gui/CharacterAnalysisTab.java
+++ b/src/main/java/gui/CharacterAnalysisTab.java
@@ -5,6 +5,7 @@ import data.*;
 import javafx.application.HostServices;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
+import javafx.beans.binding.StringBinding;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -14,7 +15,7 @@ import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
-import javafx.scene.image.Image;
+//import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
@@ -66,25 +67,25 @@ public class CharacterAnalysisTab {
 	public Label minimalTaxonomyL;
 
 	@FXML
-	public Label stringLengthLH;
+	public ImageView stringLengthI;
 
 	@FXML
-	public Label calculateForLH;
+	public ImageView calculateForI;
 
 	@FXML
-	public Label displayTaxonomyLH;
+	public ImageView displayTaxonomyI;
 
 	@FXML
-	public Label msdLH;
+	public ImageView msdI;
 
 	@FXML
-	public Label taxonomyLH;
+	public ImageView taxonomyI;
 
 	@FXML
-	public Label minimalOccurrencesLH;
+	public ImageView minimalOccurrencesI;
 
 	@FXML
-	public Label minimalTaxonomyLH;
+	public ImageView minimalTaxonomyI;
 
 	@FXML
 	public Label solarFilters;
@@ -152,13 +153,6 @@ public class CharacterAnalysisTab {
 	@FXML
 	private Hyperlink helpH;
 
-	@FXML
-	private Image image;
-
-
-	@FXML
-	private ImageView imageView;
-
 	private enum MODE {
 		LETTER
 	}
@@ -505,6 +499,12 @@ public class CharacterAnalysisTab {
 //
 //	}
 
+	private void addTooltipToImage(ImageView image, StringBinding stringBinding){
+		Tooltip tooltip = new Tooltip();
+		tooltip.textProperty().bind(stringBinding);
+		Tooltip.install(image, tooltip);
+	}
+
 	private void manageTranslations(){
 		helpH.textProperty().bind(I18N.createStringBinding("hyperlink.help"));
 		changeLanguageB.textProperty().bind(I18N.createStringBinding("button.language"));
@@ -520,17 +520,13 @@ public class CharacterAnalysisTab {
 		minimalOccurrencesL.textProperty().bind(I18N.createStringBinding("label.minimalOccurrences"));
 		minimalTaxonomyL.textProperty().bind(I18N.createStringBinding("label.minimalTaxonomy"));
 
-		Tooltip tooltip = new Tooltip();
-		tooltip.textProperty().bind(I18N.createStringBinding("label.letter.stringLengthH"));
-//		new Tooltip(I18N.get("label.letter.stringLengthH"))
-		Tooltip.install(imageView, tooltip);
-		stringLengthLH.textProperty().bind(I18N.createStringBinding("label.letter.stringLengthH"));
-		calculateForLH.textProperty().bind(I18N.createStringBinding("label.letter.calculateForH"));
-		displayTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.letter.displayTaxonomyH"));
-		msdLH.textProperty().bind(I18N.createStringBinding("label.letter.msdH"));
-		taxonomyLH.textProperty().bind(I18N.createStringBinding("label.letter.taxonomyH"));
-		minimalOccurrencesLH.textProperty().bind(I18N.createStringBinding("label.letter.minimalOccurrencesH"));
-		minimalTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.letter.minimalTaxonomyH"));
+		addTooltipToImage(stringLengthI, I18N.createStringBinding("label.letter.stringLengthH"));
+		addTooltipToImage(calculateForI, I18N.createStringBinding("label.letter.calculateForH"));
+		addTooltipToImage(displayTaxonomyI, I18N.createStringBinding("label.letter.displayTaxonomyH"));
+		addTooltipToImage(msdI, I18N.createStringBinding("label.letter.msdH"));
+		addTooltipToImage(taxonomyI, I18N.createStringBinding("label.letter.taxonomyH"));
+		addTooltipToImage(minimalOccurrencesI, I18N.createStringBinding("label.letter.minimalOccurrencesH"));
+		addTooltipToImage(minimalTaxonomyI, I18N.createStringBinding("label.letter.minimalTaxonomyH"));
 
 		solarFilters.textProperty().bind(I18N.createStringBinding("label.solarFilters"));
 
diff --git a/src/main/java/gui/CorpusTab.java b/src/main/java/gui/CorpusTab.java
index f6d5128..9fd3d7f 100755
--- a/src/main/java/gui/CorpusTab.java
+++ b/src/main/java/gui/CorpusTab.java
@@ -5,13 +5,19 @@ import static gui.GUIController.*;
 import static gui.Messages.*;
 import static util.Util.*;
 
+import java.awt.*;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.util.*;
 
+import javafx.beans.binding.StringBinding;
 import javafx.collections.FXCollections;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.util.Duration;
 import org.apache.commons.io.FileUtils;
@@ -86,6 +92,21 @@ public class CorpusTab {
 	@FXML
 	public Label outputNameL;
 
+	@FXML
+	public ImageView chooseCorpusLocationI;
+
+	@FXML
+	public ImageView readHeaderInfoI;
+
+	@FXML
+	public ImageView chooseResultsLocationI;
+
+	@FXML
+	public ImageView selectReaderI;
+
+	@FXML
+	public ImageView outputNameI;
+
 	@FXML
 	public TextField outputNameTF;
 	public String outputName;
@@ -200,14 +221,14 @@ public class CorpusTab {
 
 		// add listeners
 		chooseCorpusLocationB.setOnAction(e -> chooseCorpusLocation());
-		chooseCorpusLocationB.setTooltip(new Tooltip(I18N.get("message.TOOLTIP_chooseCorpusLocationB")));
+//		chooseCorpusLocationB.setTooltip(new Tooltip(I18N.get("message.TOOLTIP_chooseCorpusLocationB")));
 		helpH.setOnAction(e -> openHelpWebsite());
 
 		readHeaderInfoChB.selectedProperty().addListener((observable, oldValue, newValue) -> {
 			readHeaderInfo = newValue;
 			logger.info("read headers: ", readHeaderInfo);
 		});
-		readHeaderInfoChB.setTooltip(new Tooltip(I18N.get("message.TOOLTIP_readHeaderInfoChB")));
+//		readHeaderInfoChB.setTooltip(new Tooltip(I18N.get("message.TOOLTIP_readHeaderInfoChB")));
 
 //		gosUseOrthChB.selectedProperty().addListener((observable, oldValue, newValue) -> {
 //			gosUseOrth = newValue;
@@ -257,6 +278,12 @@ public class CorpusTab {
 		togglePiAndSetCorpusWrapper(false);
 	}
 
+	private void addTooltipToImage(ImageView image, StringBinding stringBinding){
+		Tooltip tooltip = new Tooltip();
+		tooltip.textProperty().bind(stringBinding);
+		Tooltip.install(image, tooltip);
+	}
+
 	private void manageTranslations(){
 		chooseCorpusLocationB.textProperty().bind(I18N.createStringBinding("button.setCorpusLocation"));
 		chooseCorpusLocationL.textProperty().bind(I18N.createStringBinding("label.setCorpusLocation"));
@@ -271,6 +298,12 @@ public class CorpusTab {
 		readHeaderInfoL.textProperty().bind(I18N.createStringBinding("label.readHeaderInfo"));
 		selectReaderL.textProperty().bind(I18N.createStringBinding("label.selectReader"));
 		outputNameL.textProperty().bind(I18N.createStringBinding("label.outputName"));
+
+		addTooltipToImage(chooseCorpusLocationI, I18N.createStringBinding("label.corpusTab.chooseCorpusLocationH"));
+		addTooltipToImage(readHeaderInfoI, I18N.createStringBinding("label.corpusTab.readHeaderInfoH"));
+		addTooltipToImage(chooseResultsLocationI, I18N.createStringBinding("label.corpusTab.chooseResultsLocationH"));
+		addTooltipToImage(selectReaderI, I18N.createStringBinding("label.corpusTab.selectReaderH"));
+		addTooltipToImage(outputNameI, I18N.createStringBinding("label.corpusTab.outputNameH"));
 	}
 
 	private void togglePiAndSetCorpusWrapper(boolean piIsActive) {
diff --git a/src/main/java/gui/Messages.java b/src/main/java/gui/Messages.java
index a910dc7..edbec88 100755
--- a/src/main/java/gui/Messages.java
+++ b/src/main/java/gui/Messages.java
@@ -53,8 +53,8 @@ public class Messages {
 	public static String LABEL_SCANNING_SINGLE_FILE_CORPUS = I18N.get("message.LABEL_SCANNING_SINGLE_FILE_CORPUS");
 	public static String COMPLETED = I18N.get("message.COMPLETED");
 
-	public static String TOOLTIP_chooseCorpusLocationB = I18N.get("message.TOOLTIP_chooseCorpusLocationB");
-	public static String TOOLTIP_readHeaderInfoChB = I18N.get("message.TOOLTIP_readHeaderInfoChB");
+//	public static String TOOLTIP_chooseCorpusLocationB = I18N.get("message.TOOLTIP_chooseCorpusLocationB");
+//	public static String TOOLTIP_readHeaderInfoChB = I18N.get("message.TOOLTIP_readHeaderInfoChB");
 	public static String TOOLTIP_readNotePunctuationsChB = I18N.get("message.TOOLTIP_readNotePunctuationsChB");
 	public static String TOOLTIP_readDisplayTaxonomyChB = I18N.get("message.TOOLTIP_readDisplayTaxonomyChB");
 
diff --git a/src/main/java/gui/OneWordAnalysisTab.java b/src/main/java/gui/OneWordAnalysisTab.java
index 034059e..0f00ae2 100755
--- a/src/main/java/gui/OneWordAnalysisTab.java
+++ b/src/main/java/gui/OneWordAnalysisTab.java
@@ -5,6 +5,7 @@ import data.*;
 import javafx.application.HostServices;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
+import javafx.beans.binding.StringBinding;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -19,6 +20,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.controlsfx.control.CheckComboBox;
 
+import javafx.scene.image.ImageView;
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.*;
@@ -70,28 +72,28 @@ public class OneWordAnalysisTab {
     public Label minimalTaxonomyL;
 
     @FXML
-    public Label calculateForLH;
+    public ImageView calculateForI;
 
     @FXML
-    public Label alsoVisualizeLH;
+    public ImageView alsoVisualizeI;
 
     @FXML
-    public Label displayTaxonomyLH;
+    public ImageView displayTaxonomyI;
 
     @FXML
-    public Label writeMsdAtTheEndLH;
+    public ImageView writeMsdAtTheEndI;
 
     @FXML
-    public Label msdLH;
+    public ImageView msdI;
 
     @FXML
-    public Label taxonomyLH;
+    public ImageView taxonomyI;
 
     @FXML
-    public Label minimalOccurrencesLH;
+    public ImageView minimalOccurrencesI;
 
     @FXML
-    public Label minimalTaxonomyLH;
+    public ImageView minimalTaxonomyI;
 
     @FXML
     private TextField msdTF;
@@ -604,6 +606,12 @@ public class OneWordAnalysisTab {
 //        taxonomyCCB.getItems().addAll(taxonomyCCBValues);
 //
 //    }
+    private void addTooltipToImage(ImageView image, StringBinding stringBinding){
+        Tooltip tooltip = new Tooltip();
+        tooltip.textProperty().bind(stringBinding);
+        Tooltip.install(image, tooltip);
+    }
+
     private void manageTranslations(){
         helpH.textProperty().bind(I18N.createStringBinding("hyperlink.help"));
         changeLanguageB.textProperty().bind(I18N.createStringBinding("button.language"));
@@ -622,17 +630,15 @@ public class OneWordAnalysisTab {
         minimalTaxonomyL.textProperty().bind(I18N.createStringBinding("label.minimalTaxonomy"));
         solarFilters.textProperty().bind(I18N.createStringBinding("label.solarFilters"));
 
+        addTooltipToImage(calculateForI, I18N.createStringBinding("label.word.calculateForH"));
+        addTooltipToImage(alsoVisualizeI, I18N.createStringBinding("label.word.alsoVisualizeH"));
+        addTooltipToImage(displayTaxonomyI, I18N.createStringBinding("label.word.displayTaxonomyH"));
+        addTooltipToImage(writeMsdAtTheEndI, I18N.createStringBinding("label.word.writeMsdAtTheEndH"));
 
-        calculateForLH.textProperty().bind(I18N.createStringBinding("label.word.calculateForH"));
-        alsoVisualizeLH.textProperty().bind(I18N.createStringBinding("label.word.alsoVisualizeH"));
-        displayTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.word.displayTaxonomyH"));
-        writeMsdAtTheEndLH.textProperty().bind(I18N.createStringBinding("label.word.writeMsdAtTheEndH"));
-
-        msdLH.textProperty().bind(I18N.createStringBinding("label.word.msdH"));
-        taxonomyLH.textProperty().bind(I18N.createStringBinding("label.word.taxonomyH"));
-        minimalOccurrencesLH.textProperty().bind(I18N.createStringBinding("label.word.minimalOccurrencesH"));
-        minimalTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.word.minimalTaxonomyH"));
-
+        addTooltipToImage(msdI, I18N.createStringBinding("label.word.msdH"));
+        addTooltipToImage(taxonomyI, I18N.createStringBinding("label.word.taxonomyH"));
+        addTooltipToImage(minimalOccurrencesI, I18N.createStringBinding("label.word.minimalOccurrencesH"));
+        addTooltipToImage(minimalTaxonomyI, I18N.createStringBinding("label.word.minimalTaxonomyH"));
     }
 
     /**
diff --git a/src/main/java/gui/StringAnalysisTabNew2.java b/src/main/java/gui/StringAnalysisTabNew2.java
index 1153bae..df328d1 100755
--- a/src/main/java/gui/StringAnalysisTabNew2.java
+++ b/src/main/java/gui/StringAnalysisTabNew2.java
@@ -12,9 +12,11 @@ import alg.XML_processing;
 import javafx.application.HostServices;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
+import javafx.beans.binding.StringBinding;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -86,37 +88,37 @@ public class StringAnalysisTabNew2 {
     public Label collocabilityL;
 
     @FXML
-    public Label calculateForLH;
+    public ImageView calculateForI;
 
     @FXML
-    public Label alsoVisualizeLH;
+    public ImageView alsoVisualizeI;
 
     @FXML
-    public Label displayTaxonomyLH;
+    public ImageView displayTaxonomyI;
 
     @FXML
-    public Label msdLH;
+    public ImageView msdI;
 
     @FXML
-    public Label taxonomyLH;
+    public ImageView taxonomyI;
 
     @FXML
-    public Label minimalOccurrencesLH;
+    public ImageView minimalOccurrencesI;
 
     @FXML
-    public Label minimalTaxonomyLH;
+    public ImageView minimalTaxonomyI;
 
     @FXML
-    public Label skipValueLH;
+    public ImageView skipValueI;
 
     @FXML
-    public Label ngramValueLH;
+    public ImageView ngramValueI;
 
     @FXML
-    public Label notePunctuationsLH;
+    public ImageView notePunctuationsI;
 
     @FXML
-    public Label collocabilityLH;
+    public ImageView collocabilityI;
 
     @FXML
     private TextField msdTF;
@@ -756,6 +758,11 @@ public class StringAnalysisTabNew2 {
 //        taxonomyCCB.getItems().addAll(taxonomyCCBValues);
 //
 //    }
+    private void addTooltipToImage(ImageView image, StringBinding stringBinding){
+        Tooltip tooltip = new Tooltip();
+        tooltip.textProperty().bind(stringBinding);
+        Tooltip.install(image, tooltip);
+    }
 
     private void manageTranslations(){
         helpH.textProperty().bind(I18N.createStringBinding("hyperlink.help"));
@@ -781,19 +788,18 @@ public class StringAnalysisTabNew2 {
         minimalTaxonomyL.textProperty().bind(I18N.createStringBinding("label.minimalTaxonomy"));
         solarFilters.textProperty().bind(I18N.createStringBinding("label.solarFilters"));
 
-        calculateForLH.textProperty().bind(I18N.createStringBinding("label.wordSet.calculateForH"));
-        alsoVisualizeLH.textProperty().bind(I18N.createStringBinding("label.wordSet.alsoVisualizeH"));
-        displayTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.wordSet.displayTaxonomyH"));
-        skipValueLH.textProperty().bind(I18N.createStringBinding("label.wordSet.skipValueH"));
-        ngramValueLH.textProperty().bind(I18N.createStringBinding("label.wordSet.ngramValueH"));
-        notePunctuationsLH.textProperty().bind(I18N.createStringBinding("label.wordSet.notePunctuationsH"));
-        collocabilityLH.textProperty().bind(I18N.createStringBinding("label.wordSet.collocabilityH"));
-
-        msdLH.textProperty().bind(I18N.createStringBinding("label.wordSet.msdH"));
-        taxonomyLH.textProperty().bind(I18N.createStringBinding("label.wordSet.taxonomyH"));
-        minimalOccurrencesLH.textProperty().bind(I18N.createStringBinding("label.wordSet.minimalOccurrencesH"));
-        minimalTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.wordSet.minimalTaxonomyH"));
-
+        addTooltipToImage(calculateForI, I18N.createStringBinding("label.wordSet.calculateForH"));
+        addTooltipToImage(alsoVisualizeI, I18N.createStringBinding("label.wordSet.alsoVisualizeH"));
+        addTooltipToImage(displayTaxonomyI, I18N.createStringBinding("label.wordSet.displayTaxonomyH"));
+        addTooltipToImage(skipValueI, I18N.createStringBinding("label.wordSet.skipValueH"));
+        addTooltipToImage(ngramValueI, I18N.createStringBinding("label.wordSet.ngramValueH"));
+        addTooltipToImage(notePunctuationsI, I18N.createStringBinding("label.wordSet.notePunctuationsH"));
+        addTooltipToImage(collocabilityI, I18N.createStringBinding("label.wordSet.collocabilityH"));
+
+        addTooltipToImage(msdI, I18N.createStringBinding("label.wordSet.msdH"));
+        addTooltipToImage(taxonomyI, I18N.createStringBinding("label.wordSet.taxonomyH"));
+        addTooltipToImage(minimalOccurrencesI, I18N.createStringBinding("label.wordSet.minimalOccurrencesH"));
+        addTooltipToImage(minimalTaxonomyI, I18N.createStringBinding("label.wordSet.minimalTaxonomyH"));
     }
 
     /**
diff --git a/src/main/java/gui/WordLevelTab.java b/src/main/java/gui/WordLevelTab.java
index 820d16e..4e2aeb8 100755
--- a/src/main/java/gui/WordLevelTab.java
+++ b/src/main/java/gui/WordLevelTab.java
@@ -5,6 +5,7 @@ import data.*;
 import javafx.application.HostServices;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
+import javafx.beans.binding.StringBinding;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -13,6 +14,7 @@ import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -85,37 +87,37 @@ public class WordLevelTab {
 
 
 	@FXML
-	public Label calculateForLH;
+	public ImageView calculateForI;
 
 	@FXML
-	public Label alsoVisualizeLH;
+	public ImageView alsoVisualizeI;
 
 	@FXML
-	public Label displayTaxonomyLH;
+	public ImageView displayTaxonomyI;
 
 	@FXML
-	public Label prefixLengthLH;
+	public ImageView prefixLengthI;
 
 	@FXML
-	public Label suffixLengthLH;
+	public ImageView suffixLengthI;
 
 	@FXML
-	public Label prefixListLH;
+	public ImageView prefixListI;
 
 	@FXML
-	public Label suffixListLH;
+	public ImageView suffixListI;
 
 	@FXML
-	public Label msdLH;
+	public ImageView msdI;
 
 	@FXML
-	public Label taxonomyLH;
+	public ImageView taxonomyI;
 
 	@FXML
-	public Label minimalOccurrencesLH;
+	public ImageView minimalOccurrencesI;
 
 	@FXML
-	public Label minimalTaxonomyLH;
+	public ImageView minimalTaxonomyI;
 
 	@FXML
 	private TextField msdTF;
@@ -735,6 +737,12 @@ public class WordLevelTab {
 //
 //	}
 
+	private void addTooltipToImage(ImageView image, StringBinding stringBinding){
+		Tooltip tooltip = new Tooltip();
+		tooltip.textProperty().bind(stringBinding);
+		Tooltip.install(image, tooltip);
+	}
+
 	private void manageTranslations(){
 		helpH.textProperty().bind(I18N.createStringBinding("hyperlink.help"));
 		changeLanguageB.textProperty().bind(I18N.createStringBinding("button.language"));
@@ -759,20 +767,19 @@ public class WordLevelTab {
 		minimalTaxonomyL.textProperty().bind(I18N.createStringBinding("label.minimalTaxonomy"));
 		solarFilters.textProperty().bind(I18N.createStringBinding("label.solarFilters"));
 
-		calculateForLH.textProperty().bind(I18N.createStringBinding("label.wordPart.calculateForH"));
-		alsoVisualizeLH.textProperty().bind(I18N.createStringBinding("label.wordPart.alsoVisualizeH"));
-		displayTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.wordPart.displayTaxonomyH"));
-
-		prefixLengthLH.textProperty().bind(I18N.createStringBinding("label.wordPart.prefixLengthH"));
-		suffixLengthLH.textProperty().bind(I18N.createStringBinding("label.wordPart.suffixLengthH"));
-		prefixListLH.textProperty().bind(I18N.createStringBinding("label.wordPart.prefixListH"));
-		suffixListLH.textProperty().bind(I18N.createStringBinding("label.wordPart.suffixListH"));
+		addTooltipToImage(calculateForI, I18N.createStringBinding("label.wordPart.calculateForH"));
+		addTooltipToImage(alsoVisualizeI, I18N.createStringBinding("label.wordPart.alsoVisualizeH"));
+		addTooltipToImage(displayTaxonomyI, I18N.createStringBinding("label.wordPart.displayTaxonomyH"));
 
-		msdLH.textProperty().bind(I18N.createStringBinding("label.wordPart.msdH"));
-		taxonomyLH.textProperty().bind(I18N.createStringBinding("label.wordPart.taxonomyH"));
-		minimalOccurrencesLH.textProperty().bind(I18N.createStringBinding("label.wordPart.minimalOccurrencesH"));
-		minimalTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.wordPart.minimalTaxonomyH"));
+		addTooltipToImage(prefixLengthI, I18N.createStringBinding("label.wordPart.prefixLengthH"));
+		addTooltipToImage(suffixLengthI, I18N.createStringBinding("label.wordPart.suffixLengthH"));
+		addTooltipToImage(prefixListI, I18N.createStringBinding("label.wordPart.prefixListH"));
+		addTooltipToImage(suffixListI, I18N.createStringBinding("label.wordPart.suffixListH"));
 
+		addTooltipToImage(msdI, I18N.createStringBinding("label.wordPart.msdH"));
+		addTooltipToImage(taxonomyI, I18N.createStringBinding("label.wordPart.taxonomyH"));
+		addTooltipToImage(minimalOccurrencesI, I18N.createStringBinding("label.wordPart.minimalOccurrencesH"));
+		addTooltipToImage(minimalTaxonomyI, I18N.createStringBinding("label.wordPart.minimalTaxonomyH"));
 	}
 
 	/**
diff --git a/src/main/resources/gui/CharacterAnalysisTab.fxml b/src/main/resources/gui/CharacterAnalysisTab.fxml
index 979dd9d..b5fadea 100755
--- a/src/main/resources/gui/CharacterAnalysisTab.fxml
+++ b/src/main/resources/gui/CharacterAnalysisTab.fxml
@@ -23,40 +23,22 @@
     <Pane>
         <Label fx:id="stringLengthL" layoutX="10.0" layoutY="20.0" prefHeight="25.0" text="Število črk" />
         <TextField fx:id="stringLengthTF" layoutX="225.0" layoutY="20.0" prefWidth="140.0" />
-        <Label fx:id="stringLengthLH" layoutX="10.0" layoutY="50.0" prefHeight="10.0" text="Dolžina črkovnih nizov" styleClass="help"/>
-
-        <ImageView fx:id="imageView" layoutX="370.0" layoutY="27.5" pickOnBounds="true" preserveRatio="true">
-            <image>
-                <Image fx:id="image" url="questionmark.png" backgroundLoading="true"/>
-            </image>
+        <ImageView fx:id="stringLengthI" layoutX="370.0" layoutY="27.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
         </ImageView>
 
         <Label fx:id="calculateForL" layoutX="10.0" layoutY="60.0" prefHeight="25.0" text="Izračunaj za"/>
         <ComboBox fx:id="calculateForCB" layoutX="225.0" layoutY="60.0" minWidth="140.0" prefWidth="140.0"
-                  visibleRowCount="5">
-            <!--<items>-->
-                <!--<FXCollections fx:factory="observableArrayList">-->
-                    <!--<String fx:value="lema"/>-->
-                    <!--<String fx:value="različnica"/>-->
-                <!--</FXCollections>-->
-            <!--</items>-->
-        </ComboBox>
-        <Label fx:id="calculateForLH" layoutX="10.0" layoutY="90.0" prefHeight="10.0" styleClass="help"/>
-
-        <!--<HBox layoutX="10.0" layoutY="60.0">-->
-            <!--<children>-->
-                <!--<RadioButton fx:id="lemmaRB" mnemonicParsing="false" prefHeight="25.0" prefWidth="86.0" selected="true" text="lema">-->
-                    <!--<toggleGroup>-->
-                        <!--<ToggleGroup fx:id="calculateForRB" />-->
-                    <!--</toggleGroup></RadioButton>-->
-                <!--<RadioButton fx:id="varietyRB" mnemonicParsing="false" text="različnica" toggleGroup="$calculateForRB" />-->
-            <!--</children>-->
-        <!--</HBox>-->
+                  visibleRowCount="5"/>
+        <ImageView fx:id="calculateForI" layoutX="370.0" layoutY="67.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="displayTaxonomyL" layoutX="10.0" layoutY="100.0" prefHeight="25.0" text="Izpiši taksonomije" />
         <CheckBox fx:id="displayTaxonomyChB" layoutX="283.0" layoutY="105.0" selected="false" />
-        <Label fx:id="displayTaxonomyLH" layoutX="10.0" layoutY="130.0" prefHeight="10.0" styleClass="help"/>
-
+        <ImageView fx:id="displayTaxonomyI" layoutX="370.0" layoutY="107.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
         <!--<Label layoutX="10.0" layoutY="160.0" prefHeight="25.0" text="Omejitev podatkov" />-->
         <!--<Label layoutX="10.0" layoutY="200.0" prefHeight="25.0" text="Oznaka MSD" />-->
         <!--<TextField fx:id="msdTF" layoutX="185.0" layoutY="200.0" prefWidth="180.0" />-->
@@ -84,27 +66,34 @@
 
         <Label fx:id="msdL" layoutX="10.0" layoutY="100.0" prefHeight="25.0" text="Oznaka MSD"/>
         <TextField fx:id="msdTF" layoutX="225.0" layoutY="100.0" prefWidth="140.0"/>
-        <Label fx:id="msdLH" layoutX="10.0" layoutY="130.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="msdI" layoutX="370.0" layoutY="107.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
+
         <Label fx:id="taxonomyL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Taksonomija"/>
         <CheckComboBox fx:id="taxonomyCCB" layoutX="225.0" layoutY="140.0" prefHeight="25.0" prefWidth="140.0"/>
         <Label fx:id="taxonomyLH" layoutX="10.0" layoutY="170.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="taxonomyI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="minimalOccurrencesL" layoutX="10.0" layoutY="180.0" prefHeight="25.0" text="Min. št. pojavitev" />
         <TextField fx:id="minimalOccurrencesTF" layoutX="225.0" layoutY="180.0" prefWidth="140.0" />
-        <Label fx:id="minimalOccurrencesLH" layoutX="10.0" layoutY="210.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="minimalOccurrencesI" layoutX="370.0" layoutY="187.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="minimalTaxonomyL" layoutX="10.0" layoutY="220.0" prefHeight="25.0" text="Min. št. taksonomij" />
         <TextField fx:id="minimalTaxonomyTF" layoutX="225.0" layoutY="220.0" prefWidth="140.0" />
-        <Label fx:id="minimalTaxonomyLH" layoutX="10.0" layoutY="250.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="minimalTaxonomyI" layoutX="370.0" layoutY="227.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
 
         <Label fx:id="solarFilters" layoutX="10.0" layoutY="280.0" text="Izbrani filtri:" />
         <TextArea fx:id="selectedFiltersTextArea" layoutX="10.0" layoutY="320.0" prefHeight="80.0" maxHeight="80.0" prefWidth="360.0" text=" " wrapText="true" editable="false"/>
     </Pane>
 
-    <!--<Label fx:id="solarFilters" layoutX="510.0" layoutY="20.0" text="Izbrani filtri:" />-->
-    <!--<Label fx:id="selectedFiltersLabel" alignment="TOP_LEFT" layoutX="510.0" layoutY="45.0" prefHeight="540.0" prefWidth="275.0" text=" " wrapText="true" />-->
-
     <Hyperlink fx:id="helpH" alignment="TOP_LEFT" layoutX="710.0" layoutY="16.0" text="Pomoč" />
     <Button fx:id="changeLanguageB" layoutX="710.0" layoutY="40.0" mnemonicParsing="false" prefWidth="50.0"/>
 
diff --git a/src/main/resources/gui/CorpusTab.fxml b/src/main/resources/gui/CorpusTab.fxml
index 7da44c5..6417578 100755
--- a/src/main/resources/gui/CorpusTab.fxml
+++ b/src/main/resources/gui/CorpusTab.fxml
@@ -10,6 +10,8 @@
 
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
 <AnchorPane fx:id="corpusTabPane" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1"
             fx:controller="gui.CorpusTab">
     <children>
@@ -17,6 +19,10 @@
         <!--<TextField fx:id="stringLengthTF" layoutX="225.0" layoutY="20.0" prefWidth="140.0" />-->
         <Label fx:id="chooseCorpusLocationL" layoutX="10.0" layoutY="20.0" prefHeight="25.0" text="Nastavi lokacijo korpusa" />
         <Button fx:id="chooseCorpusLocationB" layoutX="225.0" layoutY="20.0" prefWidth="140.0" mnemonicParsing="false"/>
+        <ImageView fx:id="chooseCorpusLocationI" layoutX="370.0" layoutY="27.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
+
         <Pane fx:id="setCorpusWrapperP" layoutX="10.0" layoutY="60.0" prefHeight="118.0" prefWidth="683.0">
             <children>
                 <Label fx:id="chooseCorpusL" prefHeight="70.0" prefWidth="704.0" text="Label"/>
@@ -27,17 +33,29 @@
 
         <Label fx:id="readHeaderInfoL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Preberi info iz headerjev" />
         <CheckBox fx:id="readHeaderInfoChB" layoutX="283.0" layoutY="140.0" mnemonicParsing="false"/>
+        <ImageView fx:id="readHeaderInfoI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="chooseResultsLocationL" layoutX="10.0" layoutY="180.0" prefHeight="25.0" text="Nastavi lokacijo rezultatov" />
         <Button fx:id="chooseResultsLocationB" layoutX="225.0" layoutY="180.0" prefWidth="140.0" mnemonicParsing="false"/>
+        <ImageView fx:id="chooseResultsLocationI" layoutX="370.0" layoutY="187.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
         <Label fx:id="chooseResultsL" layoutX="10.0" layoutY="220.0" text="Label"/>
 
         <Label fx:id="selectReaderL" layoutX="10.0" layoutY="260.0" prefHeight="25.0" text="Izberi bralnik"/>
         <ComboBox fx:id="selectReaderCB" layoutX="225.0" layoutY="260.0" minWidth="140.0" prefWidth="140.0"
                   visibleRowCount="5"/>
+        <ImageView fx:id="selectReaderI" layoutX="370.0" layoutY="267.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="outputNameL" layoutX="10.0" layoutY="300.0" prefHeight="25.0" text="Ime izhodne datoteke" />
         <TextField fx:id="outputNameTF" layoutX="225.0" layoutY="300.0" prefWidth="140.0" />
+        <ImageView fx:id="outputNameI" layoutX="370.0" layoutY="307.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Hyperlink fx:id="helpH" alignment="TOP_LEFT" layoutX="710.0" layoutY="16.0"/>
         <Button fx:id="changeLanguageB" layoutX="710.0" layoutY="40.0" mnemonicParsing="false" prefWidth="50.0"/>
diff --git a/src/main/resources/gui/OneWordAnalysisTab.fxml b/src/main/resources/gui/OneWordAnalysisTab.fxml
index 2bc4780..f67538d 100755
--- a/src/main/resources/gui/OneWordAnalysisTab.fxml
+++ b/src/main/resources/gui/OneWordAnalysisTab.fxml
@@ -14,6 +14,8 @@
 <?import org.controlsfx.control.CheckComboBox?>
 
 <?import javafx.scene.control.TextArea?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
 <AnchorPane fx:id="oneWordAnalysisTabPane" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.111"
             xmlns:fx="http://javafx.com/fxml/1" fx:controller="gui.OneWordAnalysisTab">
     <Pane>
@@ -30,34 +32,27 @@
                 </FXCollections>
             </items>
         </ComboBox>
-        <Label fx:id="calculateForLH" layoutX="10.0" layoutY="50.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="calculateForI" layoutX="370.0" layoutY="27.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="alsoVisualizeL" layoutX="10.0" layoutY="60.0" prefHeight="25.0" text="Upoštevaj tudi" />
         <CheckComboBox fx:id="alsoVisualizeCCB" layoutX="225.0" layoutY="60.0" prefHeight="25.0" prefWidth="140.0"/>
-        <Label fx:id="alsoVisualizeLH" layoutX="10.0" layoutY="90.0" prefHeight="10.0" styleClass="help"/>
-
+        <ImageView fx:id="alsoVisualizeI" layoutX="370.0" layoutY="67.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="displayTaxonomyL" layoutX="10.0" layoutY="100.0" prefHeight="25.0" text="Izpiši taksonomije" />
         <CheckBox fx:id="displayTaxonomyChB" layoutX="283.0" layoutY="105.0" selected="false" />
-        <Label fx:id="displayTaxonomyLH" layoutX="10.0" layoutY="130.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="displayTaxonomyI" layoutX="370.0" layoutY="107.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="writeMsdAtTheEndL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Izpiši razbit MSD" />
         <CheckBox fx:id="writeMsdAtTheEndChB" layoutX="283.0" layoutY="145.0" selected="false" />
-        <Label fx:id="writeMsdAtTheEndLH" layoutX="10.0" layoutY="170.0" prefHeight="10.0" styleClass="help"/>
-
-        <!-- MSD and Taxonomy separated -->
-        <!--<Label layoutX="10.0" layoutY="200.0" prefHeight="25.0" text="Omejitev podatkov" />-->
-
-        <!--<Label layoutX="10.0" layoutY="240.0" prefHeight="25.0" text="Oznaka MSD"/>-->
-        <!--<TextField fx:id="msdTF" layoutX="185.0" layoutY="240.0" prefWidth="180.0"/>-->
-        <!--<Label layoutX="10.0" layoutY="280.0" prefHeight="25.0" text="Taksonomija"/>-->
-        <!--<CheckComboBox fx:id="taxonomyCCB" layoutX="185.0" layoutY="280.0" prefHeight="25.0" prefWidth="180.0"/>-->
-
-        <!--<Label layoutX="10.0" layoutY="320.0" prefHeight="25.0" text="Min. št. pojavitev" />-->
-        <!--<TextField fx:id="minimalOccurrencesTF" layoutX="185.0" layoutY="320.0" prefWidth="180.0" />-->
-
-        <!--<Label layoutX="10.0" layoutY="360.0" prefHeight="25.0" text="Min. št. taksonomij" />-->
-        <!--<TextField fx:id="minimalTaxonomyTF" layoutX="185.0" layoutY="360.0" prefWidth="180.0" />-->
+        <ImageView fx:id="writeMsdAtTheEndI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Button fx:id="computeNgramsB" layoutX="10.0" layoutY="440.0" mnemonicParsing="false"
                 prefHeight="25.0" prefWidth="250.0" text="Izračunaj"/>
@@ -69,18 +64,28 @@
 
         <Label fx:id="msdL" layoutX="10.0" layoutY="100.0" prefHeight="25.0" text="Oznaka MSD"/>
         <TextField fx:id="msdTF" layoutX="225.0" layoutY="100.0" prefWidth="140.0"/>
-        <Label fx:id="msdLH" layoutX="10.0" layoutY="130.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="msdI" layoutX="370.0" layoutY="107.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
+
         <Label fx:id="taxonomyL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Taksonomija"/>
         <CheckComboBox fx:id="taxonomyCCB" layoutX="225.0" layoutY="140.0" prefHeight="25.0" prefWidth="140.0"/>
         <Label fx:id="taxonomyLH" layoutX="10.0" layoutY="170.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="taxonomyI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="minimalOccurrencesL" layoutX="10.0" layoutY="180.0" prefHeight="25.0" text="Min. št. pojavitev" />
         <TextField fx:id="minimalOccurrencesTF" layoutX="225.0" layoutY="180.0" prefWidth="140.0" />
-        <Label fx:id="minimalOccurrencesLH" layoutX="10.0" layoutY="210.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="minimalOccurrencesI" layoutX="370.0" layoutY="187.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="minimalTaxonomyL" layoutX="10.0" layoutY="220.0" prefHeight="25.0" text="Min. št. taksonomij" />
         <TextField fx:id="minimalTaxonomyTF" layoutX="225.0" layoutY="220.0" prefWidth="140.0" />
-        <Label fx:id="minimalTaxonomyLH" layoutX="10.0" layoutY="250.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="minimalTaxonomyI" layoutX="370.0" layoutY="227.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
 
         <Label fx:id="solarFilters" layoutX="10.0" layoutY="280.0" text="Izbrani filtri:" />
diff --git a/src/main/resources/gui/StringAnalysisTabNew2.fxml b/src/main/resources/gui/StringAnalysisTabNew2.fxml
index e91c3b2..d9ce28c 100755
--- a/src/main/resources/gui/StringAnalysisTabNew2.fxml
+++ b/src/main/resources/gui/StringAnalysisTabNew2.fxml
@@ -15,6 +15,8 @@
 
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TextArea?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
 <AnchorPane fx:id="stringAnalysisTabPaneNew2" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gui.StringAnalysisTabNew2">
     <Pane>
 
@@ -37,10 +39,12 @@
                     </items>
                 </ComboBox>
             </children>
-            <Label fx:id="skipValueLH" layoutX="10.0" layoutY="220.0" prefHeight="10.0" styleClass="help"/>
+            <ImageView fx:id="skipValueI" layoutX="370.0" layoutY="197.5" pickOnBounds="true" preserveRatio="true">
+                <Image url="questionmark.png" backgroundLoading="true"/>
+            </ImageView>
         </Pane>
 
-        <Label fx:id="slowSpeedWarning1L" layoutX="10.0" layoutY="230.0" prefHeight="10.0" text="* IZBIRA PREDHODNEGA FILTRA LAHKO MOČNO UPOČASNI DELOVANJE" styleClass="warning"/>
+        <Label fx:id="slowSpeedWarning1L" layoutX="10.0" layoutY="225.0" prefHeight="10.0" text="* IZBIRA PREDHODNEGA FILTRA LAHKO MOČNO UPOČASNI DELOVANJE" styleClass="warning"/>
 
         <!-- for some reason following two ComboBoxes have to be below paneWords -->
         <Label fx:id="calculateForL" layoutX="10.0" layoutY="20.0" prefHeight="25.0" text="Izračunaj za" />
@@ -55,17 +59,23 @@
                 </FXCollections>
             </items>
         </ComboBox>
-        <Label fx:id="calculateForLH" layoutX="10.0" layoutY="50.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="calculateForI" layoutX="370.0" layoutY="27.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="alsoVisualizeL" layoutX="10.0" layoutY="60.0" prefHeight="25.0" text="Upoštevaj tudi" />
         <CheckComboBox fx:id="alsoVisualizeCCB" layoutX="225.0" layoutY="60.0" prefHeight="25.0" prefWidth="140.0"/>
-        <Label fx:id="alsoVisualizeLH" layoutX="10.0" layoutY="90.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="alsoVisualizeI" layoutX="370.0" layoutY="67.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="displayTaxonomyL" layoutX="10.0" layoutY="100.0" prefHeight="25.0" text="Izpiši taksonomije" />
         <CheckBox fx:id="displayTaxonomyChB" layoutX="283.0" layoutY="105.0" selected="false" />
-        <Label fx:id="displayTaxonomyLH" layoutX="10.0" layoutY="130.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="displayTaxonomyI" layoutX="370.0" layoutY="107.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
-        <Label fx:id="slowSpeedWarning2L" layoutX="10.0" layoutY="140.0" prefHeight="10.0" text="* IZBIRA PREDHODNEGA FILTRA LAHKO MOČNO UPOČASNI DELOVANJE" styleClass="warning"/>
+        <Label fx:id="slowSpeedWarning2L" layoutX="10.0" layoutY="135.0" prefHeight="10.0" text="* IZBIRA PREDHODNEGA FILTRA LAHKO MOČNO UPOČASNI DELOVANJE" styleClass="warning"/>
 
         <Label fx:id="ngramValueL" layoutX="10.0" layoutY="150.0" prefHeight="25.0" text="N-gram nivo" />
         <ComboBox fx:id="ngramValueCB" layoutX="225.0" layoutY="150.0" prefHeight="25.0" prefWidth="140.0" promptText="izberi" visibleRowCount="5">
@@ -78,38 +88,21 @@
                 </FXCollections>
             </items>
         </ComboBox>
-        <Label fx:id="ngramValueLH" layoutX="10.0" layoutY="180.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="ngramValueI" layoutX="370.0" layoutY="157.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="notePunctuationsL" layoutX="10.0" layoutY="240.0" prefHeight="25.0" text="Upoštevaj ločila" />
         <CheckBox fx:id="notePunctuationsChB" layoutX="283.0" layoutY="240.0" selected="false" />
-        <Label fx:id="notePunctuationsLH" layoutX="10.0" layoutY="270.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="notePunctuationsI" layoutX="370.0" layoutY="247.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="collocabilityL" layoutX="10.0" layoutY="280.0" prefHeight="25.0" text="Kolokabilnost" />
         <CheckComboBox fx:id="collocabilityCCB" layoutX="225.0" layoutY="280.0" prefHeight="25.0" prefWidth="140.0"/>
-        <Label fx:id="collocabilityLH" layoutX="10.0" layoutY="310.0" prefHeight="10.0" styleClass="help"/>
-
-        <!-- MSD and Taxonomy separated -->
-
-        <!--<Label layoutX="10.0" layoutY="280.0" prefHeight="25.0" text="Omejitev podatkov" />-->
-
-        <!--<Label layoutX="10.0" layoutY="320.0" prefHeight="25.0" text="Oznaka MSD" />-->
-        <!--<TextField fx:id="msdTF" layoutX="185.0" layoutY="320.0" prefWidth="180.0" />-->
-        <!--<Label layoutX="10.0" layoutY="360.0" prefHeight="25.0" text="Taksonomija" />-->
-        <!--<CheckComboBox fx:id="taxonomyCCB" layoutX="185.0" layoutY="360.0" prefHeight="25.0" prefWidth="180.0" >-->
-            <!--<items>-->
-                <!--<FXCollections fx:factory="observableArrayList">-->
-                    <!--<String fx:value="2" />-->
-                    <!--<String fx:value="3" />-->
-                    <!--<String fx:value="4" />-->
-                    <!--<String fx:value="5" />-->
-                <!--</FXCollections>-->
-            <!--</items>-->
-        <!--</CheckComboBox>-->
-
-        <!--<Label layoutX="10.0" layoutY="400.0" prefHeight="25.0" text="Min. št. pojavitev" />-->
-        <!--<TextField fx:id="minimalOccurrencesTF" layoutX="185.0" layoutY="400.0" prefWidth="180.0" />-->
-
-
+        <ImageView fx:id="collocabilityI" layoutX="370.0" layoutY="287.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
     </Pane>
     <Button fx:id="computeNgramsB" layoutX="10.0" layoutY="440.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="250.0" text="Izračunaj" />
 
@@ -119,42 +112,34 @@
 
         <Label fx:id="msdL" layoutX="10.0" layoutY="100.0" prefHeight="25.0" text="Oznaka MSD"/>
         <TextField fx:id="msdTF" layoutX="225.0" layoutY="100.0" prefWidth="140.0"/>
-        <Label fx:id="msdLH" layoutX="10.0" layoutY="130.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="msdI" layoutX="370.0" layoutY="107.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
+
         <Label fx:id="taxonomyL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Taksonomija"/>
         <CheckComboBox fx:id="taxonomyCCB" layoutX="225.0" layoutY="140.0" prefHeight="25.0" prefWidth="140.0"/>
         <Label fx:id="taxonomyLH" layoutX="10.0" layoutY="170.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="taxonomyI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="minimalOccurrencesL" layoutX="10.0" layoutY="180.0" prefHeight="25.0" text="Min. št. pojavitev" />
         <TextField fx:id="minimalOccurrencesTF" layoutX="225.0" layoutY="180.0" prefWidth="140.0" />
-        <Label fx:id="minimalOccurrencesLH" layoutX="10.0" layoutY="210.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="minimalOccurrencesI" layoutX="370.0" layoutY="187.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="minimalTaxonomyL" layoutX="10.0" layoutY="220.0" prefHeight="25.0" text="Min. št. taksonomij" />
         <TextField fx:id="minimalTaxonomyTF" layoutX="225.0" layoutY="220.0" prefWidth="140.0" />
-        <Label fx:id="minimalTaxonomyLH" layoutX="10.0" layoutY="250.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="minimalTaxonomyI" layoutX="370.0" layoutY="227.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
 
         <Label fx:id="solarFilters" layoutX="10.0" layoutY="280.0" text="Izbrani filtri:" />
         <TextArea fx:id="selectedFiltersTextArea" layoutX="10.0" layoutY="320.0" prefHeight="80.0" maxHeight="80.0" prefWidth="360.0" text=" " wrapText="true" editable="false"/>
     </Pane>
 
-    <!--<Pane layoutX="400.0" prefHeight="480.0" prefWidth="380.0">-->
-        <!--<Label layoutX="10.0" layoutY="60.0" prefHeight="25.0" text="Min. št. taksonomij" />-->
-        <!--<TextField fx:id="minimalTaxonomyTF" layoutX="185.0" layoutY="60.0" prefWidth="180.0" />-->
-
-        <!--<Label layoutX="10.0" layoutY="100.0" prefHeight="25.0" text="Kolokabilnost" />-->
-        <!--<CheckComboBox fx:id="collocabilityCCB" layoutX="185.0" layoutY="100.0" prefHeight="25.0" prefWidth="180.0"/>-->
-
-        <!--<Label fx:id="solarFilters" layoutX="10.0" layoutY="140.0" text="Izbrani filtri:" />-->
-        <!--<Label fx:id="selectedFiltersLabel" alignment="TOP_LEFT" layoutX="10.0" layoutY="140.0" prefHeight="260.0" prefWidth="275.0" text=" " wrapText="true" />-->
-        <!--&lt;!&ndash; samoglasniki/soglasniki &ndash;&gt;-->
-        <!--<Pane fx:id="paneLetters">-->
-            <!--<children>-->
-                <!--<CheckBox fx:id="calculatecvvCB" layoutX="10.0" layoutY="440.0" mnemonicParsing="false" prefHeight="25.0" text="Izračunaj za kombinacije samoglasnikov in soglasnikov" />-->
-                <!--<Label layoutX="10.0" layoutY="400.0" prefHeight="25.0" text="Dolžina niza" />-->
-                <!--<TextField fx:id="stringLengthTF" layoutX="185.0" layoutY="400.0" prefWidth="180.0" />-->
-            <!--</children>-->
-        <!--</Pane>-->
-    <!--</Pane>-->
     <Hyperlink fx:id="helpH" alignment="TOP_LEFT" layoutX="710.0" layoutY="16.0" text="Pomoč" />
     <Button fx:id="changeLanguageB" layoutX="710.0" layoutY="40.0" mnemonicParsing="false" prefWidth="50.0"/>
 
diff --git a/src/main/resources/gui/WordLevelTab.fxml b/src/main/resources/gui/WordLevelTab.fxml
index 79ad25b..598003d 100755
--- a/src/main/resources/gui/WordLevelTab.fxml
+++ b/src/main/resources/gui/WordLevelTab.fxml
@@ -14,6 +14,8 @@
 <?import org.controlsfx.control.CheckComboBox?>
 
 <?import javafx.scene.control.TextArea?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
 <AnchorPane fx:id="wordLevelAnalysisTabPane" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.111"
             xmlns:fx="http://javafx.com/fxml/1" fx:controller="gui.WordLevelTab">
     <Pane>
@@ -30,16 +32,22 @@
                 </FXCollections>
             </items>
         </ComboBox>
-        <Label fx:id="calculateForLH" layoutX="10.0" layoutY="50.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="calculateForI" layoutX="370.0" layoutY="27.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="alsoVisualizeL" layoutX="10.0" layoutY="60.0" prefHeight="25.0" text="Upoštevaj tudi" />
         <CheckComboBox fx:id="alsoVisualizeCCB" layoutX="225.0" layoutY="60.0" prefHeight="25.0" prefWidth="140.0"/>
-        <Label fx:id="alsoVisualizeLH" layoutX="10.0" layoutY="90.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="alsoVisualizeI" layoutX="370.0" layoutY="67.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
 
         <Label fx:id="displayTaxonomyL" layoutX="10.0" layoutY="100.0" prefHeight="25.0" text="Izpiši taksonomije" />
         <CheckBox fx:id="displayTaxonomyChB" layoutX="283.0" layoutY="105.0" selected="false" />
-        <Label fx:id="displayTaxonomyLH" layoutX="10.0" layoutY="130.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="displayTaxonomyI" layoutX="370.0" layoutY="107.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <!--<Label layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Izpiši razbit MSD" />-->
         <!--<CheckBox fx:id="writeMsdAtTheEndChB" layoutX="263.0" layoutY="145.0" selected="false" />-->
@@ -60,7 +68,10 @@
                 </FXCollections>
             </items>
         </ComboBox>
-        <Label fx:id="prefixLengthLH" layoutX="10.0" layoutY="230.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="prefixLengthI" layoutX="370.0" layoutY="207.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
+
         <Label fx:id="suffixLengthL" layoutX="10.0" layoutY="240.0" prefHeight="25.0" text="Pripona je dolga"/>
         <ComboBox fx:id="suffixLengthCB" layoutX="225.0" layoutY="240.0" prefWidth="140.0" promptText="izberi" visibleRowCount="5">
             <items>
@@ -74,17 +85,23 @@
                 </FXCollections>
             </items>
         </ComboBox>
-        <Label fx:id="suffixLengthLH" layoutX="10.0" layoutY="270.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="suffixLengthI" layoutX="370.0" layoutY="247.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="listSearchL" layoutX="10.0" layoutY="300.0" prefHeight="25.0" text="Iskanje besednih delov preko podanih predpon in pripon" />
 
         <Label fx:id="prefixListL" layoutX="10.0" layoutY="340.0" prefHeight="25.0" text="Seznam predpon"/>
         <TextField fx:id="prefixListTF" layoutX="225.0" layoutY="340.0" prefWidth="140.0" />
-        <Label fx:id="prefixListLH" layoutX="10.0" layoutY="370.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="prefixListI" layoutX="370.0" layoutY="347.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="suffixListL" layoutX="10.0" layoutY="380.0" prefHeight="25.0" text="Seznam pripon"/>
         <TextField fx:id="suffixListTF" layoutX="225.0" layoutY="380.0" prefWidth="140.0" />
-        <Label fx:id="suffixListLH" layoutX="10.0" layoutY="410.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="suffixListI" layoutX="370.0" layoutY="387.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
 
 
@@ -98,18 +115,28 @@
 
         <Label fx:id="msdL" layoutX="10.0" layoutY="100.0" prefHeight="25.0" text="Oznaka MSD"/>
         <TextField fx:id="msdTF" layoutX="225.0" layoutY="100.0" prefWidth="140.0"/>
-        <Label fx:id="msdLH" layoutX="10.0" layoutY="130.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="msdI" layoutX="370.0" layoutY="107.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
+
         <Label fx:id="taxonomyL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Taksonomija"/>
         <CheckComboBox fx:id="taxonomyCCB" layoutX="225.0" layoutY="140.0" prefHeight="25.0" prefWidth="140.0"/>
         <Label fx:id="taxonomyLH" layoutX="10.0" layoutY="170.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="taxonomyI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="minimalOccurrencesL" layoutX="10.0" layoutY="180.0" prefHeight="25.0" text="Min. št. pojavitev" />
         <TextField fx:id="minimalOccurrencesTF" layoutX="225.0" layoutY="180.0" prefWidth="140.0" />
-        <Label fx:id="minimalOccurrencesLH" layoutX="10.0" layoutY="210.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="minimalOccurrencesI" layoutX="370.0" layoutY="187.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
         <Label fx:id="minimalTaxonomyL" layoutX="10.0" layoutY="220.0" prefHeight="25.0" text="Min. št. taksonomij" />
         <TextField fx:id="minimalTaxonomyTF" layoutX="225.0" layoutY="220.0" prefWidth="140.0" />
-        <Label fx:id="minimalTaxonomyLH" layoutX="10.0" layoutY="250.0" prefHeight="10.0" styleClass="help"/>
+        <ImageView fx:id="minimalTaxonomyI" layoutX="370.0" layoutY="227.5" pickOnBounds="true" preserveRatio="true">
+            <Image url="questionmark.png" backgroundLoading="true"/>
+        </ImageView>
 
 
         <Label fx:id="solarFilters" layoutX="10.0" layoutY="280.0" text="Izbrani filtri:" />
diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties
index af13a6e..6969548 100644
--- a/src/main/resources/message_en.properties
+++ b/src/main/resources/message_en.properties
@@ -18,12 +18,18 @@ tab.stringLevelTabNew2=Word sets
 label.setCorpusLocation=Set corpus location
 button.setCorpusLocation=Set location
 label.readHeaderInfo=Read info from headers
-checkBox.readHeaderInfo=Read info from headers
+checkBox.readHeaderInfo=
 label.chooseResultsLocation=Choose result location
 button.chooseResultsLocation=Set location
 label.selectReader=Select reader
 label.outputName=Output file name
 
+label.corpusTab.chooseCorpusLocationH=Select folder which contains corpus. The folder should only contain one corpus and should not contain too many files that are not part of corpus.
+label.corpusTab.readHeaderInfoH=If you select this option taxonomy will be read separately. This might take a while.
+label.corpusTab.chooseResultsLocationH=Choose result location
+label.corpusTab.selectReaderH=Select reader
+label.corpusTab.outputNameH=Output file name
+
 # character analysis tab
 label.stringLength=Number of letters
 label.calculateFor=Calculate for
@@ -163,8 +169,8 @@ message.LABEL_SCANNING_CORPUS=Search and analysis of corpus files...
 message.LABEL_SCANNING_SINGLE_FILE_CORPUS=Input analysis
 message.COMPLETED=Completed
 
-message.TOOLTIP_chooseCorpusLocationB=Select folder which contains corpus. The folder should only contain one corpus and should not contain too many files that are not part of corpus.
-message.TOOLTIP_readHeaderInfoChB=If you select this option taxonomy will be read separately. This might take a while.
+#message.TOOLTIP_chooseCorpusLocationB=Select folder which contains corpus. The folder should only contain one corpus and should not contain too many files that are not part of corpus.
+#message.TOOLTIP_readHeaderInfoChB=If you select this option taxonomy will be read separately. This might take a while.
 message.TOOLTIP_readNotePunctuationsChB=Punctuations in sentences are included in analysis
 message.TOOLTIP_readDisplayTaxonomyChB=Output file will include statistics over taxonomies as well.
 
diff --git a/src/main/resources/message_sl.properties b/src/main/resources/message_sl.properties
index 5281fc5..38ac5f9 100644
--- a/src/main/resources/message_sl.properties
+++ b/src/main/resources/message_sl.properties
@@ -18,12 +18,18 @@ tab.stringLevelTabNew2=Besedni nizi
 label.setCorpusLocation=Nastavi lokacijo korpusa
 button.setCorpusLocation=Ponastavi
 label.readHeaderInfo=Preberi info iz headerjev
-checkBox.readHeaderInfo=Preberi info iz headerjev
+checkBox.readHeaderInfo=
 label.chooseResultsLocation=Nastavi lokacijo rezultatov
 button.chooseResultsLocation=Ponastavi
 label.selectReader=Izberi bralnik
 label.outputName=Ime izhodne datoteke
 
+label.corpusTab.chooseCorpusLocationH=Izberite mapo v kateri se nahaja korpus. Program izbrano mapo preišče rekurzivno, zato bodite pozorni, da ne izberete mape z več korpusi ali z mnogo datotekami, ki niso del korpusa.
+label.corpusTab.readHeaderInfoH=Če izberete to opcijo, se bo iz headerjev korpusa prebrala razpoložljiva taksonomija oz. filtri (korpus Šolar). Ta operacija lahko traja dlje časa, sploh če je korpus združen v eni sami datoteki.
+label.corpusTab.chooseResultsLocationH=Nastavi lokacijo rezultatov
+label.corpusTab.selectReaderH=Izberi bralnik
+label.corpusTab.outputNameH=Ime izhodne datoteke
+
 # character analysis tab
 label.stringLength=Dolžina črkovnih nizov
 label.calculateFor=Preštej
@@ -164,8 +170,8 @@ message.LABEL_SCANNING_CORPUS=Iskanje in analiza korpusnih datotek...
 message.LABEL_SCANNING_SINGLE_FILE_CORPUS=Analiza vnosa
 message.COMPLETED=končano
 
-message.TOOLTIP_chooseCorpusLocationB=Izberite mapo v kateri se nahaja korpus. Program izbrano mapo preišče rekurzivno, zato bodite pozorni, da ne izberete mape z več korpusi ali z mnogo datotekami, ki niso del korpusa.
-message.TOOLTIP_readHeaderInfoChB=Če izberete to opcijo, se bo iz headerjev korpusa prebrala razpoložljiva taksonomija oz. filtri (korpus Šolar). Ta operacija lahko traja dlje časa, sploh če je korpus združen v eni sami datoteki.
+#message.TOOLTIP_chooseCorpusLocationB=Izberite mapo v kateri se nahaja korpus. Program izbrano mapo preišče rekurzivno, zato bodite pozorni, da ne izberete mape z več korpusi ali z mnogo datotekami, ki niso del korpusa.
+#message.TOOLTIP_readHeaderInfoChB=Če izberete to opcijo, se bo iz headerjev korpusa prebrala razpoložljiva taksonomija oz. filtri (korpus Šolar). Ta operacija lahko traja dlje časa, sploh če je korpus združen v eni sami datoteki.
 message.TOOLTIP_readNotePunctuationsChB=Ločila med povedmi se upoštevajo v vsakem primeru.
 message.TOOLTIP_readDisplayTaxonomyChB=V izhodni datoteki bodo prikazane tudi statistike po taksonomijah.