diff --git a/public/app/features/org/partials/create_team.html b/public/app/features/org/partials/create_team.html
index 02c48f4ef68..f45ad0b33a0 100644
--- a/public/app/features/org/partials/create_team.html
+++ b/public/app/features/org/partials/create_team.html
@@ -1,6 +1,7 @@
 <div class="modal-body">
   <div class="modal-header">
 		<h2 class="modal-header-title">
+			<i class="gicon gicon-team"></i>
 			<span class="p-l-1">Create Team</span>
 		</h2>
 
diff --git a/public/app/features/org/partials/team_details.html b/public/app/features/org/partials/team_details.html
index fdc84f146b7..bd201e2cc3a 100644
--- a/public/app/features/org/partials/team_details.html
+++ b/public/app/features/org/partials/team_details.html
@@ -1,7 +1,7 @@
 <page-header model="ctrl.navModel"></page-header>
 
 <div class="page-container page-body">
-  <h3 class="page-sub-heading">Edit Team</h3>
+	<h3 class="page-sub-heading">Team Details</h3>
 
   <form name="teamDetailsForm" class="gf-form-group gf-form-inline">
     <div class="gf-form">
@@ -24,7 +24,7 @@
       </div>
     </form>
 
-    <table class="grafana-options-table" ng-show="ctrl.teamMembers.length > 0">
+    <table class="filter-table" ng-show="ctrl.teamMembers.length > 0">
       <tr>
         <th>Username</th>
         <th>Email</th>
diff --git a/public/app/features/org/team_details_ctrl.ts b/public/app/features/org/team_details_ctrl.ts
index 598b03b46d4..e4dc91386b5 100644
--- a/public/app/features/org/team_details_ctrl.ts
+++ b/public/app/features/org/team_details_ctrl.ts
@@ -1,5 +1,3 @@
-///<reference path="../../headers/common.d.ts" />
-
 import coreModule from 'app/core/core_module';
 
 export default class TeamDetailsCtrl {
@@ -28,7 +26,7 @@ export default class TeamDetailsCtrl {
   removeTeamMember(teamMember: TeamMember) {
     this.$scope.appEvent('confirm-modal', {
       title: 'Remove Member',
-      text: 'Are you sure you want to remove ' + teamMember.name + ' from this group?',
+      text: 'Are you sure you want to remove ' + teamMember.login + ' from this group?',
       yesText: "Remove",
       icon: "fa-warning",
       onConfirm: () => {
@@ -71,6 +69,7 @@ export interface User {
 export interface TeamMember {
   userId: number;
   name: string;
+  login: string;
 }
 
 coreModule.controller('TeamDetailsCtrl', TeamDetailsCtrl);
diff --git a/public/sass/components/_modals.scss b/public/sass/components/_modals.scss
index 81009d20f3c..c05ce92bae5 100644
--- a/public/sass/components/_modals.scss
+++ b/public/sass/components/_modals.scss
@@ -48,6 +48,11 @@
   float: left;
   padding-top: $spacer * 0.75;
   margin: 0 $spacer*3 0 $spacer*1.5;
+
+  .gicon {
+    position: relative;
+    top: -2px;
+  }
 }
 
 .modal-header-close {