diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 1c025ed76..a46f8a23f 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -316,10 +316,20 @@ StScrollBar StButton#vhandle:active {
 .notification-button:focus,
 .notification-icon-button:focus,
 .hotplug-notification-item:focus,
-.modal-dialog-button:focus {
+.modal-dialog-button:focus,
+.app-view-control:focus {
     border-width: 2px;
 }
 
+.app-view-control:focus {
+    padding: 3px;
+}
+
+.app-view-control:first-child:ltr:focus,
+.app-view-control:last-child:rtl:focus {
+    border-right-width: 1px;
+}
+
 .candidate-page-button:active,
 .candidate-page-button:pressed,
 .notification-button:active,
diff --git a/src/gvc b/src/gvc
index 3d6aac673..03894efbc 160000
--- a/src/gvc
+++ b/src/gvc
@@ -1 +1 @@
-Subproject commit 3d6aac673b88fff548db57a75b82e8f14723c1fe
+Subproject commit 03894efbcd010faf53bbc6e27256d27485f721b8