diff --git a/core/modules/views_ui/css/views_ui.admin.theme.css b/core/modules/views_ui/css/views_ui.admin.theme.css
index e88d2fa..99c350c 100644
--- a/core/modules/views_ui/css/views_ui.admin.theme.css
+++ b/core/modules/views_ui/css/views_ui.admin.theme.css
@@ -467,20 +467,30 @@ td.group-title {
  * The tabs that switch between sections
  */
 
-ul#views-display-menu-tabs {
+.views-displays .tabs.secondary {
   margin-right: 200px;
+  border: 0;
 }
 
-ul#views-display-menu-tabs li {
+.views-displays .tabs.secondary li {
+  background: transparent;
   margin-bottom: 5px;
+  border: 0;
+  padding: 0;
+  width: auto;
 }
 
-ul#views-display-menu-tabs li.add ul.action-list li{
+.views-displays .tabs.secondary li.add ul.action-list li{
   margin: 0;
 }
 
-.views-displays .secondary a {
+.views-displays .tabs.secondary li {
+  margin: 0 5px 0 6px;
+}
+
+.views-displays .tabs.secondary a {
   border: 1px solid #cbcbcb;
+  border-radius: 7px;
   display: inline-block;
   font-size: small;
   line-height: 1.3333;
@@ -490,65 +500,66 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 /**
  * Display a red border if the display doesn't validate.
  */
-.views-displays ul.secondary li.active a.active.error,
-.views-displays .secondary a.error {
+.views-displays .tabs.secondary li.active a.active.error,
+.views-displays .tabs.secondary a.error {
   border: 2px solid #ed541d;
   padding: 1px 6px;
 }
 
-.views-displays .secondary a:focus {
+.views-displays .tabs.secondary a:focus {
   outline: none;
 }
 
-.views-displays ul.secondary li a {
+.views-displays .tabs.secondary li a {
   background-color: #fff;
 }
 
-.views-displays ul.secondary li a:hover,
-.views-displays ul.secondary li.active a,
-.views-displays ul.secondary li.active a.active {
+.views-displays .tabs.secondary li a:hover,
+.views-displays .tabs.secondary li.active a,
+.views-displays .tabs.secondary li.active a.active {
   background-color: #555;
   color: #fff;
 }
 
-.views-displays .secondary .open > a {
+.views-displays .tabs.secondary .open > a {
   background-color: #f1f1f1;
   border-bottom: 1px solid transparent;
   position: relative;
 }
 
-.views-displays .secondary .open > a:hover {
+.views-displays .tabs.secondary .open > a:hover {
   background-color: #f1f1f1;
 }
 
-.views-displays .secondary .action-list  li {
+.views-displays .tabs.secondary .action-list  li {
   background-color: #f1f1f1;
   border-color: #cbcbcb;
   border-style: solid;
   border-width: 0 1px;
   padding: 2px 9px;
+
 }
 
-.views-displays .secondary .action-list  li:first-child {
+.views-displays .tabs.secondary .action-list  li:first-child {
   border-width: 1px 1px 0;
 }
 
-.views-displays .secondary .action-list  li.last {
+.views-displays .tabs.secondary .action-list  li.last {
   border-width: 0 1px 1px;
 }
 
-.views-displays .secondary .action-list  li:last-child {
+.views-displays .tabs.secondary .action-list  li:last-child {
   border-width: 0 1px 1px;
 }
 
-.views-displays .secondary .action-list input.form-submit {
+.views-displays .tabs.secondary .action-list input.form-submit {
   background: none repeat scroll 0 0 transparent;
   border: medium none;
   margin: 0;
   padding: 0;
 }
 
-.views-displays .secondary .action-list li:hover {
+.views-displays .tabs.secondary .action-list li:hover {
   background-color: #ddd;
 }
 
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index a2f2fe9..84f56ce 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -99,7 +99,7 @@ function seven_menu_local_task($variables) {
   }
   $class = 'tabs__tab';
   if(!empty($variables['element']['#active'])) {
-    $class .= ' is-active';
+    $class .= ' active';
   }
 
   return '<li class="' . $class . '"">' . l($link_text, $link['href'], $link['localized_options']) . '</li>';
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index c7d3e61..2055ec9 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -345,7 +345,7 @@ li.tabs__tab a {
 .tabs.primary .tabs__tab:last-child {
   border-radius: 0 0 4px 4px;
 }
-.tabs.primary .tabs__tab.is-active {
+.tabs.primary .tabs__tab.active {
   z-index: 15;
   border-color: #a6a6a6;
   background-color: #ffffff;
@@ -362,7 +362,7 @@ li.tabs__tab a {
   font-weight: bold;
   line-height: 1em;
 }
-.tabs.primary a.is-active:after {
+.tabs.primary a.active:after {
   color: #CCC;
 }
 .tabs__trigger {
@@ -403,7 +403,7 @@ li.tabs__tab a {
 .is-collapse-enabled .tabs.primary .tabs__tab {
   border-radius: 0;
 }
-.is-collapse-enabled .tabs__tab.is-active {
+.is-collapse-enabled .tabs__tab.active {
   position: absolute;
   top: 2px;
   left: 0;
@@ -413,7 +413,7 @@ li.tabs__tab a {
 .is-collapse-enabled .tabs.primary a.active:after {
   content: none;
 }
-.is-open .tabs__tab.is-active {
+.is-open .tabs__tab.active {
   border-color: #a6a6a6;
   background-color: #ffffff;
   color: #004f80;
@@ -437,7 +437,7 @@ li.tabs__tab a {
 .is-horizontal .tabs__tab + .tabs__tab {
   margin-left: -1px;
 }
-.is-horizontal .tabs__tab.is-active {
+.is-horizontal .tabs__tab.active {
   position: relative;
   width: auto;
   top: 0;
@@ -504,7 +504,7 @@ li.tabs__tab a {
   border-top: 0;
   padding: 0;
 }
-.is-horizontal .tabs.secondary .tabs__tab.is-active {
+.is-horizontal .tabs.secondary .tabs__tab.active {
   border-bottom-color: #004f80;
 }
 .is-horizontal .tabs.secondary .tabs__tab:focus,