--- a/devtools/client/themes/common.css
+++ b/devtools/client/themes/common.css
@@ -211,16 +211,21 @@ html|button, html|select {
 
 /* Keyboard focus highlight styles */
 
 :-moz-focusring {
   outline: var(--theme-focus-outline);
   outline-offset: -1px;
 }
 
+/* Remove text surrounding dot style */
+::-moz-focus-inner {
+  border: 0;
+}
+
 textbox[focused="true"] {
   border-color: var(--theme-focus-border-color-textbox);
   box-shadow: var(--theme-focus-box-shadow-textbox);
   transition: all 0.2s ease-in-out
 }
 
 textbox :-moz-focusring {
   box-shadow: none;

--- a/devtools/client/themes/variables.css
+++ b/devtools/client/themes/variables.css
@@ -62,17 +62,17 @@
   --theme-highlight-bluegrey: #0072ab;
   --theme-highlight-lightorange: #d97e00;
   --theme-highlight-orange: #f13c00;
   --theme-highlight-pink: #b82ee5;
   --theme-highlight-gray: #dde1e4;
 
   /* For accessibility purposes we want to enhance the focus styling. This
    * should improve keyboard navigation usability. */
-  --theme-focus-outline-color: #000000;
+  --theme-focus-outline-color: #0a84ff;
 
   /* Colors used in Graphs, like performance tools. Similar colors to Chrome's timeline. */
   --theme-graphs-green: #85d175;
   --theme-graphs-blue: #83b7f6;
   --theme-graphs-bluegrey: #0072ab;
   --theme-graphs-purple: #b693eb;
   --theme-graphs-yellow: #efc052;
   --theme-graphs-orange: #d97e00;
@@ -266,17 +266,17 @@
 }
 
 :root {
   --theme-focus-border-color-textbox: #0675d3;
   --theme-textbox-box-shadow: rgba(97,181,255,.75);
 
   /* For accessibility purposes we want to enhance the focus styling. This
    * should improve keyboard navigation usability. */
-  --theme-focus-outline: 1px dotted var(--theme-focus-outline-color);
+  --theme-focus-outline: 1px solid var(--theme-focus-outline-color);
   --theme-focus-box-shadow-textbox: 0 0 0 1px var(--theme-textbox-box-shadow);
 
   --toolbarbutton-background: var(--theme-toolbar-hover);
   --toolbarbutton-border-color: transparent;
   --toolbarbutton-hover-background: rgba(110,120,130,0.2);
   --toolbarbutton-hover-border-color: var(--toolbarbutton-border-color);
   --toolbarbutton-checked-background: var(--theme-selection-background);
   --toolbarbutton-checked-color: var(--theme-selection-color);