diff --git a/library/ttk/classicTheme.tcl b/library/ttk/classicTheme.tcl
index 7964034bb..b65dfacc0 100644
--- a/library/ttk/classicTheme.tcl
+++ b/library/ttk/classicTheme.tcl
@@ -123,7 +123,17 @@ namespace eval ttk::theme::classic {
 	#
 	# Toolbar buttons:
 	#
-	ttk::style configure Toolbutton -padding 1.5p -relief flat -shiftrelief 2
+	ttk::style layout Toolbutton {
+	    Toolbutton.focus -children {
+		Toolbutton.border -children {
+		    Toolbutton.padding -children {
+			Toolbutton.label
+		    }
+		}
+	    }
+	}
+	ttk::style configure Toolbutton -padding 1.5p -relief flat \
+	    -shiftrelief 2 -focussolid 1
 	ttk::style map Toolbutton -relief \
 	    {disabled flat selected sunken pressed sunken active raised}
 	ttk::style map Toolbutton -background \
diff --git a/library/ttk/defaults.tcl b/library/ttk/defaults.tcl
index 226bd39b8..6b1de5d1f 100644
--- a/library/ttk/defaults.tcl
+++ b/library/ttk/defaults.tcl
@@ -211,12 +211,13 @@ proc ttk::theme::default::reconfigureDefaultTheme {} {
 	#
 	ttk::style layout Toolbutton {
 	    Toolbutton.border -children {
-		Toolbutton.padding -children {
-		    Toolbutton.label
+		Toolbutton.focus -children {
+		    Toolbutton.padding -children {
+			Toolbutton.label
+		    }
 		}
 	    }
 	}
-
 	ttk::style configure Toolbutton \
 	    -padding 1.5p -relief flat
 	ttk::style map Toolbutton -relief \