diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-boundary-event.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-boundary-event.component.html
index b5eb151f55..9607de4538 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-boundary-event.component.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-boundary-event.component.html
@@ -2,4 +2,4 @@
                 [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-circle>
 <raphael-circle [center]="center" [radius]="circleRadiusOuter" [strokeWidth]="options.strokeWidth" [stroke]="options.stroke"
                 [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-circle>
-<diagram-container-icon-event [data]="data" [type]="data.eventDefinition.type"></diagram-container-icon-event>
\ No newline at end of file
+<diagram-container-icon-event [data]="data" [type]="data.eventDefinition.type" [fillColor]="signalFillColor"></diagram-container-icon-event>
\ No newline at end of file
diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-boundary-event.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-boundary-event.component.ts
index c306de4ba8..cb8bb1b687 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-boundary-event.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-boundary-event.component.ts
@@ -34,6 +34,8 @@ export class DiagramBoundaryEventComponent {
     center: any = {};
     options: any = {stroke: '', fillColors: '', fillOpacity: '', strokeWidth: 1};
 
+    signalFillColor: string;
+
     circleRadiusInner: number;
     circleRadiusOuter: number;
 
@@ -50,5 +52,7 @@ export class DiagramBoundaryEventComponent {
         this.options.stroke = this.diagramColorService.getBpmnColor(this.data, DiagramColorService.MAIN_STROKE_COLOR);
         this.options.fillColors = this.diagramColorService.getFillColour(this.data.id);
         this.options.fillOpacity = this.diagramColorService.getFillOpacity();
+
+        this.signalFillColor = 'none';
     }
 }
diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-throw-event.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-throw-event.component.html
new file mode 100644
index 0000000000..b4dddf5c31
--- /dev/null
+++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-throw-event.component.html
@@ -0,0 +1,6 @@
+<raphael-circle [center]="center" [radius]="circleRadiusInner" [strokeWidth]="options.strokeWidth" [stroke]="options.stroke"
+                [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-circle>
+<raphael-circle [center]="center" [radius]="circleRadiusOuter" [strokeWidth]="options.strokeWidth" [stroke]="options.stroke"
+                [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-circle>
+<diagram-container-icon-event [data]="data" [type]="data.eventDefinition && data.eventDefinition.type"
+                              [fillColor]="signalFillColor"></diagram-container-icon-event>
\ No newline at end of file
diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-throw-event.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-throw-event.component.ts
new file mode 100644
index 0000000000..3d95ea9e94
--- /dev/null
+++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/diagram-throw-event.component.ts
@@ -0,0 +1,58 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Component, ElementRef, Input, Output, EventEmitter } from '@angular/core';
+import { DiagramColorService } from './../services/diagram-color.service';
+
+@Component({
+    moduleId: module.id,
+    selector: 'diagram-throw-event',
+    templateUrl: './diagram-throw-event.component.html',
+    styleUrls: ['./diagram-throw-event.component.css']
+})
+export class DiagramThrowEventComponent {
+    @Input()
+    data: any;
+
+    @Output()
+    onError = new EventEmitter();
+
+    center: any = {};
+    options: any = {stroke: '', fillColors: '', fillOpacity: '', strokeWidth: 1};
+
+    signalFillColor: string;
+
+    circleRadiusInner: number;
+    circleRadiusOuter: number;
+
+    constructor(public elementRef: ElementRef,
+                private diagramColorService: DiagramColorService) {}
+
+    ngOnInit() {
+        this.center.x = this.data.x + (this.data.width / 2);
+        this.center.y = this.data.y + (this.data.height / 2);
+
+        this.circleRadiusInner = 12;
+        this.circleRadiusOuter = 15;
+
+        this.options.stroke = this.diagramColorService.getBpmnColor(this.data, DiagramColorService.MAIN_STROKE_COLOR);
+        this.options.fillColors = this.diagramColorService.getFillColour(this.data.id);
+        this.options.fillOpacity = this.diagramColorService.getFillOpacity();
+
+        this.signalFillColor = 'black';
+    }
+}
diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/index.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/index.ts
index e42095b039..248bf142cc 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/index.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/boundary-events/index.ts
@@ -16,10 +16,13 @@
  */
 
 import { DiagramBoundaryEventComponent } from './diagram-boundary-event.component';
+import { DiagramThrowEventComponent } from './diagram-throw-event.component';
 
 // primitives
 export * from './diagram-boundary-event.component';
+export * from './diagram-throw-event.component';
 
 export const DIAGRAM_BOUNDARY_EVENTS_DIRECTIVES: any[] = [
-    DiagramBoundaryEventComponent
+    DiagramBoundaryEventComponent,
+    DiagramThrowEventComponent
 ];
diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram.component.html
index b2e9bb0cbd..fc7e2dedcf 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram.component.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram.component.html
@@ -40,6 +40,9 @@
             <div *ngSwitchCase="'BoundaryEvent'">
                 <diagram-boundary-event [data]="element"></diagram-boundary-event>
             </div>
+            <div *ngSwitchCase="'ThrowEvent'">
+                <diagram-throw-event [data]="element"></diagram-throw-event>
+            </div>
             <div *ngSwitchCase="'IntermediateCatchEvent'">
                 <diagram-intermediate-catching-event [data]="element"></diagram-intermediate-catching-event>
             </div>
diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-container-icon-event.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-container-icon-event.component.html
index f1f54c927b..391f67b07e 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-container-icon-event.component.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-container-icon-event.component.html
@@ -6,7 +6,7 @@
         <diagram-icon-error [data]="data"></diagram-icon-error>
     </div>
     <div *ngSwitchCase="'signal'">
-        <diagram-icon-signal [data]="data"></diagram-icon-signal>
+        <diagram-icon-signal [data]="data" [fillColor]="fillColor"></diagram-icon-signal>
     </div>
     <div *ngSwitchCase="'message'">
         <diagram-icon-message [data]="data"></diagram-icon-message>
diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-container-icon-event.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-container-icon-event.component.ts
index 6939692c60..b77cb4af71 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-container-icon-event.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-container-icon-event.component.ts
@@ -31,6 +31,9 @@ export class DiagramContainerIconEventTaskComponent {
     @Input()
     type: string;
 
+    @Input()
+    fillColor: string;
+
     @Output()
     onError = new EventEmitter();
 
diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-icon-signal.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-icon-signal.component.ts
index c8231e0757..154b0b7c98 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-icon-signal.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-icon-signal.component.ts
@@ -28,6 +28,9 @@ export class DiagramIconSignalComponent {
     @Input()
     data: any;
 
+    @Input()
+    fillColor: string;
+
     @Output()
     onError = new EventEmitter();
 
@@ -42,7 +45,7 @@ export class DiagramIconSignalComponent {
         this.position = {x: this.data.x - 1, y: this.data.y - 1};
 
         this.options.stroke = 'black';
-        this.options.fillColors = 'none';
+        this.options.fillColors = this.fillColor;
         this.options.strokeWidth = 1;
     }
 }