diff --git a/src/accordion/accordion-group.component.html b/src/accordion/accordion-group.component.html
index 4a9c16f4a6..475292226a 100644
--- a/src/accordion/accordion-group.component.html
+++ b/src/accordion/accordion-group.component.html
@@ -1,6 +1,8 @@
 <div class="panel card" [ngClass]="panelClass">
   <div class="panel-heading card-header" role="tab"
-       (click)="toggleOpen()">
+       (click)="toggleOpen()" 
+       [ngClass]="isDisabled ? 'panel-disabled' : 'panel-enabled'">
+    
     <div class="panel-title">
       <div role="button" class="accordion-toggle"
            [attr.aria-expanded]="isOpen">
diff --git a/src/accordion/accordion-group.component.ts b/src/accordion/accordion-group.component.ts
index 045e86ddb6..16732eed59 100644
--- a/src/accordion/accordion-group.component.ts
+++ b/src/accordion/accordion-group.component.ts
@@ -16,7 +16,8 @@ import { AccordionComponent } from './accordion.component';
   host: {
     class: 'panel',
     style: 'display: block'
-  }
+  },
+  styleUrls: ['./accordion.scss']
 })
 export class AccordionPanelComponent implements OnInit, OnDestroy {
   /** turn on/off animation */
diff --git a/src/accordion/accordion.scss b/src/accordion/accordion.scss
new file mode 100644
index 0000000000..d1a8d8e082
--- /dev/null
+++ b/src/accordion/accordion.scss
@@ -0,0 +1,15 @@
+:host {
+ .card-header {
+   &.panel-enabled {
+     cursor: pointer;
+   }
+   &.panel-disabled {
+     .btn {
+       &.btn-link {
+         cursor: default;
+         text-decoration: none;
+       }
+     }
+   }
+ }
+}
\ No newline at end of file
diff --git a/src/tabs/tabs.scss b/src/tabs/tabs.scss
new file mode 100644
index 0000000000..d0cdd8520e
--- /dev/null
+++ b/src/tabs/tabs.scss
@@ -0,0 +1,13 @@
+:host {
+  .nav-tabs {
+    .nav-item {
+      &.disabled {
+        a {
+          &.disabled {
+            cursor: default;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/tabs/tabset.component.ts b/src/tabs/tabset.component.ts
index 25f2072bef..c1a5b63097 100644
--- a/src/tabs/tabset.component.ts
+++ b/src/tabs/tabset.component.ts
@@ -6,7 +6,8 @@ import { TabsetConfig } from './tabset.config';
 // todo: fix? mixing static and dynamic tabs position tabs in order of creation
 @Component({
   selector: 'tabset',
-  templateUrl: './tabset.component.html'
+  templateUrl: './tabset.component.html',
+  styleUrls: ['./tabs.scss']
 })
 export class TabsetComponent implements OnDestroy {
   /** if true tabs will be placed vertically */