diff --git a/Paper/gtk-2.0/Entry/entry-border-notebook.png b/Paper/gtk-2.0/Entry/entry-border-notebook.png
new file mode 120000
index 0000000..c9d7d2d
--- /dev/null
+++ b/Paper/gtk-2.0/Entry/entry-border-notebook.png
@@ -0,0 +1 @@
+entry-border-active.png
\ No newline at end of file
diff --git a/Paper/gtk-3.0/apps/settings.css b/Paper/gtk-3.0/apps/settings.css
index 8f25d47..82348f4 100644
--- a/Paper/gtk-3.0/apps/settings.css
+++ b/Paper/gtk-3.0/apps/settings.css
@@ -38,14 +38,9 @@ CcWindow .header-bar GtkSwitch.trough:active {
 }
 
 CcWindow GtkSwitch.trough:active {
-    border: 1px solid shade(@settings, 0.8);
     background-color: @settings;
 }
 
-CcWindow GtkSwitch.slider:active {
-    border: 1px solid shade(@settings, 0.8);
-}
-
 CcWindow .header-bar GtkSwitch.slider:active:backdrop,
 CcWindow .header-bar GtkSwitch.slider:backdrop {
     background-color: shade(@settings, 0.9);
diff --git a/Paper/gtk-3.0/gtk-widgets.css b/Paper/gtk-3.0/gtk-widgets.css
index fc6ef8c..21a79d9 100644
--- a/Paper/gtk-3.0/gtk-widgets.css
+++ b/Paper/gtk-3.0/gtk-widgets.css
@@ -42,12 +42,13 @@
 
     padding: 0;
 
-    outline-color: alpha(#000, 0.2);
+    /*outline-color: alpha(#000, 0.2);*/
     outline-style: dashed;
-    outline-offset: -2px;
+    outline-offset: -3px;
     outline-width: 1px;
     outline-radius: 2px;
 
+    background: inherit;
     background-color: inherit;
     color: inherit;
 }
diff --git a/Paper/gtk-3.0/widgets/notebook.css b/Paper/gtk-3.0/widgets/notebook.css
index 01a73fd..69072a7 100644
--- a/Paper/gtk-3.0/widgets/notebook.css
+++ b/Paper/gtk-3.0/widgets/notebook.css
@@ -22,7 +22,6 @@
 
 .notebook {
     background-color: @base;
-    border:none;
     box-shadow:0 0 0 1px @border;
     background-clip: border-box;
 }
diff --git a/Paper/gtk-3.0/widgets/toolbars.css b/Paper/gtk-3.0/widgets/toolbars.css
index f648295..ce9d79c 100644
--- a/Paper/gtk-3.0/widgets/toolbars.css
+++ b/Paper/gtk-3.0/widgets/toolbars.css
@@ -89,7 +89,13 @@
 .toolbar .text-button:hover,
 .toolbar .text-button:active:hover,
 .toolbar .image-button:hover,
-.toolbar .image-button:active:hover {
+.toolbar .image-button:active:hover,
+.toolbar .button:focus,
+.toolbar .button:active:focus
+.toolbar .text-button:focus,
+.toolbar .text-button:active:focus,
+.toolbar .image-button:focus,
+.toolbar .image-button:active:focus {
     padding: 13px;
     border: none;
     background-color: alpha(#000, 0.1);