From: Robert Kaiser <robert@widebook.box.kairo.at>
Date: Mon, 28 May 2012 20:34:36 +0000 (+0200)
Subject: finish sync of LCARStrek with Firefox 13 winstripe changes
X-Git-Tag: LCARStrek-2.10~5
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=8d7ef0d90b767f02a75010e15f34fc004beb7c7c;p=themes.git

finish sync of LCARStrek with Firefox 13 winstripe changes
---

diff --git a/LCARStrek/browser/aboutCertError.css b/LCARStrek/browser/aboutCertError.css
index 8d52a846..ca0ddc21 100644
--- a/LCARStrek/browser/aboutCertError.css
+++ b/LCARStrek/browser/aboutCertError.css
@@ -91,32 +91,30 @@ body[dir="rtl"] #errorPageContainer {
   -moz-margin-start: 80px;
 }
 
-#technicalContent > h2, #expertContent > h2 {
+.expander > button {
   -moz-padding-start: 20px;
+  -moz-margin-start: -20px;
+  background: url("chrome://global/skin/tree/twisty-open-selected.gif") left center no-repeat;
+  border: none;
+  font: inherit;
+  color: inherit;
   cursor: pointer;
-  background-image: url("chrome://global/skin/tree/twisty-open-selected.gif");
-  background-position: 5px center;
-  background-repeat: no-repeat;
 }
 
-#technicalContent > h2:hover,
-#technicalContent > h2:hover:active,
-#expertContent > h2:hover,
-#expertContent > h2:hover:active {
+.expander > button:hover,
+.expander > button:hover:active {
   background-color: #FFCF00;
+  color: #000000;
 }
 
-#technicalContent[collapsed] > h2,
-#expertContent[collapsed] > h2 {
-  background-image: url("chrome://global/skin/tree/twisty-closed-selected.gif");
+body[dir="rtl"] .expander > button {
+  background-position: right center;
 }
 
-#technicalContent[collapsed] > p,
-#expertContent[collapsed] > div {
-  display: none;
+.expander[collapsed] > button {
+  background-image: url("chrome://global/skin/tree/twisty-closed-selected.gif");
 }
 
-#technicalContentText {
-  overflow: auto;
-  white-space: pre-wrap;
+body[dir="rtl"] .expander[collapsed] > button {
+  background-image: url("chrome://global/skin/tree/twisty-closed-rtl-selected.gif");
 }
diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index ec255acb..7913c484 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -1140,7 +1140,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 /* ::::: fullscreen window controls ::::: */
 
-#TabsToolbar > #window-controls {
+#window-controls {
   -moz-margin-start: 4px;
 }
 
@@ -2157,6 +2157,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png");
 }
 
+.popup-notification-icon[popupid="webapps-install"] {
+  list-style-image: url("chrome://browser/skin/webapps-64.png");
+}
+
 /* Notification icon box */
 #notification-popup-box {
   position: relative;
@@ -2209,6 +2213,10 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   list-style-image: url("chrome://mozapps/skin/passwordmgr/key-16.png");
 }
 
+#webapps-notification-icon {
+  list-style-image: url("chrome://browser/skin/webapps-16.png");
+}
+
 #identity-popup-container {
   min-width: 280px;
 }
@@ -2498,16 +2506,21 @@ highlighter-veil-transparentbox {
 
 /* Highlighter toolbar */
 
+#inspector-inspect-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#inspector-inspect-toolbutton[checked],
+#inspector-inspect-toolbutton:hover {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
 #inspector-toolbar {
   border-top: 3px solid #000000;
   border-bottom: none;
 }
 
-#inspector-toolbar[treepanel-open] {
-  padding-top: 0;
-  -moz-padding-end: 0;
-}
-
 #inspector-tools {
   -moz-padding-end: 2px;
   border-left: 3px solid #000000;
@@ -2519,13 +2532,8 @@ highlighter-veil-transparentbox {
   background-color: #000000;
 }
 
-/* Highlighter - toolbar resizer */
-
-#inspector-top-resizer {
-  -moz-appearance: none;
-  cursor: n-resize;
-  background: none;
-  height: 4px;
+html|*#highlighter-nodeinfobar-pseudo-classes {
+  color: #FF9F00;
 }
 
 /* Highlighter - Node Infobar */
@@ -2546,7 +2554,8 @@ html|*#highlighter-nodeinfobar-id {
   border: 1px solid rgba(156, 156, 255, .5);
   border-radius: 3px;
   padding: 8px 16px;
-  background: #000000 padding-box;
+  background-color: #000000;
+  background-clip: padding-box;
 }
 
 .highlighter-nodeinfobar-arrow {
@@ -2635,6 +2644,10 @@ html|*#highlighter-nodeinfobar-id {
   /*color: hsl(205,100%,70%); */
 }
 
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
+  color: #FF9F00;
+}
+
 .inspector-breadcrumbs-id,
 .inspector-breadcrumbs-classes {
   /*color: #8d99a6; */
@@ -2646,6 +2659,10 @@ html|*#highlighter-nodeinfobar-id {
   min-height: 25px;
 }
 
+.inspector-breadcrumbs-pseudo-classes {
+  color: #FFCF00;
+}
+
 /* Highlighter toolbar - breadcrumbs - LTR */
 
 .inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
@@ -2765,3 +2782,12 @@ html|*#highlighter-nodeinfobar-id {
 .inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
   -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 2 13 2 13 stretch;
 }
+
+/* Highlighter toolbar - HTML Tree */
+
+#inspector-tree-splitter {
+  border: none;
+  min-height: 3px;
+  height: 3px;
+  position: relative;
+}
diff --git a/LCARStrek/browser/devtools/alerticon-warning.png b/LCARStrek/browser/devtools/alerticon-warning.png
new file mode 100644
index 00000000..1a28eb7b
Binary files /dev/null and b/LCARStrek/browser/devtools/alerticon-warning.png differ
diff --git a/LCARStrek/browser/devtools/common.css b/LCARStrek/browser/devtools/common.css
index 7b59acf5..e5480f7c 100644
--- a/LCARStrek/browser/devtools/common.css
+++ b/LCARStrek/browser/devtools/common.css
@@ -46,6 +46,10 @@
 .devtools-toolbarbutton > .toolbarbutton-icon {
 }
 
+.devtools-toolbarbutton:not([label]) {
+  min-width: 20px;
+}
+
 .devtools-toolbarbutton:not([checked]):hover:active {
 }
 
@@ -100,7 +104,6 @@
 
 /* Splitters */
 
-#devtools-side-splitter,
-#inspector-tree-splitter {
+#devtools-side-splitter {
   border: none;
 }
diff --git a/LCARStrek/browser/devtools/csshtmltree.css b/LCARStrek/browser/devtools/csshtmltree.css
index c530cd1e..9b52a23e 100644
--- a/LCARStrek/browser/devtools/csshtmltree.css
+++ b/LCARStrek/browser/devtools/csshtmltree.css
@@ -44,10 +44,6 @@
   color: #FF9F00;
 }
 
-#root {
-  display: -moz-box;
-}
-
 .property-header {
   padding: 5px 0;
   white-space: nowrap;
@@ -71,7 +67,6 @@ link:hover {
 }
 
 .helplink {
-  display: block;
   height: 14px;
   width: 0;
   overflow: hidden;
@@ -97,7 +92,6 @@ link:hover {
   -moz-margin-start: 5px;
   -moz-margin-end: 5px;
   background: url("chrome://global/skin/tree/twisty-closed.png") center center no-repeat;
-  display: inline-block;
   vertical-align: middle;
 }
 
@@ -105,15 +99,12 @@ link:hover {
   background-image: url("chrome://global/skin/tree/twisty-open.png");
 }
 
-.expandable {
-  cursor: pointer;
-}
-
 .match {
   visibility: hidden;
 }
 
-.expandable > .property-header > .match {
+.expandable {
+  cursor: pointer;
   visibility: visible;
 }
 
@@ -121,7 +112,6 @@ link:hover {
   font-size: 12px;
   color: #FF9F00;
   width: 220px;
-  display: inline-block;
 }
 .property-value {
   padding: 0;
@@ -131,11 +121,6 @@ link:hover {
   width: 100%;
 }
 
-.property-view-hidden,
-.property-content-hidden {
-  display: none;
-}
-
 .rule-link {
   text-align: end;
   -moz-padding-start: 10px;
@@ -146,6 +131,7 @@ link:hover {
   direction: ltr;
   padding: 0;
   -moz-padding-start: 20px;
+  vertical-align: text-bottom;
 }
 
 .bestmatch {
@@ -159,10 +145,6 @@ link:hover {
 }
 
 #propertyContainer {
-  display: -moz-box;
-  -moz-box-orient: vertical;
-  -moz-box-flex: 1;
-  overflow-y: auto;
   border-collapse: collapse;
 }
 
@@ -217,10 +199,23 @@ link:hover {
   padding: 2px 5px;
 }
 
+.ruleview-warning {
+  background: url("chrome://browser/skin/devtools/alerticon-warning.png");
+  -moz-margin-start: 5px;
+  vertical-align: middle;
+  width: 13px;
+  height: 12px;
+}
+
 .ruleview-ruleopen {
   -moz-padding-end: 5px;
 }
 
+.ruleview-ruleclose {
+  width: -moz-min-content;
+  padding-right: 20px;
+}
+
 .ruleview-propertylist {
   list-style: none;
   padding: 0;
@@ -235,7 +230,6 @@ link:hover {
 }
 
 .ruleview-expander {
-  display: inline-block;
   width: 8px;
   height: 8px;
   background: url("chrome://browser/skin/devtools/arrows.png") 24px 0;
@@ -254,7 +248,6 @@ link:hover {
 }
 
 .ruleview-propertyname {
-  display: inline-block;
   padding: 1px 0;
   cursor: text;
   color: #9C9CFF;
diff --git a/LCARStrek/browser/inspector.css b/LCARStrek/browser/devtools/htmlpanel.css
similarity index 86%
rename from LCARStrek/browser/inspector.css
rename to LCARStrek/browser/devtools/htmlpanel.css
index e32c07c6..50911c11 100644
--- a/LCARStrek/browser/inspector.css
+++ b/LCARStrek/browser/devtools/htmlpanel.css
@@ -50,26 +50,25 @@
  *  Steven Roussey (AppCenter Inc, Network54)
  */
 
-/* XXX: THIS IS TOO EXPERIMENTAL TO BE LCARStrek-themed!!!! */
-
 html {
-  background-color: -moz-dialog;
+  background-color: #000000;
 }
 
 body {
   margin: 0;
   overflow: auto;
-  font-family: Lucida Grande, sans-serif;
+  font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
   font-size: 11px;
+  /*padding-top: 5px;*/
 }
 
 h1 {
   font-size: 17px;
-  border-bottom: 1px solid threedlightshadow;
+  border-bottom: 1px solid #9C9CFF;
 }
 
 a {
-  color: #0000ff;
+  color: #9C9CFF;
 }
 
 pre {
@@ -99,7 +98,7 @@ code {
 .objectLink-styleRule,
 .objectLink-element,
 .objectLink-textNode {
-  color: #000088;
+  color: #9C9CFF;
 }
 
 .selectorTag,
@@ -110,33 +109,33 @@ code {
 }
 
 .selectorTag {
-  color: #0000FF;
+  color: #008484;
 }
 
 .selectorId {
-  color: DarkBlue;
+  color: #9C9CFF;
 }
 
 .selectorClass {
-  color: red;
+  color: #FF0000;
 }
 
 .selectorHidden > .selectorTag {
-  color: #5F82D9;
+  color: #004444;
 }
 
 .selectorHidden > .selectorId {
-  color: #888888;
+  color: #6060AA;
 }
 
 .selectorHidden > .selectorClass {
-  color: #D86060;
+  color: #AA0000;
 }
 
 .selectorValue {
   font-family: "Liberation Mono", Consolas, "Courier New", monospace;
   font-style: italic;
-  color: #555555;
+  color: #E7ADE7;
 }
 
 .panelNode-html {
@@ -174,7 +173,7 @@ code {
   border: 2px solid transparent;
   border-radius: 3px;
   padding: 0 2px;
-  color: #000088;
+  color: #9C9CFF;
 }
 
 .nodeCloseLabel {
@@ -183,7 +182,7 @@ code {
 
 .nodeTag {
   cursor: pointer;
-  color: blue;
+  color: #9C9CFF;
 }
 
 .nodeValue {
@@ -198,7 +197,7 @@ code {
 }
 
 .nodeText {
-  color: #333333;
+  color: #8050B0;
 }
 
 .docType {
@@ -208,7 +207,7 @@ code {
   top: -16px;
   font-family: "Liberation Mono", Consolas, "Courier New", monospace;
   padding-left: 8px;
-  color: #999;
+  color: #E7ADE7;
   white-space: nowrap;
   font-style: italic;
 }
@@ -220,28 +219,29 @@ code {
 }
 
 .nodeWhiteSpace {
-  border: 1px solid LightGray;
+  border: 1px solid #402858;
   white-space: pre;
   margin-left: 1px;
-  color: gray;
+  color: #8050B0;
 }
 
 .nodeWhiteSpace_Space {
-  border: 1px solid #ddd;
+  border: 1px solid #402858;
 }
 
 .nodeTextEntity {
-  border: 1px solid gray;
+  border: 1px solid #8050B0;
   white-space: pre;
   margin-left: 1px;
 }
 
 .nodeComment {
-  color: DarkGreen;
+  color: #008484;
 }
 
 .nodeBox.highlightOpen > .nodeLabel {
-  background-color: #EEEEEE;
+  background-color: #FFCF00;
+  color: #000000;
 }
 
 .nodeBox.highlightOpen > .nodeCloseLabel,
@@ -253,9 +253,9 @@ code {
 
 .nodeBox.selected > .nodeLabel > .nodeLabelBox,
 .nodeBox.selected > .nodeLabel {
-  border-color: Highlight;
-  background-color: Highlight;
-  color: HighlightText !important;
+  border-color: #9C9CFF;
+  background-color: 008484;
+  color: #FFCF00 !important;
 }
 
 .nodeBox.selected > .nodeLabel > .nodeLabelBox,
@@ -266,8 +266,8 @@ code {
 }
 
 .nodeBox.highlighted > .nodeLabel {
-  border-color: Highlight !important;
-  background-color: cyan !important;
+  border-color: #9C9CFF !important;
+  background-color: #FFCF00 !important;
   color: #000000 !important;
 }
 
@@ -282,23 +282,23 @@ code {
 .nodeBox.nodeHidden .nodeCloseLabel,
 .nodeBox.nodeHidden .nodeLabel > .nodeLabelBox > .nodeText,
 .nodeBox.nodeHidden .nodeText {
-  color: #888888;
+  color: #8050B0;
 }
 
 .nodeBox.nodeHidden .nodeLabel > .nodeLabelBox > .nodeTag,
 .nodeBox.nodeHidden .nodeCloseLabel > .nodeCloseLabelBox > .nodeTag {
-  color: #5F82D9;
+  color: #E7ADE7;
 }
 
 .nodeBox.nodeHidden .nodeLabel > .nodeLabelBox > .nodeAttr > .nodeValue {
-  color: #D86060;
+  color: #E7ADE7;
 }
 
 .nodeBox.nodeHidden.selected > .nodeLabel > .nodeLabelBox,
 .nodeBox.nodeHidden.selected > .nodeLabel > .nodeLabelBox > .nodeTag,
 .nodeBox.nodeHidden.selected > .nodeLabel > .nodeLabelBox > .nodeAttr > .nodeValue,
 .nodeBox.nodeHidden.selected > .nodeLabel > .nodeLabelBox > .nodeText {
-  color: SkyBlue !important;
+  color: #8050B0 !important;
 }
 
 .nodeBox.mutated > .nodeLabel,
@@ -306,7 +306,7 @@ code {
 .nodeValue.mutated,
 .nodeText.mutated,
 .nodeBox.mutated > .nodeText {
-  background-color: #EFFF79;
+  background-color: #794900;
   color: #FF0000 !important;
 }
 
@@ -315,8 +315,8 @@ code {
 .nodeBox.selected > .nodeLabel > .nodeLabelBox > .nodeAttr.mutated > .nodeValue,
 .nodeBox.selected > .nodeLabel > .nodeLabelBox > .nodeAttr > .nodeValue.mutated,
 .nodeBox.selected > .nodeLabel > .nodeLabelBox > .nodeText.mutated {
-  background-color: #EFFF79;
-  border-color: #EFFF79;
+  background-color: #794900;
+  border-color: #6060AA;
   color: #FF0000 !important;
 }
 
@@ -330,13 +330,13 @@ code {
 
 .nodeBox.selected > .nodeLabel > .nodeLabelBox,
 .nodeBox.selected > .nodeLabel {
-  border-color: #3875d7;
-  background-color: #3875d7;
-  color: #FFFFFF !important;
+  border-color: #9C9CFF;
+  background-color: #008484;
+  color: #FFCF00 !important;
 }
 
 .nodeBox.highlighted > .nodeLabel {
-  border-color: #3875d7 !important;
+  border-color: #008484 !important;
 }
 
 /* Twisties */
@@ -345,13 +345,13 @@ code {
 {
   background-repeat: no-repeat;
   background-position: center;
-  background-image: url("chrome://global/skin/tree/twisty-clsd.png") !important;
+  background-image: url("chrome://global/skin/tree/twisty-closed.gif") !important;
 }
 
 .nodeBox.highlightOpen > .nodeLabel > .twisty,
 .nodeBox.open > .nodeLabel > .twisty
 {
-  background-image: url("chrome://global/skin/tree/twisty-open.png") !important;
+  background-image: url("chrome://global/skin/tree/twisty-open.gif") !important;
 }
 
 .editingAttributeValue {
diff --git a/LCARStrek/browser/devtools/inspect-button.png b/LCARStrek/browser/devtools/inspect-button.png
new file mode 100644
index 00000000..e799e7cd
Binary files /dev/null and b/LCARStrek/browser/devtools/inspect-button.png differ
diff --git a/LCARStrek/browser/fullscreen-video.css b/LCARStrek/browser/fullscreen-video.css
deleted file mode 100644
index 1ee0ffc9..00000000
--- a/LCARStrek/browser/fullscreen-video.css
+++ /dev/null
@@ -1,8 +0,0 @@
-#close {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 32px;
-  height: 32px;
-  background: url("KUI-close.png") center center no-repeat;
-}
diff --git a/LCARStrek/browser/newtab/controls.png b/LCARStrek/browser/newtab/controls.png
new file mode 100644
index 00000000..0041c151
Binary files /dev/null and b/LCARStrek/browser/newtab/controls.png differ
diff --git a/LCARStrek/browser/newtab/newTab.css b/LCARStrek/browser/newtab/newTab.css
index 2227367e..30de146b 100644
--- a/LCARStrek/browser/newtab/newTab.css
+++ b/LCARStrek/browser/newtab/newTab.css
@@ -1,148 +1,128 @@
-#scrollbox {
-  padding-bottom: 18px;
-  background-color: #000000;
-}
-
-#body {
-  padding-top: 106px;
-  font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
-}
-
-.button {
+:root {
+  -moz-appearance: none;
+  background-color: transparent;
   padding: 0;
-  border: 0 none;
-}
-
-/* TOOLBAR */
-#toolbar {
-  top: 8px;
-  right: 8px;
-  width: 13px;
-  height: 30px;
-  padding: 0;
-  margin: 0;
-}
-
-.toolbar-button {
-  background: transparent url("chrome://browser/skin/newtab/toolbar.png");
 }
 
-#toolbar-button-show {
-  width: 11px;
-  height: 11px;
-  background-position: -10px 0;
+/* SCROLLBOX */
+#newtab-scrollbox:not([page-disabled]) {
+  background-color: #000000;
 }
 
-#toolbar-button-show:hover {
-  background-position: -10px -12px;
+/* TOGGLE */
+#newtab-toggle {
+  width: 16px;
+  height: 16px;
+  padding: 0;
+  border: none;
+  background: -216px 0 transparent url("chrome://browser/skin/newtab/controls.png");
 }
 
-#toolbar-button-show:active {
-  background-position: -10px -24px;
+#newtab-toggle[page-disabled] {
+  background-position: -232px 0;
 }
 
-#toolbar-button-hide {
-  width: 10px;
-  height: 10px;
+/* ROWS */
+.newtab-row {
+  margin-bottom: 20px;
 }
 
-#toolbar-button-hide:hover {
-  background-position: 0 -12px;
+.newtab-row:last-child {
+  margin-bottom: 0;
 }
 
-#toolbar-button-hide:active {
-  background-position: 0 -24px;
+/* CELLS */
+.newtab-cell {
+  -moz-margin-end: 20px;
+  background-color: rgba(255,159,0,.2);
+  border: 1px solid;
+  border-color: #9C9CFF;
+  border-radius: 1px;
+  -moz-transition: border-color 100ms ease-out;
 }
 
-#toolbar-button-reset {
-  top: 17px;
-  width: 11px;
-  height: 12px;
+.newtab-cell:empty {
+  border: 1px dashed;
 }
 
-#toolbar-button-reset {
-  background-position: -21px 0;
+.newtab-cell:last-child {
+  -moz-margin-end: 0;
 }
 
-#toolbar-button-reset:hover {
-  background-position: -21px -12px;
+.newtab-cell:hover:not(:empty) {
+  border-color: #FFCF00;
 }
 
-#toolbar-button-reset:active {
-  background-position: -21px -24px;
+/* SITES */
+.newtab-site {
+  text-decoration: none;
+  -moz-transition-property: top, left, opacity, box-shadow, background-color;
 }
 
-/* GRID */
-#grid {
-  padding: 1px;
-  margin: 0 auto;
+.newtab-site:hover,
+.newtab-site[dragged] {
+  box-shadow: 0 0 10px rgba(0,132,132,.3);
 }
 
-/* CELLS */
-.cell {
-  outline: 1px dashed #9C9CFF;
-  outline-offset: -1px;
+.newtab-site[dragged] {
+  -moz-transition-property: box-shadow, background-color;
+  background-color: #002121;
 }
 
-/* SITES */
-.site {
-  background-color: #402800;
-  -moz-transition: 200ms ease-out;
-  -moz-transition-property: top, left, box-shadow, opacity;
+/* THUMBNAILS */
+.newtab-thumbnail {
+  background-origin: padding-box;
+  background-clip: padding-box;
+  background-repeat: no-repeat;
+  background-size: cover;
 }
 
-.site[dragged] {
-  -moz-transition-property: box-shadow;
+/* TITLES */
+.newtab-title {
+  padding: 0 8px;
+  background-color: rgba(255,159,0,.8);
+  color: #000000;
+  font-size: 12px;
+  line-height: 24px;
 }
 
-.site[ontop] {
-  box-shadow: 0 1px 4px #008484;
-  outline: none;
+/* CONTROLS */
+.newtab-control {
+  width: 24px;
+  height: 24px;
+  padding: 1px 2px 3px;
+  border: none;
+  background: transparent url("chrome://browser/skin/newtab/controls.png");
 }
 
-/* SITE TITLE */
-.site-title {
-  height: 2.4em;
-  width: 189px;
-  padding: 0 6px;
-  background-color: rgba(0,0,0,0.5);
-  border: solid transparent;
-  border-width: 6px 0;
-  color: #FFCF00;
-  text-decoration: none;
-  line-height: 1.2em;
-  font-weight: 700;
+.newtab-control-pin:hover {
+  background-position: -24px 0;
 }
 
-/* SITE STRIP */
-.site-strip {
-  padding: 4px 3px;
-  background-color: rgba(0,0,0,0.5);
+.newtab-control-pin:active {
+  background-position: -48px 0;
 }
 
-.strip-button {
-  width: 17px;
-  height: 17px;
-  background: transparent url("chrome://browser/skin/newtab/strip.png");
+.newtab-control-pin[pinned] {
+  background-position: -72px 0;
 }
 
-.strip-button-pin:hover {
-  background-position: 0 -17px;
+.newtab-control-pin[pinned]:hover {
+  background-position: -96px 0;
 }
 
-.strip-button-pin:active,
-.site[pinned] .strip-button-pin {
-  background-position: 0 -34px;
+.newtab-control-pin[pinned]:active {
+  background-position: -120px 0;
 }
 
-.strip-button-block {
-  background-position: -17px 0;
+.newtab-control-block {
+  background-position: -144px 0;
 }
 
-.strip-button-block:hover {
-  background-position: -17px -17px;
+.newtab-control-block:hover {
+  background-position: -168px 0;
 }
 
-.strip-button-block:active {
-  background-position: -17px -34px;
+.newtab-control-block:active {
+  background-position: -192px 0;
 }
diff --git a/LCARStrek/browser/newtab/strip.png b/LCARStrek/browser/newtab/strip.png
deleted file mode 100644
index 2527df6e..00000000
Binary files a/LCARStrek/browser/newtab/strip.png and /dev/null differ
diff --git a/LCARStrek/browser/newtab/toolbar.png b/LCARStrek/browser/newtab/toolbar.png
deleted file mode 100644
index 33bb4a32..00000000
Binary files a/LCARStrek/browser/newtab/toolbar.png and /dev/null differ
diff --git a/LCARStrek/browser/preferences/preferences.css b/LCARStrek/browser/preferences/preferences.css
index 36423c81..5bde06dc 100644
--- a/LCARStrek/browser/preferences/preferences.css
+++ b/LCARStrek/browser/preferences/preferences.css
@@ -193,8 +193,4 @@ radio[pane=paneSync] {
 #syncAddDeviceLabel {
   margin-top: 1em;
   margin-bottom: 1em;
- }
-
-#syncEnginesList {
-  height: 11em;
 }
diff --git a/LCARStrek/browser/syncCommon.css b/LCARStrek/browser/syncCommon.css
index cb2d04dd..9c1421d7 100644
--- a/LCARStrek/browser/syncCommon.css
+++ b/LCARStrek/browser/syncCommon.css
@@ -1,4 +1,4 @@
-/* The following are used by both syncSetup.xul and syncGenericChange.xul */
+/* The following are used by both sync/setup.xul and sync/genericChange.xul */
 .status {
   color: #FF9F00;
 }
@@ -21,7 +21,7 @@
   list-style-image: url("chrome://global/skin/icons/information-16.png");
 }
 
-/* .data is only used by syncGenericChange.xul, but it seems unnecessary to have
+/* .data is only used by sync/genericChange.xul, but it seems unnecessary to have
    a separate stylesheet for it. */
 .data {
   font-size: 90%;
diff --git a/LCARStrek/browser/webapps-16.png b/LCARStrek/browser/webapps-16.png
new file mode 100644
index 00000000..8c55742a
Binary files /dev/null and b/LCARStrek/browser/webapps-16.png differ
diff --git a/LCARStrek/browser/webapps-64.png b/LCARStrek/browser/webapps-64.png
new file mode 100644
index 00000000..5322c6b2
Binary files /dev/null and b/LCARStrek/browser/webapps-64.png differ
diff --git a/LCARStrek/global/tree/twisty-closed-rtl-active.gif b/LCARStrek/global/tree/twisty-closed-rtl-active.gif
new file mode 100644
index 00000000..40956cd1
Binary files /dev/null and b/LCARStrek/global/tree/twisty-closed-rtl-active.gif differ
diff --git a/LCARStrek/global/tree/twisty-closed-rtl-selected.gif b/LCARStrek/global/tree/twisty-closed-rtl-selected.gif
new file mode 100644
index 00000000..76ebc1d0
Binary files /dev/null and b/LCARStrek/global/tree/twisty-closed-rtl-selected.gif differ
diff --git a/LCARStrek/global/tree/twisty-closed-rtl.gif b/LCARStrek/global/tree/twisty-closed-rtl.gif
new file mode 100644
index 00000000..ce859b2e
Binary files /dev/null and b/LCARStrek/global/tree/twisty-closed-rtl.gif differ