diff --git a/doc/license.md b/doc/license.md
index 83cc8ff..c40f38b 100644
--- a/doc/license.md
+++ b/doc/license.md
@@ -48,6 +48,8 @@
 * advtrains_wagon_japan_inv.png
 * advtrains_wagon_tank_inv.png
 * advtrains_wagon_wood_inv.png
+* advtrains_signal_on.png
+* advtrains_signal_off.png
   * License: CC BY-SA 3.0
   * Source [advtrains](http://advtrains.bleipb.de/)
 
diff --git a/static/js/overlays/TrainsignalOverlay.js b/static/js/overlays/TrainsignalOverlay.js
index 566f9c8..186d9f9 100644
--- a/static/js/overlays/TrainsignalOverlay.js
+++ b/static/js/overlays/TrainsignalOverlay.js
@@ -1,4 +1,20 @@
 
+var IconOn = L.icon({
+  iconUrl: "pics/advtrains/advtrains_signal_on.png",
+  iconSize:     [16, 16],
+  iconAnchor:   [8, 8],
+  popupAnchor:  [0, -16]
+});
+
+var IconOff = L.icon({
+  iconUrl: "pics/advtrains/advtrains_signal_off.png",
+  iconSize:     [16, 16],
+  iconAnchor:   [8, 8],
+  popupAnchor:  [0, -16]
+});
+
+
+
 export default L.LayerGroup.extend({
   initialize: function(wsChannel, layerMgr) {
     L.LayerGroup.prototype.initialize.call(this);
@@ -20,7 +36,9 @@ export default L.LayerGroup.extend({
 
   createPopup: function(signal){
     var html = "<b>Signal</b><hr>";
-    html += "<b>State:</b> " + signal.green + "<br>";
+    html += "<b>State:</b> " +
+      (signal.green ? "Green" : "Red") +
+      "<br>";
 
     return html;
   },
@@ -35,14 +53,7 @@ export default L.LayerGroup.extend({
 
   createMarker: function(signal){
 
-    var Icon = L.icon({
-      iconUrl: "TODO",
-
-      iconSize:     [16, 16],
-      iconAnchor:   [8, 8],
-      popupAnchor:  [0, -16]
-    });
-
+    var Icon = signal.green ? IconOn : IconOff;
     var marker = L.marker([signal.pos.z, signal.pos.x], {icon: Icon});
     marker.bindPopup(this.createPopup(signal));
 
@@ -84,6 +95,7 @@ export default L.LayerGroup.extend({
         let marker = this.currentObjects[signalId];
         marker.setLatLng([signal.pos.z, signal.pos.x]);
         marker.setPopupContent(this.createPopup(signal));
+        marker.setIcon(signal.green ? IconOn : IconOff);
 
       } else {
         //marker does not exist
diff --git a/static/pics/advtrains/advtrains_signal_off.png b/static/pics/advtrains/advtrains_signal_off.png
new file mode 100755
index 0000000..ed64ed9
Binary files /dev/null and b/static/pics/advtrains/advtrains_signal_off.png differ
diff --git a/static/pics/advtrains/advtrains_signal_on.png b/static/pics/advtrains/advtrains_signal_on.png
new file mode 100755
index 0000000..fa1b018
Binary files /dev/null and b/static/pics/advtrains/advtrains_signal_on.png differ