diff --git a/VadereGui/resources/messages_de_DE.properties b/VadereGui/resources/messages_de_DE.properties
index 8716d3930873253dafda3d8a8bdfeb39f79b8408..430b04a4e0af07399fa110898ef33ff9c87effae 100644
--- a/VadereGui/resources/messages_de_DE.properties
+++ b/VadereGui/resources/messages_de_DE.properties
@@ -220,7 +220,7 @@ PostVis.chbShowStairs.text=Treppen anzeigen
 PostVis.btnSnapshot.tooltip=Snapshot
 PostVis.btnPNGSnapshot.tooltip=PNG-Snapshot
 PostVis.btnSVGSnapshot.tooltip=SVG-Snapshot
-PostVis.btnTikZSnapshot.tooltip=TikZ Snapshot
+PostVis.btnTikZSnapshot.tooltip=TikZ-Snapshot
 PostVis.menuFile.title=Datei
 PostVis.menuSettings.title=Einstellungen
 PostVis.menuRecentFiles.title=K\u00FCrzlich verwendete Dateien
diff --git a/VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java b/VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java
index 06b1391f3566a0b58ede9f2208a1a41a3185ffc1..97548031f3297172d3bba24deef6aaefce1abf9b 100644
--- a/VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java
+++ b/VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java
@@ -150,20 +150,20 @@ public class OnlineVisualisationWindow extends JPanel implements Observer {
 		};
 
 		ActionGeneratePNG generatePNG = new ActionGeneratePNG(
-				"generatePNG",
+				Messages.getString("PostVis.btnPNGSnapshot.tooltip"),
 				resources.getIcon("camera_png.png", iconWidth, iconHeight),
 				new OnlinevisualizationRenderer(model),
 				model);
 
 
 		ActionGenerateSVG generateSVG = new ActionGenerateSVG(
-				"generateSVG",
+				Messages.getString("PostVis.btnSVGSnapshot.tooltip"),
 				resources.getIcon("camera_svg.png", iconWidth, iconHeight),
 				new OnlinevisualizationRenderer(model),
 				model);
 
 		ActionGenerateTikz generateTikz = new ActionGenerateTikz(
-				"generateTikz",
+				Messages.getString("PostVis.btnTikZSnapshot.tooltip"),
 				resources.getIcon("camera_tikz.png", iconWidth, iconHeight),
 				new OnlinevisualizationRenderer(model),
 				model);
diff --git a/VadereGui/src/org/vadere/gui/postvisualization/utils/TikzGenerator.java b/VadereGui/src/org/vadere/gui/postvisualization/utils/TikzGenerator.java
index 0ea9f9883a39eb18222f748ffc20a5c5bbbbc024..2c8c849876ca197216415955c6c445483e26bc93 100644
--- a/VadereGui/src/org/vadere/gui/postvisualization/utils/TikzGenerator.java
+++ b/VadereGui/src/org/vadere/gui/postvisualization/utils/TikzGenerator.java
@@ -166,7 +166,12 @@ public class TikzGenerator {
 		if (config.isShowPedestrians()) {
 			generatedCode += "% Agents\n";
 			for (Agent agent : model.getAgents()) {
-				String agentTextPattern = "\\fill[AgentColor] (%f,%f) circle [radius=%fcm];\n";
+			    String agentTextPattern = "\\fill[AgentColor] (%f,%f) circle [radius=%fcm];\n";
+
+                if (model.isElementSelected() && model.getSelectedElement().equals(agent)) {
+                    agentTextPattern = "\\fill[draw=magenta,fill=AgentColor] (%f,%f) circle [radius=%fcm];\n";
+                }
+
 				generatedCode += String.format(agentTextPattern, agent.getPosition().x, agent.getPosition().y, agent.getRadius());
 				// Do not draw agents as path for performance reasons. Usually, agents have a circular shape.
 				// generatedCode += String.format("\\fill[AgentColor] %s\n", generatePathForScenarioElement(agent));
diff --git a/VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java b/VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java
index 86fe48bd72182f7be4fa4777520ee447f0e4a874..25418661bf5cd979afe92d380485af1196bb4a91 100644
--- a/VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java
+++ b/VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java
@@ -253,12 +253,13 @@ public class PostvisualizationWindow extends JPanel implements Observer {
 				renderer);
 		ActionVisualization svgImg = new ActionGenerateSVG(Messages.getString("PostVis.btnSVGSnapshot.tooltip"), resources.getIcon("camera_svg.png", iconWidth, iconHeight),
 				renderer);
-		ActionVisualization tikzImg = new ActionGenerateTikz("tikz_snapshot", resources.getIcon("camera_tikz.png", iconWidth, iconHeight),
+		ActionVisualization tikzImg = new ActionGenerateTikz(Messages.getString("PostVis.btnTikZSnapshot.tooltip"), resources.getIcon("camera_tikz.png", iconWidth, iconHeight),
 				renderer);
 		// add new ImageGenerator Action ...
 
 		imgOptions.add(pngImg);
 		imgOptions.add(svgImg);
+		imgOptions.add(tikzImg);
 		// add Action to List ....
 
 		ActionVisualizationMenu imgDialog = new ActionVisualizationMenu(