[SYNC] Bunch of unspecific work that has been uncommitted for some time.

115 files changed, 31 insertions, 402 deletions

diff --git a/apps/mail/confvars.sh b/apps/mail/confvars.sh
index 91857b8ca..263220c67 100644
--- a/apps/mail/confvars.sh
+++ b/apps/mail/confvars.sh
@@ -13,7 +13,7 @@ MOZ_APP_STATIC_INI=1
 MOZ_APP_VERSION=`$PYTHON ${_topsrcdir}/build/version2k.py --version ${_topsrcdir}/apps/mail/config/version.txt`
 MOZ_APP_VERSION_DISPLAY=$MOZ_APP_VERSION
 MOZ_BRANDING_DIRECTORY=mail/branding
-MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/interlink/release
+MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/interlink
 MOZ_PROFILE_MIGRATOR=1
 
 # Platform Conditional code for application
diff --git a/apps/navigator/base/content/navigator.xul b/apps/navigator/base/content/navigator.xul
index 411c82963..9367b66e0 100644
--- a/apps/navigator/base/content/navigator.xul
+++ b/apps/navigator/base/content/navigator.xul
@@ -190,10 +190,10 @@
              toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
              defaultset="back-button,forward-button,reload-button,stop-button,nav-bar-inner,search-container,throbber-box,window-controls"
              mode="full"
-             iconsize="large"
+             iconsize="small"
              labelalign="end"
              defaultmode="full"
-             defaulticonsize="large"
+             defaulticonsize="small"
              defaultlabelalign="end"
              context="toolbar-context-menu">
 
@@ -510,18 +510,6 @@
   <panel id="customizeToolbarSheetPopup"/>
 
   <statusbar id="status-bar" class="chromeclass-status">
-    <toolbar id="component-bar"
-             toolboxid="navigator-toolbox"
-             mode="icons"
-             iconsize="small"
-             labelalign="end"
-             defaultset=""
-             defaultmode="icons"
-             defaulticonsize="small"
-             defaultlabelalign="end"
-             xpfe="false"
-             customizable="true"
-             persist="collapsed"/>
     <statusbarpanel id="statusbar-display" label="&statusText.label;" flex="1"/>
     <statusbarpanel class="statusbarpanel-progress" id="statusbar-progresspanel" collapsed="true">
       <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
@@ -535,5 +523,18 @@
                     class="statusbarpanel-backgroundbox"
                     context="security-context-menu"
                     oncommand="BrowserPageInfo(null, 'securityTab')"/>
+    <toolbar id="component-bar"
+             toolboxid="navigator-toolbox"
+             mode="icons"
+             iconsize="small"
+             labelalign="end"
+             defaultset=""
+             defaultmode="icons"
+             defaulticonsize="small"
+             defaultlabelalign="end"
+             xpfe="false"
+             customizable="true"
+             ordinal="999"
+             persist="collapsed"/>
   </statusbar>
 </window>
diff --git a/apps/navigator/comm/content/tasksOverlay.xul b/apps/navigator/comm/content/tasksOverlay.xul
index 53e65a634..378ded6f4 100644
--- a/apps/navigator/comm/content/tasksOverlay.xul
+++ b/apps/navigator/comm/content/tasksOverlay.xul
@@ -101,12 +101,4 @@
           <menuseparator id="sep-window-list"/>
         </menupopup>
       </menu>
-
-  <toolbar id="component-bar">
-    <toolbarbutton id="mini-nav"
-                   class="toolbarbutton-1"
-                   oncommand="toNavigator();"
-                   label="&taskNavigator.tooltip;"
-                   tooltiptext="&taskNavigator.tooltip;"/>
-  </toolbar>
 </overlay>
diff --git a/apps/navigator/confvars.sh b/apps/navigator/confvars.sh
index 2dd6bb10a..774064da6 100644
--- a/apps/navigator/confvars.sh
+++ b/apps/navigator/confvars.sh
@@ -10,7 +10,7 @@ MOZ_APP_DISPLAYNAME=$MOZ_APP_BASENAME
 BINOC_NAVIGATOR=1
 BINOC_DOWNLOADS=1
 MOZ_BRANDING_DIRECTORY=apps/navigator/branding
-MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/borealis/release
+MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/borealis
 MOZ_UPDATER=
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
diff --git a/apps/navigator/themes/classic/communicator/bookmarks/allBookmarks.png b/apps/navigator/themes/classic/communicator/bookmarks/allBookmarks.png
index 9bf003529..a26954b2e 100644
--- a/apps/navigator/themes/classic/communicator/bookmarks/allBookmarks.png
+++ b/apps/navigator/themes/classic/communicator/bookmarks/allBookmarks.png
diff --git a/apps/navigator/themes/classic/communicator/brand.css b/apps/navigator/themes/classic/communicator/brand.css
index d86f2250b..1d20ebdbf 100644
--- a/apps/navigator/themes/classic/communicator/brand.css
+++ b/apps/navigator/themes/classic/communicator/brand.css
@@ -35,10 +35,16 @@ toolbar[mode="text"] #wrapper-throbber-box > #throbber-box > #navigator-throbber
 toolbar[iconsize="small"] #wrapper-throbber-box > #throbber-box > #navigator-throbber,
 toolbar[mode="text"] #navigator-throbber,
 toolbar[iconsize="small"] #navigator-throbber {
-  margin: 0 5px;
+  margin: 0px;
+  margin-right: 4px;
   list-style-image: url("chrome://branding/content/throbber16-single.png");
 }
 
+toolbar[mode="text"]:last-child #navigator-throbber,
+toolbar[iconsize="small"]:last-child #navigator-throbber {
+  margin-right: 5px;
+}
+
 window[chromehidden~="toolbar"] #navigator-throbber[busy="true"],
 toolbar[mode="text"] #navigator-throbber[busy="true"],
 toolbar[iconsize="small"] #navigator-throbber[busy="true"] {
diff --git a/apps/navigator/themes/classic/communicator/communicator.css b/apps/navigator/themes/classic/communicator/communicator.css
index 83a5c0c6a..555f7f95b 100644
--- a/apps/navigator/themes/classic/communicator/communicator.css
+++ b/apps/navigator/themes/classic/communicator/communicator.css
@@ -16,10 +16,6 @@
 
 /* ::::: toolbar-primary ::::: */
 
-.toolbar-primary {
-  -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary");
-}
-
 /* ::::: autocomplete ::::: */
 
 .autocomplete-history-popup {
diff --git a/apps/navigator/themes/classic/communicator/toolbar.css b/apps/navigator/themes/classic/communicator/toolbar.css
index de4f9c1bc..3b92625d4 100644
--- a/apps/navigator/themes/classic/communicator/toolbar.css
+++ b/apps/navigator/themes/classic/communicator/toolbar.css
@@ -8,10 +8,6 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-toolbar[type="menubar"]:not([autohide="true"]):not([xpfe="false"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
-  -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-drag");
-}
-
 /* ::::: toolbar & menubar ::::: */
 
 .toolbar-holder {
@@ -23,52 +19,6 @@ toolbar > menubar {
   border-bottom: 0px none;
 }
 
-/* ::::: toolbargrippy ::::: */
-
-toolbargrippy {
-  -moz-box-orient: vertical;
-  -moz-box-align: center;
-  border-right: 1px solid ThreeDShadow;
-  width: 10px;
-  padding: 2px 1px;
-  list-style-image: url("chrome://communicator/skin/toolbar/tbgrip-arrow.gif");
-}
-
-toolbargrippy:hover {
-  background-color: ThreeDHighlight;
-}
-
-.toolbargrippy-texture {
-  margin-top: 2px;
-  width: 6px;
-  background: url("chrome://communicator/skin/toolbar/tbgrip-texture.gif");
-}
-
-/* ::::: collapsed tray and grippies ::::: */
-
-toolbargrippy[tbgrippy-collapsed="true"] {
-  -moz-box-orient: horizontal;
-  border-left: 1px solid ThreeDHighlight;
-  border-top: 1px solid ThreeDHighlight;
-  border-right: 1px solid ThreeDShadow;
-  border-bottom: 1px solid ThreeDShadow;
-  width: 40px;
-  height: 10px;
-  padding: 1px 2px;
-  list-style-image: url("chrome://communicator/skin/toolbar/tbgrip-arrow-clps.gif");
-}
-
-toolbargrippy[tbgrippy-collapsed="true"] > .toolbargrippy-texture {
-  margin-top: 0;
-  margin-inline-start: 2px;
-  width: 0px;
-  height: 6px;
-}
-
-.collapsed-tray-spacer {
-  border-bottom: 1px solid ThreeDShadow;
-}
-
 /* ::::: solid background status bar panel ::::: */
 
 .statusbarpanel-backgroundbox {
diff --git a/apps/navigator/themes/classic/navigator/icons/tab-new.png b/apps/navigator/themes/classic/navigator/icons/tab-new.png
index 26249b72b..4282a1b1c 100644
--- a/apps/navigator/themes/classic/navigator/icons/tab-new.png
+++ b/apps/navigator/themes/classic/navigator/icons/tab-new.png
diff --git a/apps/navigator/themes/classic/navigator/navigator.css b/apps/navigator/themes/classic/navigator/navigator.css
index 8cc804437..d59cf88de 100644
--- a/apps/navigator/themes/classic/navigator/navigator.css
+++ b/apps/navigator/themes/classic/navigator/navigator.css
@@ -591,11 +591,7 @@ toolbar[mode="icons"] #search-button > .button-box > .button-text {
 /* ::::: personal toolbar ::::: */
 
 #bookmarks-button {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.png");
-}
-
-#bookmarks-button[open="true"] {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.png");
+  list-style-image: url("chrome://communicator/skin/bookmarks/allBookmarks.png");
 }
 
 toolbarbutton.chevron {
@@ -723,6 +719,10 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
   max-height: 25px;
 }
 
+#component-bar:empty:not([customizing]) {
+  display: none;
+}
+
 #component-bar > toolbarbutton {
   padding-top: 0px;
   padding-bottom: 0px;
diff --git a/components/bindings/content/general.xml b/components/bindings/content/general.xml
index b4538e41d..09b5b4a0b 100644
--- a/components/bindings/content/general.xml
+++ b/components/bindings/content/general.xml
@@ -133,7 +133,7 @@
   <binding id="statusbar" role="xul:statusbar">
     <content>
       <children/>
-      <xul:statusbarpanel class="statusbar-resizerpanel">
+      <xul:statusbarpanel class="statusbar-resizerpanel" ordinal="1000">
         <xul:resizer dir="bottomend"/>
       </xul:statusbarpanel>
     </content>
diff --git a/components/global/content/xul.css b/components/global/content/xul.css
index f51ec77e4..fdc72aba2 100644
--- a/components/global/content/xul.css
+++ b/components/global/content/xul.css
@@ -679,7 +679,7 @@ treecol[hidden="true"] {
 }
 
 /* ::::: lines connecting cells ::::: */
-tree:not([treelines="true"]) > treechildren::-moz-tree-line {
+tree[treelines="false"] > treechildren::-moz-tree-line {
   visibility: hidden;
 }
 
diff --git a/other-licenses/branding/borealis/release/content/about.png b/other-licenses/branding/borealis/content/about.png
index bf8777ae5..bf8777ae5 100644
--- a/other-licenses/branding/borealis/release/content/about.png
+++ b/other-licenses/branding/borealis/content/about.png
diff --git a/other-licenses/branding/borealis/release/content/icon32.png b/other-licenses/branding/borealis/content/icon32.png
index ebd4bc7d0..ebd4bc7d0 100644
--- a/other-licenses/branding/borealis/release/content/icon32.png
+++ b/other-licenses/branding/borealis/content/icon32.png
diff --git a/other-licenses/branding/borealis/release/content/icon48.png b/other-licenses/branding/borealis/content/icon48.png
index d90f53b4d..d90f53b4d 100644
--- a/other-licenses/branding/borealis/release/content/icon48.png
+++ b/other-licenses/branding/borealis/content/icon48.png
diff --git a/other-licenses/branding/borealis/release/content/icon64.png b/other-licenses/branding/borealis/content/icon64.png
index e2e070587..e2e070587 100644
--- a/other-licenses/branding/borealis/release/content/icon64.png
+++ b/other-licenses/branding/borealis/content/icon64.png
diff --git a/other-licenses/branding/borealis/release/content/throbber-anim.png b/other-licenses/branding/borealis/content/throbber-anim.png
index ed64ad7ca..ed64ad7ca 100644
--- a/other-licenses/branding/borealis/release/content/throbber-anim.png
+++ b/other-licenses/branding/borealis/content/throbber-anim.png
diff --git a/other-licenses/branding/borealis/release/content/throbber-single.png b/other-licenses/branding/borealis/content/throbber-single.png
index c4e3644ea..c4e3644ea 100644
--- a/other-licenses/branding/borealis/release/content/throbber-single.png
+++ b/other-licenses/branding/borealis/content/throbber-single.png
diff --git a/other-licenses/branding/borealis/content/throbber16-anim.png b/other-licenses/branding/borealis/content/throbber16-anim.png
new file mode 100644
index 000000000..f7fa70cbd
--- /dev/null
+++ b/other-licenses/branding/borealis/content/throbber16-anim.png
diff --git a/other-licenses/branding/borealis/content/throbber16-single.png b/other-licenses/branding/borealis/content/throbber16-single.png
new file mode 100644
index 000000000..d587f996e
--- /dev/null
+++ b/other-licenses/branding/borealis/content/throbber16-single.png
diff --git a/other-licenses/branding/borealis/release/icons/gtk/borealis.png b/other-licenses/branding/borealis/icons/gtk/borealis.png
index dbd1552eb..dbd1552eb 100644
--- a/other-licenses/branding/borealis/release/icons/gtk/borealis.png
+++ b/other-licenses/branding/borealis/icons/gtk/borealis.png
diff --git a/other-licenses/branding/borealis/release/icons/gtk/default.png b/other-licenses/branding/borealis/icons/gtk/default.png
index 43209839e..43209839e 100644
--- a/other-licenses/branding/borealis/release/icons/gtk/default.png
+++ b/other-licenses/branding/borealis/icons/gtk/default.png
diff --git a/other-licenses/branding/borealis/release/icons/gtk/document.png b/other-licenses/branding/borealis/icons/gtk/document.png
index a35318e6e..a35318e6e 100644
--- a/other-licenses/branding/borealis/release/icons/gtk/document.png
+++ b/other-licenses/branding/borealis/icons/gtk/document.png
diff --git a/other-licenses/branding/borealis/release/icons/gtk/main-window.png b/other-licenses/branding/borealis/icons/gtk/main-window.png
index 240a7164e..240a7164e 100644
--- a/other-licenses/branding/borealis/release/icons/gtk/main-window.png
+++ b/other-licenses/branding/borealis/icons/gtk/main-window.png
diff --git a/other-licenses/branding/borealis/release/icons/windows/borealis.ico b/other-licenses/branding/borealis/icons/windows/borealis.ico
index 54031d77c..54031d77c 100644
--- a/other-licenses/branding/borealis/release/icons/windows/borealis.ico
+++ b/other-licenses/branding/borealis/icons/windows/borealis.ico
diff --git a/other-licenses/branding/borealis/release/icons/windows/html-file.ico b/other-licenses/branding/borealis/icons/windows/html-file.ico
index 14d2cb592..14d2cb592 100644
--- a/other-licenses/branding/borealis/release/icons/windows/html-file.ico
+++ b/other-licenses/branding/borealis/icons/windows/html-file.ico
diff --git a/other-licenses/branding/borealis/release/icons/windows/main-window.ico b/other-licenses/branding/borealis/icons/windows/main-window.ico
index 54031d77c..54031d77c 100644
--- a/other-licenses/branding/borealis/release/icons/windows/main-window.ico
+++ b/other-licenses/branding/borealis/icons/windows/main-window.ico
diff --git a/other-licenses/branding/borealis/release/jar.mn b/other-licenses/branding/borealis/jar.mn
index 624c48cc3..624c48cc3 100644
--- a/other-licenses/branding/borealis/release/jar.mn
+++ b/other-licenses/branding/borealis/jar.mn
diff --git a/other-licenses/branding/borealis/release/license.txt b/other-licenses/branding/borealis/license.txt
index 44007b2a9..44007b2a9 100644
--- a/other-licenses/branding/borealis/release/license.txt
+++ b/other-licenses/branding/borealis/license.txt
diff --git a/other-licenses/branding/borealis/release/locale/brand.dtd b/other-licenses/branding/borealis/locale/brand.dtd
index 5b58af39c..5b58af39c 100644
--- a/other-licenses/branding/borealis/release/locale/brand.dtd
+++ b/other-licenses/branding/borealis/locale/brand.dtd
diff --git a/other-licenses/branding/borealis/release/locale/brand.properties b/other-licenses/branding/borealis/locale/brand.properties
index 22f90f485..22f90f485 100644
--- a/other-licenses/branding/borealis/release/locale/brand.properties
+++ b/other-licenses/branding/borealis/locale/brand.properties
diff --git a/other-licenses/branding/borealis/release/moz.build b/other-licenses/branding/borealis/moz.build
index a1b43bd5d..a1b43bd5d 100644
--- a/other-licenses/branding/borealis/release/moz.build
+++ b/other-licenses/branding/borealis/moz.build
diff --git a/other-licenses/branding/borealis/release/package/windows/branding.nsi b/other-licenses/branding/borealis/package/windows/branding.nsi
index 7d90d296b..7d90d296b 100644
--- a/other-licenses/branding/borealis/release/package/windows/branding.nsi
+++ b/other-licenses/branding/borealis/package/windows/branding.nsi
diff --git a/other-licenses/branding/borealis/release/package/windows/wizHeader.bmp b/other-licenses/branding/borealis/package/windows/wizHeader.bmp
index cc14ecaaa..cc14ecaaa 100644
--- a/other-licenses/branding/borealis/release/package/windows/wizHeader.bmp
+++ b/other-licenses/branding/borealis/package/windows/wizHeader.bmp
diff --git a/other-licenses/branding/borealis/release/package/windows/wizHeaderRTL.bmp b/other-licenses/branding/borealis/package/windows/wizHeaderRTL.bmp
index cc14ecaaa..cc14ecaaa 100644
--- a/other-licenses/branding/borealis/release/package/windows/wizHeaderRTL.bmp
+++ b/other-licenses/branding/borealis/package/windows/wizHeaderRTL.bmp
diff --git a/other-licenses/branding/borealis/release/package/windows/wizWatermark.bmp b/other-licenses/branding/borealis/package/windows/wizWatermark.bmp
index 20cba9e39..20cba9e39 100644
--- a/other-licenses/branding/borealis/release/package/windows/wizWatermark.bmp
+++ b/other-licenses/branding/borealis/package/windows/wizWatermark.bmp
diff --git a/other-licenses/branding/borealis/release/pref/application-branding.js b/other-licenses/branding/borealis/pref/application-branding.js
index 36d221a65..36d221a65 100644
--- a/other-licenses/branding/borealis/release/pref/application-branding.js
+++ b/other-licenses/branding/borealis/pref/application-branding.js
diff --git a/other-licenses/branding/borealis/release/pref/uaoverrides.inc.js b/other-licenses/branding/borealis/pref/uaoverrides.inc.js
index 574eb49b3..574eb49b3 100644
--- a/other-licenses/branding/borealis/release/pref/uaoverrides.inc.js
+++ b/other-licenses/branding/borealis/pref/uaoverrides.inc.js
diff --git a/other-licenses/branding/borealis/release/content/throbber16-anim.png b/other-licenses/branding/borealis/release/content/throbber16-anim.png
deleted file mode 100644
index 72bc861f4..000000000
--- a/other-licenses/branding/borealis/release/content/throbber16-anim.png
+++ /dev/null
diff --git a/other-licenses/branding/borealis/release/content/throbber16-single.png b/other-licenses/branding/borealis/release/content/throbber16-single.png
deleted file mode 100644
index a6405eca8..000000000
--- a/other-licenses/branding/borealis/release/content/throbber16-single.png
+++ /dev/null
diff --git a/other-licenses/branding/borealis/trunk/content/about.png b/other-licenses/branding/borealis/trunk/content/about.png
deleted file mode 100644
index 63b8d1e94..000000000
--- a/other-licenses/branding/borealis/trunk/content/about.png
+++ /dev/null
diff --git a/other-licenses/branding/borealis/trunk/content/icon32.png b/other-licenses/branding/borealis/trunk/content/icon32.png
deleted file mode 100644
index 9de20b22c..000000000
--- a/other-licenses/branding/borealis/trunk/content/icon32.png
+++ /dev/null
diff --git a/other-licenses/branding/borealis/trunk/content/icon48.png b/other-licenses/branding/borealis/trunk/content/icon48.png
deleted file mode 100644
index e2a17bce7..000000000
--- a/other-licenses/branding/borealis/trunk/content/icon48.png
+++ /dev/null
diff --git a/other-licenses/branding/borealis/trunk/content/icon64.png b/other-licenses/branding/borealis/trunk/content/icon64.png
deleted file mode 100644
index 135033890..000000000
--- a/other-licenses/branding/borealis/trunk/content/icon64.png
+++ /dev/null
diff --git a/other-licenses/branding/borealis/trunk/content/throbber-single.png b/other-licenses/branding/borealis/trunk/content/throbber-single.png
deleted file mode 100644
index 68cc613c3..000000000
--- a/other-licenses/branding/borealis/trunk/content/throbber-single.png
+++ /dev/null
diff --git a/other-licenses/branding/borealis/trunk/content/throbber16-single.png b/other-licenses/branding/borealis/trunk/content/throbber16-single.png
deleted file mode 100644
index 88f267e7b..000000000
--- a/other-licenses/branding/borealis/trunk/content/throbber16-single.png
+++ /dev/null
diff --git a/other-licenses/branding/borealis/trunk/icons/gtk/borealis.png b/other-licenses/branding/borealis/trunk/icons/gtk/borealis.png
deleted file mode 100644
index 8b2a6fd44..000000000
--- a/other-licenses/branding/borealis/trunk/icons/gtk/borealis.png
+++ /dev/null
diff --git a/other-licenses/branding/borealis/trunk/icons/gtk/default.png b/other-licenses/branding/borealis/trunk/icons/gtk/default.png
deleted file mode 100644
index d9061ec58..000000000
--- a/other-licenses/branding/borealis/trunk/icons/gtk/default.png
+++ /dev/null
diff --git a/other-licenses/branding/borealis/trunk/icons/gtk/main-window.png b/other-licenses/branding/borealis/trunk/icons/gtk/main-window.png
deleted file mode 100644
index e034f2e1b..000000000
--- a/other-licenses/branding/borealis/trunk/icons/gtk/main-window.png
+++ /dev/null
diff --git a/other-licenses/branding/borealis/trunk/icons/mac/borealis.icns b/other-licenses/branding/borealis/trunk/icons/mac/borealis.icns
deleted file mode 100644
index a6b2b6590..000000000
--- a/other-licenses/branding/borealis/trunk/icons/mac/borealis.icns
+++ /dev/null
diff --git a/other-licenses/branding/borealis/trunk/icons/windows/borealis.ico b/other-licenses/branding/borealis/trunk/icons/windows/borealis.ico
deleted file mode 100644
index 8488d8c2a..000000000
--- a/other-licenses/branding/borealis/trunk/icons/windows/borealis.ico
+++ /dev/null
diff --git a/other-licenses/branding/borealis/trunk/icons/windows/main-window.ico b/other-licenses/branding/borealis/trunk/icons/windows/main-window.ico
deleted file mode 100644
index 8488d8c2a..000000000
--- a/other-licenses/branding/borealis/trunk/icons/windows/main-window.ico
+++ /dev/null
diff --git a/other-licenses/branding/borealis/trunk/jar.mn b/other-licenses/branding/borealis/trunk/jar.mn
deleted file mode 100644
index 33af65a2a..000000000
--- a/other-licenses/branding/borealis/trunk/jar.mn
+++ /dev/null
@@ -1,19 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-comm.jar:
-% content branding %content/branding/ contentaccessible=yes
-  content/branding/about.png                              (content/about.png)
-  content/branding/icon32.png                             (content/icon32.png)
-  content/branding/icon48.png                             (content/icon48.png)
-  content/branding/icon64.png                             (content/icon64.png)
-  content/branding/throbber-anim.png                      (../release/content/throbber-anim.png)
-  content/branding/throbber-single.png                    (content/throbber-single.png)
-  content/branding/throbber16-anim.png                    (../release/content/throbber16-anim.png)
-  content/branding/throbber16-single.png                  (content/throbber16-single.png)
-
-en-US.jar:
-% locale branding en-US %locale/en-US/branding/
-  locale/en-US/branding/brand.dtd                         (../release/locale/brand.dtd)
-* locale/en-US/branding/brand.properties                  (../release/locale/brand.properties)
\ No newline at end of file
diff --git a/other-licenses/branding/borealis/trunk/moz.build b/other-licenses/branding/borealis/trunk/moz.build
deleted file mode 100644
index 031f93780..000000000
--- a/other-licenses/branding/borealis/trunk/moz.build
+++ /dev/null
@@ -1,38 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-JAR_MANIFESTS += ['jar.mn']
-
-BRANDING_FILES += ['../release/license.txt']
-
-JS_PREFERENCE_PP_FILES += ['../release/pref/application-branding.js']
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    BRANDING_FILES += [
-        '../release/icons/windows/html-file.ico',
-        '../release/package/windows/branding.nsi',
-        '../release/package/windows/wizHeader.bmp',
-        '../release/package/windows/wizHeaderRTL.bmp',
-        '../release/package/windows/wizWatermark.bmp',
-        'icons/windows/borealis.ico',
-    ]
-
-    FINAL_TARGET_FILES.chrome.icons.default += [
-        '../release/icons/windows/html-file.ico',
-        'icons/windows/main-window.ico'
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
-    FINAL_TARGET_FILES.chrome.icons.default += [
-        '../release/icons/gtk/document.png',
-        'icons/gtk/borealis.png',
-        'icons/gtk/default.png',
-        'icons/gtk/main-window.png',
-    ]
-
-DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME']
-DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
-DEFINES['MOZ_BRANDING_DIRECTORY'] = CONFIG['MOZ_BRANDING_DIRECTORY']
-DEFINES['MOZILLA_UAVERSION_U'] = CONFIG['MOZILLA_UAVERSION_U']
-DEFINES['MOZILLA_COMPATVERSION_U'] = "52.9"
diff --git a/other-licenses/branding/interlink/release/VisualElements_150.png b/other-licenses/branding/interlink/VisualElements_150.png
index 40297f270..40297f270 100644
--- a/other-licenses/branding/interlink/release/VisualElements_150.png
+++ b/other-licenses/branding/interlink/VisualElements_150.png
diff --git a/other-licenses/branding/interlink/release/VisualElements_70.png b/other-licenses/branding/interlink/VisualElements_70.png
index fa3db4f0f..fa3db4f0f 100644
--- a/other-licenses/branding/interlink/release/VisualElements_70.png
+++ b/other-licenses/branding/interlink/VisualElements_70.png
diff --git a/other-licenses/branding/interlink/release/application-branding.js b/other-licenses/branding/interlink/application-branding.js
index 16297feec..16297feec 100644
--- a/other-licenses/branding/interlink/release/application-branding.js
+++ b/other-licenses/branding/interlink/application-branding.js
diff --git a/other-licenses/branding/interlink/release/branding.nsi b/other-licenses/branding/interlink/branding.nsi
index a61d841f1..a61d841f1 100644
--- a/other-licenses/branding/interlink/release/branding.nsi
+++ b/other-licenses/branding/interlink/branding.nsi
diff --git a/other-licenses/branding/interlink/release/content/about-background.png b/other-licenses/branding/interlink/content/about-background.png
index 1603bb229..1603bb229 100644
--- a/other-licenses/branding/interlink/release/content/about-background.png
+++ b/other-licenses/branding/interlink/content/about-background.png
diff --git a/other-licenses/branding/interlink/release/content/about-logo.png b/other-licenses/branding/interlink/content/about-logo.png
index e76d20fe9..e76d20fe9 100644
--- a/other-licenses/branding/interlink/release/content/about-logo.png
+++ b/other-licenses/branding/interlink/content/about-logo.png
diff --git a/other-licenses/branding/interlink/release/content/about-wordmark.png b/other-licenses/branding/interlink/content/about-wordmark.png
index b0a570192..b0a570192 100644
--- a/other-licenses/branding/interlink/release/content/about-wordmark.png
+++ b/other-licenses/branding/interlink/content/about-wordmark.png
diff --git a/other-licenses/branding/interlink/release/content/about.png b/other-licenses/branding/interlink/content/about.png
index ea7b34041..ea7b34041 100644
--- a/other-licenses/branding/interlink/release/content/about.png
+++ b/other-licenses/branding/interlink/content/about.png
diff --git a/other-licenses/branding/interlink/release/content/aboutDialog.css b/other-licenses/branding/interlink/content/aboutDialog.css
index bd602c8fb..bd602c8fb 100644
--- a/other-licenses/branding/interlink/release/content/aboutDialog.css
+++ b/other-licenses/branding/interlink/content/aboutDialog.css
diff --git a/other-licenses/branding/interlink/release/content/icon48.png b/other-licenses/branding/interlink/content/icon48.png
index d585759e3..d585759e3 100644
--- a/other-licenses/branding/interlink/release/content/icon48.png
+++ b/other-licenses/branding/interlink/content/icon48.png
diff --git a/other-licenses/branding/interlink/release/content/icon64.png b/other-licenses/branding/interlink/content/icon64.png
index 455edcdc5..455edcdc5 100644
--- a/other-licenses/branding/interlink/release/content/icon64.png
+++ b/other-licenses/branding/interlink/content/icon64.png
diff --git a/other-licenses/branding/interlink/release/default16.png b/other-licenses/branding/interlink/default16.png
index 140d5ed18..140d5ed18 100644
--- a/other-licenses/branding/interlink/release/default16.png
+++ b/other-licenses/branding/interlink/default16.png
diff --git a/other-licenses/branding/interlink/release/default22.png b/other-licenses/branding/interlink/default22.png
index 88148f18b..88148f18b 100644
--- a/other-licenses/branding/interlink/release/default22.png
+++ b/other-licenses/branding/interlink/default22.png
diff --git a/other-licenses/branding/interlink/release/default24.png b/other-licenses/branding/interlink/default24.png
index 43c6a4e14..43c6a4e14 100644
--- a/other-licenses/branding/interlink/release/default24.png
+++ b/other-licenses/branding/interlink/default24.png
diff --git a/other-licenses/branding/interlink/release/default256.png b/other-licenses/branding/interlink/default256.png
index c5d78be22..c5d78be22 100644
--- a/other-licenses/branding/interlink/release/default256.png
+++ b/other-licenses/branding/interlink/default256.png
diff --git a/other-licenses/branding/interlink/release/default32.png b/other-licenses/branding/interlink/default32.png
index 4f8f509fc..4f8f509fc 100644
--- a/other-licenses/branding/interlink/release/default32.png
+++ b/other-licenses/branding/interlink/default32.png
diff --git a/other-licenses/branding/interlink/release/default48.png b/other-licenses/branding/interlink/default48.png
index 2d830c78d..2d830c78d 100644
--- a/other-licenses/branding/interlink/release/default48.png
+++ b/other-licenses/branding/interlink/default48.png
diff --git a/other-licenses/branding/interlink/release/jar.mn b/other-licenses/branding/interlink/jar.mn
index 40337de09..40337de09 100644
--- a/other-licenses/branding/interlink/release/jar.mn
+++ b/other-licenses/branding/interlink/jar.mn
diff --git a/other-licenses/branding/interlink/release/license.txt b/other-licenses/branding/interlink/license.txt
index 7fd5bacf0..7fd5bacf0 100644
--- a/other-licenses/branding/interlink/release/license.txt
+++ b/other-licenses/branding/interlink/license.txt
diff --git a/other-licenses/branding/interlink/release/locales/en-US/brand.dtd b/other-licenses/branding/interlink/locales/en-US/brand.dtd
index 1fb441b22..1fb441b22 100644
--- a/other-licenses/branding/interlink/release/locales/en-US/brand.dtd
+++ b/other-licenses/branding/interlink/locales/en-US/brand.dtd
diff --git a/other-licenses/branding/interlink/release/locales/en-US/brand.properties b/other-licenses/branding/interlink/locales/en-US/brand.properties
index 527a4539a..527a4539a 100644
--- a/other-licenses/branding/interlink/release/locales/en-US/brand.properties
+++ b/other-licenses/branding/interlink/locales/en-US/brand.properties
diff --git a/other-licenses/branding/interlink/release/locales/jar.mn b/other-licenses/branding/interlink/locales/jar.mn
index 0fe04daef..0fe04daef 100644
--- a/other-licenses/branding/interlink/release/locales/jar.mn
+++ b/other-licenses/branding/interlink/locales/jar.mn
diff --git a/other-licenses/branding/interlink/release/locales/moz.build b/other-licenses/branding/interlink/locales/moz.build
index e59008d87..e59008d87 100644
--- a/other-licenses/branding/interlink/release/locales/moz.build
+++ b/other-licenses/branding/interlink/locales/moz.build
diff --git a/other-licenses/branding/interlink/release/moz.build b/other-licenses/branding/interlink/moz.build
index af1df0686..af1df0686 100644
--- a/other-licenses/branding/interlink/release/moz.build
+++ b/other-licenses/branding/interlink/moz.build
diff --git a/other-licenses/branding/interlink/release/thunderbird.VisualElementsManifest.xml b/other-licenses/branding/interlink/thunderbird.VisualElementsManifest.xml
index d581a602f..d581a602f 100644
--- a/other-licenses/branding/interlink/release/thunderbird.VisualElementsManifest.xml
+++ b/other-licenses/branding/interlink/thunderbird.VisualElementsManifest.xml
diff --git a/other-licenses/branding/interlink/release/thunderbird.ico b/other-licenses/branding/interlink/thunderbird.ico
index 09defab14..09defab14 100644
--- a/other-licenses/branding/interlink/release/thunderbird.ico
+++ b/other-licenses/branding/interlink/thunderbird.ico
diff --git a/other-licenses/branding/interlink/trunk/Makefile.in b/other-licenses/branding/interlink/trunk/Makefile.in
deleted file mode 100644
index d507c4df2..000000000
--- a/other-licenses/branding/interlink/trunk/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Branding Makefile for nightlies/unofficial branding
-
-include $(topsrcdir)/config/rules.mk
-
-export::
-	$(NSINSTALL) -D $(DIST)/branding
-ifeq ($(OS_ARCH),WINNT)
-	cp $(srcdir)/thunderbird.ico   $(DIST)/branding/thunderbird.ico
-	cp $(srcdir)/branding.nsi      $(DIST)/branding/branding.nsi
-	cp $(srcdir)/wizHeader.bmp     $(DIST)/branding/wizHeader.bmp
-	cp $(srcdir)/wizHeaderRTL.bmp  $(DIST)/branding/wizHeaderRTL.bmp
-	cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/wizWatermark.bmp
-endif
-ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
-	cp $(srcdir)/mailicon16.png  $(DIST)/branding/default16.png
-	cp $(srcdir)/mailicon22.png  $(DIST)/branding/default22.png
-	cp $(srcdir)/mailicon24.png  $(DIST)/branding/default24.png
-	cp $(srcdir)/mailicon32.png  $(DIST)/branding/default32.png
-	cp $(srcdir)/mailicon48.png  $(DIST)/branding/default48.png
-	cp $(srcdir)/mailicon256.png $(DIST)/branding/default256.png
-endif
-
-# Now sort out the branding specific icons
-ifeq ($(OS_ARCH),WINNT)
-	cp $(srcdir)/windows/messengerWindow.ico  $(DIST)/branding/messengerWindow.ico
-endif
diff --git a/other-licenses/branding/interlink/trunk/VisualElements_150.png b/other-licenses/branding/interlink/trunk/VisualElements_150.png
deleted file mode 100644
index 67b8ddd42..000000000
--- a/other-licenses/branding/interlink/trunk/VisualElements_150.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/VisualElements_70.png b/other-licenses/branding/interlink/trunk/VisualElements_70.png
deleted file mode 100644
index 99172d2d3..000000000
--- a/other-licenses/branding/interlink/trunk/VisualElements_70.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/application-branding.js b/other-licenses/branding/interlink/trunk/application-branding.js
deleted file mode 100644
index 728c39c31..000000000
--- a/other-licenses/branding/interlink/trunk/application-branding.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// Default start page
-pref("mailnews.start_page.url","about:logopage");
-
-// start page override to load after an update
-pref("mailnews.start_page.override_url","about:logopage");
-
-// Interval: Time between checks for a new version (in seconds)
-// nightly=8 hours, official=24 hours
-pref("app.update.interval", 28800);
-
-// The time interval between the downloading of mar file chunks in the
-// background (in seconds)
-pref("app.update.download.backgroundInterval", 60);
-
-// Give the user x seconds to react before showing the big UI. default=24 hours
-pref("app.update.promptWaitTime", 86400);
-
-pref("app.vendorURL", "http://binaryoutcast.com/projects/interlink/");
-
-// URL user can browse to manually if for some reason all update installation
-// attempts fail.
-pref("app.update.url.manual", "http://binaryoutcast.com/projects/interlink/download/");
-// A default value for the "More information about this update" link
-// supplied in the "An update is available" page of the update wizard.
-pref("app.update.url.details", "http://binaryoutcast.com/projects/interlink/release-notes/");
-
-// Release notes URL
-pref("app.releaseNotesURL", "http://binaryoutcast.com/projects/interlink/release-notes/");
-
-// Base URL for web-based support pages.
-pref("app.support.baseURL", "https://binaryoutcast.com/projects/interlink/support/");
diff --git a/other-licenses/branding/interlink/trunk/branding.nsi b/other-licenses/branding/interlink/trunk/branding.nsi
deleted file mode 100644
index a61d841f1..000000000
--- a/other-licenses/branding/interlink/trunk/branding.nsi
+++ /dev/null
@@ -1,15 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# NSIS defines for nightly builds.
-# The release build branding.nsi is located in other-license/branding/thunderbird/
-
-# BrandFullNameInternal is used for some registry and file system values
-# instead of BrandFullName and typically should not be modified.
-!define BrandFullNameInternal "Interlink"
-!define CompanyName           "Bunary Outcast"
-!define URLInfoAbout          "http://binaryoutcast.com/projects/interlink/"
-!define URLUpdateInfo         "http://binaryoutcast.com/projects/interlink/"
-!define URLSystemRequirements "http://binaryoutcast.com/projects/interlink/"
-!define SurveyURL             "http://binaryoutcast.com/projects/interlink/"
diff --git a/other-licenses/branding/interlink/trunk/content/about-background.png b/other-licenses/branding/interlink/trunk/content/about-background.png
deleted file mode 100644
index 1603bb229..000000000
--- a/other-licenses/branding/interlink/trunk/content/about-background.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/content/about-logo.png b/other-licenses/branding/interlink/trunk/content/about-logo.png
deleted file mode 100644
index 11bae9564..000000000
--- a/other-licenses/branding/interlink/trunk/content/about-logo.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/content/about-wordmark.png b/other-licenses/branding/interlink/trunk/content/about-wordmark.png
deleted file mode 100644
index b0a570192..000000000
--- a/other-licenses/branding/interlink/trunk/content/about-wordmark.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/content/about.png b/other-licenses/branding/interlink/trunk/content/about.png
deleted file mode 100644
index 070bf4187..000000000
--- a/other-licenses/branding/interlink/trunk/content/about.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/content/aboutDialog.css b/other-licenses/branding/interlink/trunk/content/aboutDialog.css
deleted file mode 100644
index bd602c8fb..000000000
--- a/other-licenses/branding/interlink/trunk/content/aboutDialog.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#aboutDialogContainer {
-  background-image: linear-gradient(to top, #c0c0c0 0%,#ffffff 100%);
-  background-repeat: no-repeat;
-  background-color: #ffa26f;
-  color: #000;
-}
-
-#leftBox {
-  background-image: url("chrome://branding/content/about-logo.png");
-  background-repeat: no-repeat;
-  /* min-width and min-height create room for the logo */
-  min-width: 210px;
-  min-height: 210px;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  -moz-margin-start: 20px;
-}
-
-.text-link {
-  color: #338 !important;
-}
-
-.bottom-link {
-  color: #000 !important;
-}
-
-#rightBox {
-  /* this margin prevents text from overlapping the logo image */
-  margin-left: 30px;
-  margin-right: 20px;
-}
-
-#bottomBox {
-  background-color: rgba(255,255,255,.7);
-}
diff --git a/other-licenses/branding/interlink/trunk/content/icon48.png b/other-licenses/branding/interlink/trunk/content/icon48.png
deleted file mode 100644
index e602b6d45..000000000
--- a/other-licenses/branding/interlink/trunk/content/icon48.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/content/icon64.png b/other-licenses/branding/interlink/trunk/content/icon64.png
deleted file mode 100644
index 7de951de4..000000000
--- a/other-licenses/branding/interlink/trunk/content/icon64.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/jar.mn b/other-licenses/branding/interlink/trunk/jar.mn
deleted file mode 100644
index 40337de09..000000000
--- a/other-licenses/branding/interlink/trunk/jar.mn
+++ /dev/null
@@ -1,15 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-messenger.jar:
-% content branding %content/branding/
-  content/branding/about-background.png             (content/about-background.png)
-  content/branding/about-logo.png                   (content/about-logo.png)
-  content/branding/about-wordmark.png               (content/about-wordmark.png)
-  content/branding/about.png                        (content/about.png)
-  content/branding/icon48.png                       (content/icon48.png)
-  content/branding/icon64.png                       (content/icon64.png)
-  content/branding/aboutDialog.css                  (content/aboutDialog.css)
-  ../classic/skin/classic/messenger/icons/new-mail-alert.png       (content/icon48.png)
diff --git a/other-licenses/branding/interlink/trunk/locales/en-US/brand.dtd b/other-licenses/branding/interlink/trunk/locales/en-US/brand.dtd
deleted file mode 100644
index 1fb441b22..000000000
--- a/other-licenses/branding/interlink/trunk/locales/en-US/brand.dtd
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY  brandShortName        "Interlink">
-<!ENTITY  brandShorterName      "Interlink">
-<!ENTITY  brandFullName         "Interlink Mail &amp; News">
-<!ENTITY  vendorShortName       "Binary Outcast">
-<!ENTITY  trademarkInfo.part1   "Interlink Mail &amp; News, Binary Outcast, and all branding assets are copyright or trademarks of Matt A. Tobin">
diff --git a/other-licenses/branding/interlink/trunk/locales/en-US/brand.properties b/other-licenses/branding/interlink/trunk/locales/en-US/brand.properties
deleted file mode 100644
index 527a4539a..000000000
--- a/other-licenses/branding/interlink/trunk/locales/en-US/brand.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-brandShortName=Interlink
-brandShorterName=Interlink
-brandFullName=Interlink Mail & Newsgroups
-vendorShortName=Binary Outcast
\ No newline at end of file
diff --git a/other-licenses/branding/interlink/trunk/locales/jar.mn b/other-licenses/branding/interlink/trunk/locales/jar.mn
deleted file mode 100644
index 0fe04daef..000000000
--- a/other-licenses/branding/interlink/trunk/locales/jar.mn
+++ /dev/null
@@ -1,11 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-@AB_CD@.jar:
-% locale branding @AB_CD@ %locale/@AB_CD@/branding/
-# Shredder branding only exists in en-US
-  locale/@AB_CD@/branding/brand.dtd        (en-US/brand.dtd)
-  locale/@AB_CD@/branding/brand.properties (en-US/brand.properties)
diff --git a/other-licenses/branding/interlink/trunk/locales/moz.build b/other-licenses/branding/interlink/trunk/locales/moz.build
deleted file mode 100644
index e59008d87..000000000
--- a/other-licenses/branding/interlink/trunk/locales/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-JAR_MANIFESTS += ['jar.mn']
-
-DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
diff --git a/other-licenses/branding/interlink/trunk/mailicon16.png b/other-licenses/branding/interlink/trunk/mailicon16.png
deleted file mode 100644
index 128a7a7b8..000000000
--- a/other-licenses/branding/interlink/trunk/mailicon16.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/mailicon22.png b/other-licenses/branding/interlink/trunk/mailicon22.png
deleted file mode 100644
index 96dc63369..000000000
--- a/other-licenses/branding/interlink/trunk/mailicon22.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/mailicon24.png b/other-licenses/branding/interlink/trunk/mailicon24.png
deleted file mode 100644
index a0d97412d..000000000
--- a/other-licenses/branding/interlink/trunk/mailicon24.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/mailicon256.png b/other-licenses/branding/interlink/trunk/mailicon256.png
deleted file mode 100644
index 71a8c1465..000000000
--- a/other-licenses/branding/interlink/trunk/mailicon256.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/mailicon32.png b/other-licenses/branding/interlink/trunk/mailicon32.png
deleted file mode 100644
index acf82adb9..000000000
--- a/other-licenses/branding/interlink/trunk/mailicon32.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/mailicon48.png b/other-licenses/branding/interlink/trunk/mailicon48.png
deleted file mode 100644
index 7d261cd90..000000000
--- a/other-licenses/branding/interlink/trunk/mailicon48.png
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/moz.build b/other-licenses/branding/interlink/trunk/moz.build
deleted file mode 100644
index 6c9d7f89e..000000000
--- a/other-licenses/branding/interlink/trunk/moz.build
+++ /dev/null
@@ -1,23 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += ['locales']
-
-JAR_MANIFESTS += ['jar.mn']
-
-JS_PREFERENCE_FILES += [
-    'application-branding.js',
-]
-
-BRANDING_FILES += ['../release/license.txt']
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-  FINAL_TARGET_FILES += [
-      'thunderbird.VisualElementsManifest.xml',
-  ]
-  FINAL_TARGET_FILES.VisualElements += [
-      'VisualElements_150.png',
-      'VisualElements_70.png',
-  ]
diff --git a/other-licenses/branding/interlink/trunk/thunderbird.VisualElementsManifest.xml b/other-licenses/branding/interlink/trunk/thunderbird.VisualElementsManifest.xml
deleted file mode 100644
index d581a602f..000000000
--- a/other-licenses/branding/interlink/trunk/thunderbird.VisualElementsManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-  <VisualElements
-      ShowNameOnSquare150x150Logo='on'
-      Square150x150Logo='VisualElements\VisualElements_150.png'
-      Square70x70Logo='VisualElements\VisualElements_70.png'
-      ForegroundText='light'
-      BackgroundColor='#3465a4'/>
-</Application>
diff --git a/other-licenses/branding/interlink/trunk/thunderbird.ico b/other-licenses/branding/interlink/trunk/thunderbird.ico
deleted file mode 100644
index 7cdb93272..000000000
--- a/other-licenses/branding/interlink/trunk/thunderbird.ico
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/windows/messengerWindow.ico b/other-licenses/branding/interlink/trunk/windows/messengerWindow.ico
deleted file mode 100644
index 7cdb93272..000000000
--- a/other-licenses/branding/interlink/trunk/windows/messengerWindow.ico
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/wizHeader.bmp b/other-licenses/branding/interlink/trunk/wizHeader.bmp
deleted file mode 100644
index 6130dae6b..000000000
--- a/other-licenses/branding/interlink/trunk/wizHeader.bmp
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/wizHeaderRTL.bmp b/other-licenses/branding/interlink/trunk/wizHeaderRTL.bmp
deleted file mode 100644
index 77f8a92b8..000000000
--- a/other-licenses/branding/interlink/trunk/wizHeaderRTL.bmp
+++ /dev/null
diff --git a/other-licenses/branding/interlink/trunk/wizWatermark.bmp b/other-licenses/branding/interlink/trunk/wizWatermark.bmp
deleted file mode 100644
index 9c67beb98..000000000
--- a/other-licenses/branding/interlink/trunk/wizWatermark.bmp
+++ /dev/null
diff --git a/other-licenses/branding/interlink/release/windows/messengerWindow.ico b/other-licenses/branding/interlink/windows/messengerWindow.ico
index 09defab14..09defab14 100644
--- a/other-licenses/branding/interlink/release/windows/messengerWindow.ico
+++ b/other-licenses/branding/interlink/windows/messengerWindow.ico
diff --git a/other-licenses/branding/interlink/release/wizHeader.bmp b/other-licenses/branding/interlink/wizHeader.bmp
index a0bf32000..a0bf32000 100644
--- a/other-licenses/branding/interlink/release/wizHeader.bmp
+++ b/other-licenses/branding/interlink/wizHeader.bmp
diff --git a/other-licenses/branding/interlink/release/wizHeaderRTL.bmp b/other-licenses/branding/interlink/wizHeaderRTL.bmp
index e3266c5e1..e3266c5e1 100644
--- a/other-licenses/branding/interlink/release/wizHeaderRTL.bmp
+++ b/other-licenses/branding/interlink/wizHeaderRTL.bmp
diff --git a/other-licenses/branding/interlink/release/wizWatermark.bmp b/other-licenses/branding/interlink/wizWatermark.bmp
index 064f988a1..064f988a1 100644
--- a/other-licenses/branding/interlink/release/wizWatermark.bmp
+++ b/other-licenses/branding/interlink/wizWatermark.bmp
diff --git a/xpfe/content/communicator.css b/xpfe/content/communicator.css
index a934b0561..5ab7f927d 100644
--- a/xpfe/content/communicator.css
+++ b/xpfe/content/communicator.css
@@ -39,26 +39,6 @@ toolbaritem {
 /******* toolkit access layer *******/
 /* These rules reintroduce the toolkit bindings overwritten later below */
 %ifdef BINOC_NAVIGATOR
-toolbox[xpfe="false"] { 
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbox");
-}
-
-toolbox[xpfe="false"] > toolbar,
-toolbar[xpfe="false"][type="menubar"],
-toolbar[xpfe="false"] {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
-}
-
-menubar[xpfe="false"],
-toolbar > toolbaritem > menubar,
-toolbar > menubar {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#menubar");
-}
-
-toolbar > toolbarpaletteitem > toolbaritem > menubar {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#menubar") !important;
-}
-
 .menubar-items {
   -moz-box-orient: vertical; /* for flex hack */
 }
@@ -89,28 +69,6 @@ prefpane[xpfe="false"] > .content-box {
 
 /******* SeaMonkey XPFE *******/
 /* These bindings reflect SeaMonkey XPFE, modulo new toolkit features. */
-%ifdef BINOC_NAVIGATOR
-toolbox { 
-  -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbox");
-}
-  
-toolbar {
-  -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar");
-}
-
-toolbar[type="menubar"] {
-  -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-menubar");
-}
-
-toolbargrippy {
-  -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#toolbargrippy");
-}
-
-menubar {
-  -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippymenubar");
-}
-%endif
-
 prefwindow {
   -moz-binding: url("chrome://communicator/content/bindings/prefwindow.xml#prefwindow");
 }
@@ -153,20 +111,4 @@ textbox[enablehistory="true"] > .autocomplete-history-dropmarker {
 #sync-notifications > notification {
   -moz-binding: url("chrome://communicator/content/sync/syncNotification.xml#notification");
 }
-
-/******* autohide toolbars *******/
-
-toolbar[type="menubar"][autohide="true"]
-{
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-menubar-autohide");
-  overflow: hidden;
-}
-
-toolbar[type="menubar"][autohide="true"][inactive="true"]
-{
-  min-height: 0px !important;
-  height: 0px !important;
-  -moz-appearance: none !important;
-  border-style: none !important;
-}
 %endif
\ No newline at end of file