diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index c5de4e3fb..f56e27208 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -684,14 +684,6 @@ StScrollBar {
     }
   }
   
-  .panel-status-button {
-  
-    &:active, &:overview, &:focus, &:checked {
-      border-color: lighten($selected_bg_color,5%);
-      border-bottom-width: 2px;
-    }
-  }
-  
   .panel-status-indicators-box,
   .panel-status-menu-box {
     spacing: 2px;
diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index 588f79d6c..48ee64df4 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -579,9 +579,6 @@ StScrollBar {
       color: white; }
       .unlock-screen #panel .panel-button:focus, .unlock-screen #panel .panel-button:hover, .unlock-screen #panel .panel-button:active, .login-screen #panel .panel-button:focus, .login-screen #panel .panel-button:hover, .login-screen #panel .panel-button:active, .lock-screen #panel .panel-button:focus, .lock-screen #panel .panel-button:hover, .lock-screen #panel .panel-button:active {
         color: white; }
-  #panel .panel-status-button:active, #panel .panel-status-button:overview, #panel .panel-status-button:focus, #panel .panel-status-button:checked {
-    border-color: #256ab1;
-    border-bottom-width: 2px; }
   #panel .panel-status-indicators-box,
   #panel .panel-status-menu-box {
     spacing: 2px; }
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index f390028e9..0431e97d0 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -579,9 +579,6 @@ StScrollBar {
       color: white; }
       .unlock-screen #panel .panel-button:focus, .unlock-screen #panel .panel-button:hover, .unlock-screen #panel .panel-button:active, .login-screen #panel .panel-button:focus, .login-screen #panel .panel-button:hover, .login-screen #panel .panel-button:active, .lock-screen #panel .panel-button:focus, .lock-screen #panel .panel-button:hover, .lock-screen #panel .panel-button:active {
         color: white; }
-  #panel .panel-status-button:active, #panel .panel-status-button:overview, #panel .panel-status-button:focus, #panel .panel-status-button:checked {
-    border-color: #256ab1;
-    border-bottom-width: 2px; }
   #panel .panel-status-indicators-box,
   #panel .panel-status-menu-box {
     spacing: 2px; }
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 3595a39d0..e3938d541 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -589,7 +589,6 @@ const InputSourceIndicator = new Lang.Class({
         this._hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
 
         this.actor.add_child(this._hbox);
-        this.actor.add_style_class_name('panel-status-button');
 
         this._propSeparator = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(this._propSeparator);