diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.css b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.css
index ec0b172699..4913677db5 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.css
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.css
@@ -8,8 +8,8 @@
 }
 
 .report-icons {
-    margin: 20px 20px 20px 20px;
-    float: right;
+    margin: 20px 0;
+    float: left;
 }
 
 .full-width {
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.html
index 215a487657..6f5ca867ff 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.html
@@ -1,10 +1,11 @@
 <div *ngIf="reports">
     <div class="report-icons">
-        <button mdTooltip="{{report.title}}" (click)="selectCurrent(idx)"
-                [class.mdl-button--accent]="isCurrent(idx)"
-                class="mdl-button mdl-js-button"
-                *ngFor="let report of reports; let idx = index">
-            <i class="material-icons">{{report.icon}}</i>
+        <button md-icon-button
+                *ngFor="let report of reports; let idx = index"
+                [mdTooltip]="report.title"
+                [color]="isCurrent(idx) ? 'primary' : null"
+                (click)="selectCurrent(idx)">
+            <md-icon>{{report.icon}}</md-icon>
         </button>
     </div>
     <div class="clear-both"> </div>