From: Robert Kaiser <robert@widebook.box.kairo.at>
Date: Sun, 17 Aug 2014 20:21:57 +0000 (+0200)
Subject: first part of syncing LCARStrek with Firefox 32 windows theme changes
X-Git-Tag: LCARStrek-2.29~22
X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=dccbbf95a71ca8f090dd41f6a9698eb33368c1a9

first part of syncing LCARStrek with Firefox 32 windows theme changes
---

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index f37015b0..f2b1fedc 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -114,6 +114,10 @@ menubar {
     color: #FF9F00;
   }
 
+  #main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) {
+    /*color: inherit;*/
+  }
+
   #TabsToolbar:-moz-lwtheme {
     /*background: linear-gradient(to top, @toolbarShadowColor@ 2px, transparent 2px);*/
   }
diff --git a/LCARStrek/browser/devtools/alerticon-warning@2x.png b/LCARStrek/browser/devtools/alerticon-warning@2x.png
new file mode 100644
index 00000000..c4a5c798
Binary files /dev/null and b/LCARStrek/browser/devtools/alerticon-warning@2x.png differ
diff --git a/LCARStrek/browser/devtools/common.css b/LCARStrek/browser/devtools/common.css
index 6d8d2e7b..fed30341 100644
--- a/LCARStrek/browser/devtools/common.css
+++ b/LCARStrek/browser/devtools/common.css
@@ -235,6 +235,10 @@ notification {
   margin: -4px; /* Compensate for the .panel-arrowcontent padding. */
 }
 
+.devtools-tooltip-variables-view-box .variable-or-property > .title {
+  -moz-padding-end: 6px;
+}
+
 /* Tooltip: Tiles */
 
 .devtools-tooltip-tiles {
diff --git a/LCARStrek/browser/devtools/computedview.css b/LCARStrek/browser/devtools/computedview.css
index 3523ce28..95730f7e 100644
--- a/LCARStrek/browser/devtools/computedview.css
+++ b/LCARStrek/browser/devtools/computedview.css
@@ -172,10 +172,24 @@ body {
 }
 
 .computedview-colorswatch {
-  display: inline-block;
   border-radius: 50%;
   width: 1em;
   height: 1em;
   vertical-align: text-top;
   -moz-margin-end: 5px;
+  display: inline-block;
+}
+
+.computedview-colorswatch::before {
+  content: '';
+  background-color: #9C9CFF;
+  background-image: linear-gradient(45deg, #A09090 25%, transparent 25%, transparent 75%, #A09090 75%, #A09090),
+                    linear-gradient(45deg, #A09090 25%, transparent 25%, transparent 75%, #A09090 75%, #A09090);
+  background-size: 12px 12px;
+  background-position: 0 0, 6px 6px;
+  position: absolute;
+  border-radius: 50%;
+  width: 1em;
+  height: 1em;
+  z-index: -1;
 }
diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css
index 48def113..cadd3429 100644
--- a/LCARStrek/browser/devtools/dark-theme.css
+++ b/LCARStrek/browser/devtools/dark-theme.css
@@ -138,9 +138,8 @@
 }
 
 .ruleview-colorswatch,
-.computedview-colorswatch,
-.markupview-colorswatch {
-/*  box-shadow: 0 0 0 1px rgba(0,0,0,0.5); */
+.computedview-colorswatch {
+/*  box-shadow: 0 0 0 1px #818181; */
 }
 
 .variables-view-scope:focus > .title,
diff --git a/LCARStrek/browser/devtools/debugger-blackbox@2x.png b/LCARStrek/browser/devtools/debugger-blackbox@2x.png
new file mode 100644
index 00000000..8f797cab
Binary files /dev/null and b/LCARStrek/browser/devtools/debugger-blackbox@2x.png differ
diff --git a/LCARStrek/browser/devtools/debugger-collapse@2x.png b/LCARStrek/browser/devtools/debugger-collapse@2x.png
new file mode 100644
index 00000000..6797bef9
Binary files /dev/null and b/LCARStrek/browser/devtools/debugger-collapse@2x.png differ
diff --git a/LCARStrek/browser/devtools/debugger-expand@2x.png b/LCARStrek/browser/devtools/debugger-expand@2x.png
new file mode 100644
index 00000000..a81b21e4
Binary files /dev/null and b/LCARStrek/browser/devtools/debugger-expand@2x.png differ
diff --git a/LCARStrek/browser/devtools/debugger-pause@2x.png b/LCARStrek/browser/devtools/debugger-pause@2x.png
new file mode 100644
index 00000000..1dd43349
Binary files /dev/null and b/LCARStrek/browser/devtools/debugger-pause@2x.png differ
diff --git a/LCARStrek/browser/devtools/debugger-toggleBreakpoints@2x.png b/LCARStrek/browser/devtools/debugger-toggleBreakpoints@2x.png
new file mode 100644
index 00000000..a90d5f6c
Binary files /dev/null and b/LCARStrek/browser/devtools/debugger-toggleBreakpoints@2x.png differ
diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css
index b3dfbab5..3f3299c1 100644
--- a/LCARStrek/browser/devtools/debugger.css
+++ b/LCARStrek/browser/devtools/debugger.css
@@ -27,6 +27,12 @@ window {
   list-style-image: url("debugger-blackbox.png");
 }
 
+@media (min-resolution: 2dppx) {
+  #black-box {
+    list-style-image: url(debugger-blackbox@2x.png);
+  }
+}
+
 #pretty-print {
   font-weight: bold;
 }
@@ -35,6 +41,12 @@ window {
   list-style-image: url("debugger-toggleBreakpoints.png");
 }
 
+@media (min-resolution: 2dppx) {
+  #toggle-breakpoints {
+    list-style-image: url(debugger-toggleBreakpoints@2x.png);
+  }
+}
+
 #sources-toolbar .devtools-toolbarbutton:not([label]) {
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
@@ -51,6 +63,24 @@ window {
   -moz-image-region: rect(16px, 32px, 32px, 16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #sources-toolbar .devtools-toolbarbutton:not([label]) {
+    -moz-image-region: rect(0px,32px,32px,0px);
+  }
+
+  #sources-toolbar .devtools-toolbarbutton:not([label]):hover {
+    -moz-image-region: rect(32px,32px,64px,0px);
+  }
+
+  #sources-toolbar .devtools-toolbarbutton:not([label])[checked] {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+
+  #sources-toolbar .devtools-toolbarbutton:not([label])[checked]:hover {
+    -moz-image-region: rect(32px,64px,64px,32px);
+  }
+}
+
 #sources .black-boxed {
   color: #8050B0;
 }
@@ -112,6 +142,18 @@ window {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #trace {
+    list-style-image: url(tracer-icon@2x.png);
+    -moz-image-region: rect(0px,32px,32px,0px);
+  }
+
+  #trace:hover,
+  #trace[checked] {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+}
+
 #clear-tracer {
   /* Make this button as narrow as the text inside it. */
   min-width: 1px;
@@ -277,10 +319,19 @@ window {
 }
 
 .dbg-expression-arrow {
+  background-image: url("commandline-icon.png");
+  background-position: 16px;
+  background-repeat: no-repeat;
+  background-size: 32px 16px;
   width: 16px;
-  height: auto;
+  height: 16px;
   margin: 2px;
-  background: -moz-image-rect(url("commandline-icon.png"), 0, 32, 16, 16);
+}
+
+@media (min-resolution: 2dppx) {
+  .dbg-expression-arrow {
+    background-image: url(commandline-icon@2x.png);
+  }
 }
 
 .dbg-expression-input {
@@ -290,11 +341,9 @@ window {
 .dbg-expression-button {
   border: none;
   background: none;
-  cursor: pointer;
   text-decoration: underline;
-}
+  cursor: pointer;
 
-.dbg-expression-button {
   color: #9C9CFF; /* Blue highlight color */
 }
 
@@ -475,7 +524,7 @@ window {
 /* Toolbar controls */
 
 .devtools-sidebar-tabs > tabs > tab {
-/*  min-height: 25px !important;
+/*  min-height: 24px !important;
   padding: 0 !important; */
 }
 
@@ -493,6 +542,12 @@ window {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
+#debugger-toolbar .devtools-toolbarbutton:not([label]) > .toolbarbutton-icon,
+#sources-toolbar .devtools-toolbarbutton:not([label]) > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
 #resume {
   list-style-image: url("chrome://browser/skin/devtools/debugger-pause.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
@@ -513,6 +568,26 @@ window {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #resume {
+    list-style-image: url(debugger-pause@2x.png);
+    -moz-image-region: rect(0px, 32px, 32px, 0px);
+  }
+
+  #resume:hover {
+    -moz-image-region: rect(0px, 64px, 32px, 32px);
+  }
+
+  #resume[checked=true] {
+    list-style-image: url(debugger-play@2x.png);
+    -moz-image-region: rect(0px, 32px, 32px, 0);
+  }
+
+  #resume[checked=true]:hover {
+    -moz-image-region: rect(0px, 64px, 32px, 32px);
+  }
+}
+
 #resume ~ toolbarbutton {
 /*  transition: opacity 0.15s ease-in-out; */
 }
@@ -545,6 +620,35 @@ window {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #step-over {
+    list-style-image: url(debugger-step-over@2x.png);
+    -moz-image-region: rect(0px, 32px, 32px, 0);
+  }
+
+  #step-over:hover {
+    -moz-image-region: rect(0px, 64px, 32px, 32px);
+  }
+
+  #step-in {
+    list-style-image: url(debugger-step-in@2x.png);
+    -moz-image-region: rect(0px, 32px, 32px, 0);
+  }
+
+  #step-in:hover {
+    -moz-image-region: rect(0px, 64px, 32px, 32px);
+  }
+
+  #step-out {
+    list-style-image: url(debugger-step-out@2x.png);
+    -moz-image-region: rect(0px, 32px, 32px, 0);
+  }
+
+  #step-out:hover {
+    -moz-image-region: rect(0px, 64px, 32px, 32px);
+  }
+}
+
 #instruments-pane-toggle {
 /*  background: none;
   box-shadow: none;
@@ -557,11 +661,25 @@ window {
   list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png");
 }
 
-#instruments-pane-toggle:hover,
-#instruments-pane-toggle:hover:active {
+#instruments-pane-toggle:hover {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #instruments-pane-toggle {
+    list-style-image: url(debugger-collapse@2x.png);
+    -moz-image-region: rect(0px,32px,32px,0px);
+  }
+
+  #instruments-pane-toggle[pane-collapsed] {
+    list-style-image: url(debugger-expand@2x.png);
+  }
+
+  #instruments-pane-toggle:hover {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+}
+
 /* Horizontal vs. vertical layout */
 
 #vertical-layout-panes-container {
diff --git a/LCARStrek/browser/devtools/editor-breakpoint@2x.png b/LCARStrek/browser/devtools/editor-breakpoint@2x.png
new file mode 100644
index 00000000..38a6f91f
Binary files /dev/null and b/LCARStrek/browser/devtools/editor-breakpoint@2x.png differ
diff --git a/LCARStrek/browser/devtools/netmonitor.css b/LCARStrek/browser/devtools/netmonitor.css
index b52494ba..d4cd744d 100644
--- a/LCARStrek/browser/devtools/netmonitor.css
+++ b/LCARStrek/browser/devtools/netmonitor.css
@@ -21,8 +21,7 @@ window {
   min-width: 30px;
   min-height: 28px;
   margin: 0;
-  list-style-image: url("profiler-stopwatch.png");
-  -moz-image-region: rect(0px,32px,16px,16px);
+  list-style-image: url("profiler-stopwatch.svg");
 }
 
 #requests-menu-perf-notice-button .button-text {
@@ -500,8 +499,7 @@ box.requests-menu-status[code^="5"] {
 /* Performance analysis buttons */
 
 #requests-menu-network-summary-button {
-  list-style-image: url("profiler-stopwatch.png");
-  -moz-image-region: rect(0px,32px,16px,16px);
+  list-style-image: url("profiler-stopwatch.svg");
   -moz-padding-end: 0;
   cursor: pointer;
 }
diff --git a/LCARStrek/browser/devtools/profiler.css b/LCARStrek/browser/devtools/profiler.css
index 858d28f5..e5e40f45 100644
--- a/LCARStrek/browser/devtools/profiler.css
+++ b/LCARStrek/browser/devtools/profiler.css
@@ -69,18 +69,11 @@ window {
 }
 
 #profiler-start {
-  list-style-image: url("chrome://browser/skin/devtools/profiler-stopwatch.png");
-  -moz-image-region: rect(0px,16px,16px,0px);
-}
-
-#profiler-start:hover {
-  -moz-image-region: rect(16px,16px,32px,0px);
-}
-
-#profiler-start[checked] {
-  -moz-image-region: rect(0px,32px,16px,16px);
+  list-style-image: url("chrome://browser/skin/devtools/profiler-stopwatch-tbutton.svg");
 }
 
+#profiler-start:hover,
+#profiler-start[checked],
 #profiler-start[checked]:hover {
-  -moz-image-region: rect(16px,32px,32px,16px);
+  list-style-image: url("chrome://browser/skin/devtools/profiler-stopwatch.svg");
 }
diff --git a/LCARStrek/browser/devtools/ruleview.css b/LCARStrek/browser/devtools/ruleview.css
index 2d595e14..c970fc26 100644
--- a/LCARStrek/browser/devtools/ruleview.css
+++ b/LCARStrek/browser/devtools/ruleview.css
@@ -45,7 +45,7 @@
 }
 
 .ruleview-warning {
-  background: url("chrome://browser/skin/devtools/alerticon-warning.png");
+  background: url("alerticon-warning.png");
   -moz-margin-start: 5px;
   display: inline-block;
   vertical-align: top;
@@ -53,6 +53,12 @@
   height: 12px;
 }
 
+@media (min-resolution: 2dppx) {
+  .ruleview-warning {
+    background-image: url("alerticon-warning@2x.png");
+  }
+}
+
 .ruleview-ruleopen {
   -moz-padding-end: 5px;
 }
@@ -103,6 +109,21 @@
   height: 1em;
   vertical-align: text-top;
   -moz-margin-end: 5px;
+  display: inline-block;
+}
+
+.ruleview-colorswatch::before {
+  content: '';
+  background-color: #9C9CFF;
+  background-image: linear-gradient(45deg, #A09090 25%, transparent 25%, transparent 75%, #A09090 75%, #A09090),
+                    linear-gradient(45deg, #A09090 25%, transparent 25%, transparent 75%, #A09090 75%, #A09090);
+  background-size: 12px 12px;
+  background-position: 0 0, 6px 6px;
+  position: absolute;
+  border-radius: 50%;
+  width: 1em;
+  height: 1em;
+  z-index: -1;
 }
 
 .ruleview-overridden {
diff --git a/LCARStrek/browser/devtools/webaudioeditor.css b/LCARStrek/browser/devtools/webaudioeditor.css
index 552c29ae..f4d70cc7 100644
--- a/LCARStrek/browser/devtools/webaudioeditor.css
+++ b/LCARStrek/browser/devtools/webaudioeditor.css
@@ -87,6 +87,12 @@ g.selected text {
   transition: opacity .5s ease-out 0s;
 }
 
+@media (min-resolution: 2dppx) {
+  .web-audio-inspector .error {
+    background-image: url(alerticon-warning@2x.png);
+  }
+}
+
 #inspector-pane-toggle {
   background: none;
   box-shadow: none;
@@ -146,3 +152,19 @@ g.selected text {
     margin-right: 0px !important;
   }
 }
+
+#inspector-pane-toggle {
+  background: none;
+  box-shadow: none;
+  border: none;
+  list-style-image: url("debugger-collapse.png");
+  -moz-image-region: rect(0px,16px,16px,0px);
+}
+
+#inspector-pane-toggle[pane-collapsed] {
+  list-style-image: url("debugger-expand.png");
+}
+
+#inspector-pane-toggle:active {
+  -moz-image-region: rect(0px,32px,16px,16px);
+}
diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css
index dfd38971..dd6e6416 100644
--- a/LCARStrek/browser/devtools/webconsole.css
+++ b/LCARStrek/browser/devtools/webconsole.css
@@ -49,16 +49,30 @@ a {
 }
 
 .message > .icon {
-  background: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 0, 1, 0, 0) no-repeat;
-  background-position: center;
   flex: 0 0 auto;
   margin: 3px 6px 0 0;
   padding: 0 4px;
-  width: 8px;
   height: 1em;
   align-self: flex-start;
 }
 
+.message > .icon::before {
+  content: "";
+  background-image: url("chrome://browser/skin/devtools/webconsole.png");
+  background-position: 8px 8px;
+  background-repeat: no-repeat;
+  background-size: 48px 40px;
+  width: 8px;
+  height: 8px;
+  display: inline-block;
+}
+
+@media (min-resolution: 2dppx) {
+  .message > .icon::before {
+    background-image: url("chrome://browser/skin/devtools/webconsole@2x.png");
+  }
+}
+
 .message > .message-body-wrapper {
   flex: 1 1 100%;
   margin: 3px;
@@ -227,8 +241,8 @@ a {
   -moz-border-end: solid #FF0000 6px;
 }
 
-.message[category=network][severity=error] > .icon {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 0, 16, 8, 8);
+.message[category=network][severity=error] > .icon::before {
+  background-position: -8px 0;
 }
 
 .message[category=network] > .message-body {
@@ -273,12 +287,12 @@ a {
   -moz-border-end: solid #9C9CFF 6px;
 }
 
-.message[category=cssparser][severity=error] > .icon {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 8, 16, 16, 8);
+.message[category=cssparser][severity=error] > .icon::before {
+  background-position: -8px -8px;
 }
 
-.message[category=cssparser][severity=warn] > .icon {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 8, 24, 16, 16);
+.message[category=cssparser][severity=warn] > .icon::before {
+  background-position: -16px -8px;
 }
 
 /* JS styles */
@@ -291,12 +305,12 @@ a {
   -moz-border-end: solid #FF9F00 6px;
 }
 
-.message[category=exception][severity=error] > .icon {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 16, 16, 24, 8);
+.message[category=exception][severity=error] > .icon::before {
+  background-position: -8px -16px;
 }
 
-.message[category=exception][severity=warn] > .icon {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 16, 24, 24, 16);
+.message[category=exception][severity=warn] > .icon::before {
+  background-position: -16px -16px;
 }
 
 /* Web Developer styles */
@@ -309,17 +323,17 @@ a {
   -moz-border-end: solid #8050B0 6px;
 }
 
-.message[category=console][severity=error] > .icon,
-.message[category=output][severity=error] > .icon {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 24, 16, 32, 8);
+.message[category=console][severity=error] > .icon::before,
+.message[category=output][severity=error] > .icon::before {
+  background-position: -8px -24px;
 }
 
-.message[category=console][severity=warn] > .icon {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 24, 24, 32, 16);
+.message[category=console][severity=warn] > .icon::before {
+  background-position: -16px -24px;
 }
 
-.message[category=console][severity=info] > .icon {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 24, 32, 32, 24);
+.message[category=console][severity=info] > .icon::before {
+  background-position: -24px -24px;
 }
 
 /* Input and output styles */
@@ -328,12 +342,12 @@ a {
   -moz-border-end: solid #A09090 6px;
 }
 
-.message[category=input] > .icon {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 24, 40, 32, 32);
+.message[category=input] > .icon::before {
+  background-position: -32px -24px;
 }
 
-.message[category=output] > .icon {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 24, 48, 32, 40);
+.message[category=output] > .icon::before {
+  background-position: -40px -24px;
 }
 
 /* JSTerm Styles */
@@ -346,7 +360,15 @@ a {
 }
 
 .jsterm-input-node {
-  background: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16) no-repeat;
+  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
+  background-repeat: no-repeat;
+  background-size: 16px 16px;
+}
+
+@media (min-resolution: 2dppx) {
+  .jsterm-input-node {
+    background-image: -moz-image-rect(url('chrome://browser/skin/devtools/commandline-icon@2x.png'), 0, 64, 32, 32);
+  }
 }
 
 :-moz-any(.jsterm-input-node,
@@ -389,12 +411,12 @@ a {
   border-color: #FFCF00;
 }
 
-.message[category=security][severity=error] > .icon {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 32, 16, 40, 8);
+.message[category=security][severity=error] > .icon::before {
+  background-position: -8px -32px;
 }
 
-.message[category=security][severity=warn] > .icon {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/webconsole.png"), 32, 24, 40, 16);
+.message[category=security][severity=warn] > .icon::before {
+  background-position: -16px -32px;
 }
 
 .navigation-marker {
diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css
index b699b78e..0b0a6e77 100644
--- a/LCARStrek/browser/devtools/widgets.css
+++ b/LCARStrek/browser/devtools/widgets.css
@@ -575,6 +575,7 @@
 
 .variable-or-property-non-writable-icon {
   background: url("chrome://browser/skin/devtools/vview-lock.png") no-repeat;
+  background-size: cover;
   width: 16px;
   height: 16px;
   opacity: 0.5;
@@ -583,13 +584,13 @@
 @media (min-resolution: 2dppx) {
   .variable-or-property-non-writable-icon > .title:after {
     background-image: url("chrome://browser/skin/devtools/vview-lock@2x.png");
-    background-size: 32px;
   }
 }
 
 .variable-or-property-frozen-label,
 .variable-or-property-sealed-label,
 .variable-or-property-non-extensible-label {
+  height: 16px;
   -moz-padding-end: 4px;
 }
 
@@ -616,9 +617,29 @@
 
 /* Actions first */
 
+.variables-view-open-inspector {
+  -moz-box-ordinal-group: 1;
+}
+
+.variables-view-edit,
+.variables-view-add-property {
+  -moz-box-ordinal-group: 2;
+}
+
+.variable-or-property-frozen-label,
+.variable-or-property-sealed-label,
+.variable-or-property-non-extensible-label,
+.variable-or-property-non-writable-icon {
+  -moz-box-ordinal-group: 3;
+}
+
+.variables-view-delete {
+  -moz-box-ordinal-group: 4;
+}
+
 .variables-view-container[actions-first] .variables-view-delete,
-.variables-view-container[actions-first] .variables-view-open-inspector,
-.variables-view-container[actions-first] .variables-view-add-property {
+.variables-view-container[actions-first] .variables-view-add-property,
+.variables-view-container[actions-first] .variables-view-open-inspector {
   -moz-box-ordinal-group: 0;
 }
 
@@ -654,70 +675,88 @@
 /* Variables and properties editing */
 
 .variables-view-delete {
-  list-style-image: url("chrome://browser/skin/devtools/vview-delete.png");
-  -moz-image-region: rect(0,16px,16px,0);
+  background: url("chrome://browser/skin/devtools/vview-delete.png");
+  background-size: cover;
+  width: 16px;
+  height: 16px;
+}
+
+@media (min-resolution: 2dppx) {
+  .variables-view-delete {
+    background-image: url("chrome://browser/skin/devtools/vview-delete@2x.png");
+  }
 }
 
 .variables-view-delete:hover {
-  -moz-image-region: rect(0,48px,16px,32px);
+  background-position: 32px;
 }
 
 .variables-view-delete:active {
-  -moz-image-region: rect(0,32px,16px,16px);
+  background-position: 16px;
 }
 
-.variable-or-property:focus .variables-view-delete {
-/*  -moz-image-region: rect(0,16px,16px,0); */
+.variable-or-property:focus > .title > .variables-view-delete {
+/*  background-position: 0px; */
 }
 
 .variables-view-edit {
-  list-style-image: url("chrome://browser/skin/devtools/vview-edit.png");
-  -moz-image-region: rect(0,16px,16px,0);
+  background: url("chrome://browser/skin/devtools/vview-edit.png");
+  background-size: cover;
+  width: 16px;
+  height: 16px;
   cursor: pointer;
-  padding-left: 2px;
+}
+
+@media (min-resolution: 2dppx) {
+  .variables-view-edit {
+    background-image: url("chrome://browser/skin/devtools/vview-edit@2x.png");
+  }
 }
 
 .variables-view-edit:hover {
- -moz-image-region: rect(0,48px,16px,32px);
+  background-position: 32px;
 }
 
 .variables-view-edit:active {
-  -moz-image-region: rect(0,32px,16px,16px);
+  background-position: 16px;
 }
 
-.variable-or-property:focus .variables-view-edit {
-/*  -moz-image-region: rect(0,16px,16px,0); */
+.variable-or-property:focus > .title > .variables-view-edit {
+/*  background-position: 0px; */
 }
 
 .variables-view-open-inspector {
-  list-style-image: url("chrome://browser/skin/devtools/vview-open-inspector.png");
-  -moz-image-region: rect(0,16px,16px,0);
+  background: url("chrome://browser/skin/devtools/vview-open-inspector.png");
+  background-size: cover;
+  width: 16px;
+  height: 16px;
   cursor: pointer;
 }
 
 .variables-view-open-inspector:hover {
-  -moz-image-region: rect(0,48px,16px,32px);
+  background-position: 32px;
 }
 
 .variables-view-open-inspector:active {
-  -moz-image-region: rect(0,32px,16px,16px);
+  background-position: 16px;
 }
 
-.variable-or-property:focus .variables-view-open-inspector {
-/*  -moz-image-region: rect(0,16px,16px,0); */
+.variable-or-property:focus > .title > .variables-view-open-inspector {
+/*  background-position: 0px; */
 }
 
-.variables-view-throbber {
-  background: url("chrome://global/skin/icons/loading_16.png") center no-repeat;
-  width: 16px;
-  height: 16px;
-}
+/* Variables and properties input boxes */
 
-.element-value-input {
+.variable-or-property > .title > .separator + .element-value-input {
   -moz-margin-start: -2px !important;
   -moz-margin-end: 2px !important;
 }
 
+.variable-or-property > .title > .separator[hidden=true] + .element-value-input {
+  -moz-margin-start: 4px !important;
+  -moz-margin-end: 2px !important;
+}
+
 .element-name-input {
   -moz-margin-start: -2px !important;
   -moz-margin-end: 2px !important;
diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css
index b4ef5199..27718a4e 100644
--- a/LCARStrek/browser/preferences/in-content/preferences.css
+++ b/LCARStrek/browser/preferences/in-content/preferences.css
@@ -213,6 +213,12 @@ button[type="menu"] > menupopup > menu[_moz-menuactive="true"],
 button[type="menu"] > menupopup > menuitem[_moz-menuactive="true"] {
 }
 
+menulist > menupopup > menu[selected="true"],
+menulist > menupopup > menuitem[selected="true"],
+button[type="menu"] > menupopup > menu[selected="true"],
+button[type="menu"] > menupopup > menuitem[selected="true"] {
+}
+
 menulist > menupopup menuseparator,
 button[type="menu"] > menupopup menuseparator {
 }
@@ -251,13 +257,6 @@ html|a.inline-link {
 .checkbox-check[checked] {
 }
 
-checkbox:hover::before,
-checkbox[checked]::before {
-}
-
-checkbox[checked]::before {
-}
-
 radio {
 }
 
@@ -267,13 +266,6 @@ radio {
 .radio-check[selected] {
 }
 
-radio:hover::before,
-radio[selected]::before {
-}
-
-radio[selected]::before {
-}
-
 /* Category List */
 
 #categories {