diff --git a/mail/components/migration/content/migration.css b/mail/components/migration/content/migration.css
index 3f8a9a3746c6..b6d59407b8b1 100644
--- a/mail/components/migration/content/migration.css
+++ b/mail/components/migration/content/migration.css
@@ -41,3 +41,7 @@
 .wizard-header {
   background: url("chrome://branding/content/thunderbird-wizard-badge.png") no-repeat right center Window;
 }
+
+.wizard-header[chromedir="rtl"] {
+  background: url("chrome://branding/content/thunderbird-wizard-badge-rtl.png") no-repeat left center Window;
+}
diff --git a/mail/themes/qute/editor/EdImageMap.css b/mail/themes/qute/editor/EdImageMap.css
index 31876a65fd9e..907673f8a234 100644
--- a/mail/themes/qute/editor/EdImageMap.css
+++ b/mail/themes/qute/editor/EdImageMap.css
@@ -45,11 +45,17 @@ toolbar#toolbox {
 }
 
 toolbar#toolbox button.tool:active {
-  margin: 2px 0px 0px 2px;
+  margin-top: 2px;
+  margin-bottom: 0px;
+  -moz-margin-start: 2px;
+  -moz-margin-end: 0px;
 }
 
 toolbar#toolbox button.tool[toggled="1"] {
-  margin: 2px 0px 0px 2px;
+  margin-top: 2px;
+  margin-bottom: 0px;
+  -moz-margin-start: 2px;
+  -moz-margin-end: 0px;
   border: 1px white inset;
 }
 
diff --git a/mail/themes/qute/editor/EditorDialog.css b/mail/themes/qute/editor/EditorDialog.css
index 6b94051e56b0..34ba8225d736 100644
--- a/mail/themes/qute/editor/EditorDialog.css
+++ b/mail/themes/qute/editor/EditorDialog.css
@@ -127,7 +127,10 @@ groupbox {
   border : 2px outset #CCCCCC;
   width: 25px;
   height: 20px;
-  margin: 0px 3px 0px 0px;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  -moz-margin-start: 0px;
+  -moz-margin-end: 3px;
 }
 
 #ColorPickerSwatch[default="true"] {
@@ -139,7 +142,10 @@ groupbox {
   width: 17px;
   height: 13px; 
   border: 1px inset #CCCCCC;
-  margin: 1px 2px 2px 4px;
+    margin-top: 1px;
+  margin-bottom: 2px;
+  -moz-margin-start: 4px;
+  -moz-margin-end: 2px;
 }
 
 /* temporary -- we need a simple box-based list defined in XBL */
@@ -152,7 +158,7 @@ tree.list {
 
 #ColorPreview {
   border: 1px inset #CCCCCC;
-  margin-left:    10px;
+  -moz-margin-start:    10px;
   padding-left:    5px;
   padding-right:   5px;
   min-width:     100px;
@@ -160,7 +166,7 @@ tree.list {
 }
 
 #alignTypeSelect,label#alignLabel {
-  margin-left: 5px;
+  -moz-margin-start: 5px;
 }
 
 /* ::::: table properties dialog ::::: */
@@ -212,7 +218,7 @@ tree.list {
 .colorpicker {
   border: 1px outset #CCCCCC;
   /* This should be the same as for textbox */
-  margin-left: 4px;
+  -moz-margin-start: 4px;
   /* For a little extra space between buttons */
   margin-bottom: 2px;
 }
diff --git a/mail/themes/qute/editor/editor.css b/mail/themes/qute/editor/editor.css
index 4abef6019a8a..1b7d79ecbd0b 100644
--- a/mail/themes/qute/editor/editor.css
+++ b/mail/themes/qute/editor/editor.css
@@ -51,11 +51,17 @@
 
 .source-editor,
 .source-editor:focus {
-  margin: 0px 5px 5px 0px;
+  margin-top: 0px;
+  margin-bottom: 5px;
+  -moz-margin-start: 0px;
+  -moz-margin-end: 5px;
   border: 0px;
   /* Scroll bars are in content, 
      so we can't use right and bottom padding! */
-  padding: 5px 0px 0px 5px;
+  padding-top: 5px;
+  padding-bottom: 0px;
+  -moz-padding-start: 5px;
+  -moz-padding-end: 0px;
 }
 
 /* Multiline textarea for HTML source editing */
diff --git a/mail/themes/qute/mail/accountCentral.css b/mail/themes/qute/mail/accountCentral.css
index 9d1c63419e97..4c52e5cf05cb 100644
--- a/mail/themes/qute/mail/accountCentral.css
+++ b/mail/themes/qute/mail/accountCentral.css
@@ -58,21 +58,24 @@ separator.thin {
 /* ::::: rows ::::: */
 
 #acctCentralHeaderRow {
-  padding: 10px 0px 10px 10px;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  -moz-padding-start: 10px;
+  -moz-padding-end: 0px;
   font-size: 180%;
   font-weight: bold;
   color: #000000;
 }
 
 .acctCentralRow {
-  margin-left: 10px;
+  -moz-margin-start: 10px;
   font-size: 125%;
   color: #000000;
 }
 
 .row-iconic-icon {
   list-style-image: inherit;
-  margin-right: 10px;
+  -moz-margin-end: 10px;
 }
 
 .acctCentralRowTitleBox {
@@ -100,70 +103,110 @@ separator.thin {
 
 #ReadMessages label {
   background: url("chrome://messenger/skin/accountcentral/read-messages.png")  no-repeat !important;
-  padding-left: 45px;
+  -moz-padding-start: 45px;
   padding-top: .55em;
   padding-bottom: .55em;
 }
 
+#ReadMessages label[chromedir="rtl"] {
+  background: url("chrome://messenger/skin/accountcentral/read-messages.png") right no-repeat !important;
+}
+
 #ComposeMessage label {
   background: url("chrome://messenger/skin/accountcentral/write-message.png")  no-repeat !important;
-  padding-left: 45px;
+  -moz-padding-start: 45px;
   padding-top: .55em;
   padding-bottom: .55em;
 }
 
+#ComposeMessage label[chromedir="rtl"] {
+  background: url("chrome://messenger/skin/accountcentral/write-message.png") right no-repeat !important;
+}
+
 #AccountSettings label {
   background: url("chrome://messenger/skin/accountcentral/account-settings.png")  no-repeat !important;
-  padding-left: 45px;
+  -moz-padding-start: 45px;
   padding-top: .55em;
   padding-bottom: .55em;
 }
 
+#AccountSettings label[chromedir="rtl"] {
+  background: url("chrome://messenger/skin/accountcentral/account-settings.png") right no-repeat !important;
+}
+
 #CreateAccount label {
   background: url("chrome://messenger/skin/accountcentral/create-account.png")  no-repeat !important;
-  padding-left: 45px;
+  -moz-padding-start: 45px;
   padding-top: .55em;
   padding-bottom: .55em;
 }
 
+#CreateAccount label[chromedir="rtl"] {
+  background: url("chrome://messenger/skin/accountcentral/create-account.png") right no-repeat !important;
+}
+
 #SearchMessages label {
   background: url("chrome://messenger/skin/accountcentral/search-messages.png")  no-repeat !important;
-  padding-left: 45px;
+  -moz-padding-start: 45px;
   padding-top: .55em;
   padding-bottom: .55em;
 }
 
+#SearchMessages label[chromedir="rtl"] {
+  background: url("chrome://messenger/skin/accountcentral/search-messages.png") right no-repeat !important;
+}
+
 #CreateFilters label {
   background: url("chrome://messenger/skin/accountcentral/manage-filters.png")  no-repeat !important;
-  padding-left: 45px;
+  -moz-padding-start: 45px;
   padding-top: .55em;
   padding-bottom: .55em;
 }
 
+#CreateFilters label[chromedir="rtl"] {
+  background: url("chrome://messenger/skin/accountcentral/manage-filters.png") right no-repeat !important;
+}
+
 #OfflineSettings label {
   background: url("chrome://messenger/skin/accountcentral/offline-settings.png")  no-repeat !important;
-  padding-left: 45px;
+  -moz-padding-start: 45px;
   padding-top: .55em;
   padding-bottom: .55em;
 }
 
+#OfflineSettings label[chromedir="rtl"] {
+  background: url("chrome://messenger/skin/accountcentral/offline-settings.png") right no-repeat !important;
+}
+
 #SubscribeImapFolders label {
   background: url("chrome://messenger/skin/accountcentral/manage-imap.png")  no-repeat !important;
-  padding-left: 45px;
+  -moz-padding-start: 45px;
   padding-top: .55em;
   padding-bottom: .55em;
 }
 
+#SubscribeImapFolders label[chromedir="rtl"] {
+  background: url("chrome://messenger/skin/accountcentral/manage-imap.png") right no-repeat !important;
+}
+
 #SubscribeNewsgroups label {
   background: url("chrome://messenger/skin/accountcentral/manage-newsgroups.png")  no-repeat !important;
-  padding-left: 45px;
+  -moz-padding-start: 45px;
   padding-top: .55em;
   padding-bottom: .55em;
 }
 
+#SubscribeNewsgroups label[chromedir="rtl"] {
+  background: url("chrome://messenger/skin/accountcentral/manage-newsgroups.png") right no-repeat !important;
+}
+
 #SubscribeRSS label {
   background: url("chrome://messenger/skin/accountcentral/manage-rss.png")  no-repeat !important;
-  padding-left: 45px;
+  -moz-padding-start: 45px;
   padding-top: .55em;
   padding-bottom: .55em;
+}
+
+#SubscribeRSS label[chromedir="rtl"] {
+  background: url("chrome://messenger/skin/accountcentral/manage-rss.png") right no-repeat !important;
 }
\ No newline at end of file
diff --git a/mail/themes/qute/mail/accountManage.css b/mail/themes/qute/mail/accountManage.css
index a112c4ad22e9..71015b5748c0 100644
--- a/mail/themes/qute/mail/accountManage.css
+++ b/mail/themes/qute/mail/accountManage.css
@@ -46,7 +46,7 @@
 /* ::::: account manager :::::: */
 
 .specialFolderPickerGrid {
-  margin-left: 20px;
+  -moz-margin-start: 20px;
 }
 
 .selectForOfflineUseButton {
@@ -65,7 +65,7 @@ treechildren::-moz-tree-cell-text(isDefaultServer-true) {
 /* ::::: SMTP Server Panel :::::: */
 
 .smtpServerListItem {
-  padding-left: 3px;
+  -moz-padding-start: 3px;
 }
 
 #backgroundBox {
diff --git a/mail/themes/qute/mail/accountWizard.css b/mail/themes/qute/mail/accountWizard.css
index 2008863281ff..a847b1685205 100644
--- a/mail/themes/qute/mail/accountWizard.css
+++ b/mail/themes/qute/mail/accountWizard.css
@@ -47,16 +47,16 @@
 
 .awIdentityLabel {
   width: 8em; 
-  margin-left: 5px;
+  -moz-margin-start: 5px;
 }
 
 #fullName {
-  margin-right: 15px;
+  -moz-margin-end: 15px;
 }
 .serverLabel {
   width: 8em;
 }
 
 .serverDataBox {
-  margin-left: 15px;
+  -moz-margin-start: 15px;
 }
diff --git a/mail/themes/qute/mail/addrbook/abContactsPanel.css b/mail/themes/qute/mail/addrbook/abContactsPanel.css
index 8a3626117cef..82f0e9170b25 100644
--- a/mail/themes/qute/mail/addrbook/abContactsPanel.css
+++ b/mail/themes/qute/mail/addrbook/abContactsPanel.css
@@ -66,19 +66,19 @@
 }
 
 treechildren::-moz-tree-image(GeneratedName) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
 }
 
 treechildren::-moz-tree-image(GeneratedName, MailList) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
 }
 
 /* ::::: directory pane icons ::::: */
 
 treechildren::-moz-tree-image(DirCol) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
 }
 
diff --git a/mail/themes/qute/mail/addrbook/abResultsPane.css b/mail/themes/qute/mail/addrbook/abResultsPane.css
index 234a98dfc0c4..f7b42167c7a2 100644
--- a/mail/themes/qute/mail/addrbook/abResultsPane.css
+++ b/mail/themes/qute/mail/addrbook/abResultsPane.css
@@ -38,12 +38,12 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 treechildren::-moz-tree-image(GeneratedName) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
 }
 
 treechildren::-moz-tree-image(GeneratedName, MailList) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
 }
 
diff --git a/mail/themes/qute/mail/addrbook/addressbook.css b/mail/themes/qute/mail/addrbook/addressbook.css
index e5dab8f3e5b2..cbed6f312778 100644
--- a/mail/themes/qute/mail/addrbook/addressbook.css
+++ b/mail/themes/qute/mail/addrbook/addressbook.css
@@ -253,13 +253,13 @@ toolbar[iconsize="small"] #button-abdelete[disabled] {
 }
 
 #abDirTreeHeader-title {
-  padding-left: 4px;
+  -moz-padding-start: 4px;
 }
 
 /* ::::: directory pane icons ::::: */
 
 treechildren::-moz-tree-image(DirCol) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
 }
 
@@ -298,12 +298,12 @@ treechildren::-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) {
 /* ::::: results pane ::::: */
 
 treechildren::-moz-tree-image(GeneratedName) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
 }
 
 treechildren::-moz-tree-image(GeneratedName, MailList) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
 }
 
@@ -343,7 +343,7 @@ treechildren::-moz-tree-image(GeneratedName, MailList) {
 
 .CardViewHeading {
   padding: 1px;
-  padding-left: 5px;
+  -moz-padding-start: 5px;
   background-color: Highlight;
   color: HighlightText;
   font-weight: bold;
@@ -351,14 +351,14 @@ treechildren::-moz-tree-image(GeneratedName, MailList) {
 }
 
 #cvBuddyIcon {
-  padding-left: 20px;
+  -moz-padding-start: 20px;
   padding-top: 2px;
 }
 
 .CardViewText,
 .CardViewLink {
-  padding-left: 20px;
-  padding-right: 2px;
+  -moz-padding-start: 20px;
+  -moz-padding-end: 2px;
   min-width: 30px;
   margin: 0px;
 }
@@ -374,8 +374,8 @@ treechildren::-moz-tree-image(GeneratedName, MailList) {
 }
 
 html|a {
-  padding-left: 0px;
-  padding-right: 2px;
+  -moz-padding-start: 0px;
+  -moz-padding-end: 2px;
   border: none !important;
 }
 
diff --git a/mail/themes/qute/mail/addrbook/cardDialog.css b/mail/themes/qute/mail/addrbook/cardDialog.css
index 5599ef633de9..2d5004aeed56 100644
--- a/mail/themes/qute/mail/addrbook/cardDialog.css
+++ b/mail/themes/qute/mail/addrbook/cardDialog.css
@@ -56,8 +56,8 @@
 }
 
 .alignBoxWithFieldset {
-  margin-left: 6px;
-  margin-right: 5px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: 5px;
 }
 
 .stateZipSpacer {
diff --git a/mail/themes/qute/mail/alert.css b/mail/themes/qute/mail/alert.css
index 719acbb39c6a..6dd54a778d81 100644
--- a/mail/themes/qute/mail/alert.css
+++ b/mail/themes/qute/mail/alert.css
@@ -52,8 +52,8 @@
 
 .alertImageBox 
 {
-  margin-left: 4px;
-  margin-right: 6px;
+  -moz-margin-start: 4px;
+  -moz-margin-end: 6px;
   min-height: 46px;
 }
 
@@ -64,7 +64,7 @@
 
 .alertText 
 {
-  margin-right: 6px;
+  -moz-margin-end: 6px;
 }
 
 .alertText[clickable="true"] 
@@ -80,6 +80,6 @@
 
 .alertTextBox
 {
-  padding-right: 10px;
+  -moz-padding-end: 10px;
   padding-top: 5px;
 }
diff --git a/mail/themes/qute/mail/compose/messengercompose.css b/mail/themes/qute/mail/compose/messengercompose.css
index 8e10cde61e2c..bb9c4b95ccbb 100644
--- a/mail/themes/qute/mail/compose/messengercompose.css
+++ b/mail/themes/qute/mail/compose/messengercompose.css
@@ -336,7 +336,7 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
 
 .listcell-icon
 {
-  margin-left: 2px;
+  -moz-margin-start: 2px;
   margin-top: 2px;
 }
 
@@ -718,11 +718,17 @@ treechildren::-moz-tree-image(remote-err) {
 }
 
 #TextColorButton {
-  margin: 2px 9px 9px 2px;
+  margin-top: 2px;
+  margin-bottom: 9px;
+  -moz-margin-start: 2px;
+  -moz-margin-end: 9px;
 }
 
 #BackgroundColorButton {
-  margin: 9px 2px 2px 9px;
+  margin-top: 9px;
+  margin-bottom: 2px;
+  -moz-margin-start: 9px;
+  -moz-margin-end: 2px;
 }
 
 #HighlightColorButton {
diff --git a/mail/themes/qute/mail/dialogs.css b/mail/themes/qute/mail/dialogs.css
index a5902d64a828..e835aa42d350 100644
--- a/mail/themes/qute/mail/dialogs.css
+++ b/mail/themes/qute/mail/dialogs.css
@@ -56,7 +56,10 @@ menu.push {
 menu.push:hover:active,
 menu.push[open="true"] {
   border-style: inset;
-  padding: 3px 1px 1px 3px;
+  padding-top: 3px;
+  padding-bottom: 1px;
+  -moz-padding-start: 3px;
+  -moz-padding-end: 1px;
 }
 
 menu.push[disabled="true"],
diff --git a/mail/themes/qute/mail/filterDialog.css b/mail/themes/qute/mail/filterDialog.css
index b1693882848b..77173c83634c 100644
--- a/mail/themes/qute/mail/filterDialog.css
+++ b/mail/themes/qute/mail/filterDialog.css
@@ -77,7 +77,7 @@ textbox {
 }
 
 .filler {
-  padding-right: 22px;
+  -moz-padding-end: 22px;
 }
 
 .ruleactionitem {
diff --git a/mail/themes/qute/mail/junkMail.css b/mail/themes/qute/mail/junkMail.css
index ccec3a42e5cf..2bd287af3f93 100644
--- a/mail/themes/qute/mail/junkMail.css
+++ b/mail/themes/qute/mail/junkMail.css
@@ -49,7 +49,7 @@
 /* ::::: account manager :::::: */
 
 .specialFolderPickerGrid {
-  margin-left: 20px;
+  -moz-margin-start: 20px;
 }
 
 /* XXX: would be nice to find a common place for this XXX */
diff --git a/mail/themes/qute/mail/mailWindow1.css b/mail/themes/qute/mail/mailWindow1.css
index 596cfbe1b313..cebff6e17e99 100644
--- a/mail/themes/qute/mail/mailWindow1.css
+++ b/mail/themes/qute/mail/mailWindow1.css
@@ -69,7 +69,7 @@
 treechildren::-moz-tree-row(dummy)  {
   background-color:  #F0F0F0;
   margin-bottom: 1px;
-  padding-left: 2px;
+  -moz-padding-start: 2px;
 }
 
 treechildren::-moz-tree-row(dummy, selected) {
@@ -110,7 +110,7 @@ treechildren::-moz-tree-cell-text(container, closed, hasUnread, read) {
 treecol.threadColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/thread-col.png");
 
-  padding-right: 3px; 
+  -moz-padding-end: 3px; 
 }
 
 treecol.threadColumnHeader[sortDirection="ascending"]  {
@@ -141,7 +141,7 @@ treechildren::-moz-tree-image(threadCol, container, hasUnread, open) {
 
 treecol.readColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/readcol.png");
-  padding-right: 5px;
+  -moz-padding-end: 5px;
   padding-bottom: 5px;
 }
 
@@ -161,7 +161,7 @@ treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
 
 treecol.attachmentColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/attachment-col.png");
-  padding-right: 5px; 
+  -moz-padding-end: 5px; 
 }
 
 treechildren::-moz-tree-image(attachmentCol, attach) {
@@ -172,7 +172,7 @@ treechildren::-moz-tree-image(attachmentCol, attach) {
 
 treecol.flagColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/flag-col.png");
-  padding-right: 5px; 
+  -moz-padding-end: 5px; 
 }
 
 treechildren::-moz-tree-image(flaggedCol) {
@@ -191,13 +191,13 @@ treechildren::-moz-tree-image(flaggedCol, flagged) {
 
 treecol.junkStatusHeader {
   list-style-image: url("chrome://messenger/skin/icons/junk-col.png");
-  padding-right: 5px; 
+  -moz-padding-end: 5px; 
 }
 
 /* "unknown" now looks like "not junk".  see bug #182386 */
 treechildren::-moz-tree-image(junkStatusCol) {
   list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
-  padding-left: 0px;
+  -moz-padding-start: 0px;
 }
 
 treechildren::-moz-tree-image(junkStatusCol, junk) {
@@ -210,12 +210,12 @@ treechildren::-moz-tree-image(junkStatusCol, dummy) {
 
 treechildren::-moz-tree-image(junkStatusCol, notjunk) {
   list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
-  padding-left: 0px;
+  -moz-padding-start: 0px;
 }
 /* ..... subject column ..... */
 
 treechildren::-moz-tree-image(subjectCol) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/message-mail.png ");
 }
 
@@ -866,7 +866,7 @@ treechildren::-moz-tree-cell-text(lc-black, selected, focus) {
 }
 
 #folderpane-title {
-  padding-left: 4px;
+  -moz-padding-start: 4px;
 }
 
 /* ::::: border adjustments for focus ring and joined splitters ::::: */
diff --git a/mail/themes/qute/mail/messageHeader.css b/mail/themes/qute/mail/messageHeader.css
index f44644b6ae2f..b2516252ff16 100644
--- a/mail/themes/qute/mail/messageHeader.css
+++ b/mail/themes/qute/mail/messageHeader.css
@@ -69,7 +69,10 @@
   -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
   background-color: -moz-Field;
   color: -moz-FieldText;
-  margin: 5px 30px 5px 15px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+  -moz-margin-start: 15px;
+  -moz-margin-end: 30px;
 }
 
 /* XXX: Move all of the description attributes to the toolkit */
@@ -174,7 +177,7 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
 }
 
 .emailDisplayImage {
-  padding-left: 2px;
+  -moz-padding-start: 2px;
   -moz-box-pack: end;
 }
  
@@ -182,7 +185,7 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
 
 .addresstwisty {
 
-  padding-right: 5px;
+  -moz-padding-end: 5px;
 
   padding-top: 4px;
   list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
diff --git a/mail/themes/qute/mail/newsblog/feed-subscriptions.css b/mail/themes/qute/mail/newsblog/feed-subscriptions.css
index fbc33358a86b..242aec9954c0 100644
--- a/mail/themes/qute/mail/newsblog/feed-subscriptions.css
+++ b/mail/themes/qute/mail/newsblog/feed-subscriptions.css
@@ -47,7 +47,7 @@
 }
 
 #subscriptionChildren::-moz-tree-image(folderNameCol) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png");
 }
 
diff --git a/mail/themes/qute/mail/preferences/preferences.css b/mail/themes/qute/mail/preferences/preferences.css
index afe518e15008..992cbb4d2809 100644
--- a/mail/themes/qute/mail/preferences/preferences.css
+++ b/mail/themes/qute/mail/preferences/preferences.css
@@ -131,7 +131,10 @@ filefield[disabled="true"] .fileFieldIcon {
 .fileFieldIcon {
   width: 16px;
   height: 16px;
-  margin: 2px 4px 2px 2px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -moz-margin-start: 2px;
+  -moz-margin-end: 4px;
 }
 
 .fileFieldLabel {
@@ -162,7 +165,10 @@ filefield[disabled="true"] .fileFieldIcon {
 }
 
 #extensionChildren::-moz-tree-image(fileExtension) {
-  margin: 0px 5px 0px 0px;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  -moz-margin-start: 0px;
+  -moz-margin-end: 5px;
 }
 
 #typeField {
@@ -173,12 +179,15 @@ filefield[disabled="true"] .fileFieldIcon {
 #typeIcon {
   width: 32px;
   height: 32px;
-  margin-right: 3px;
+  -moz-margin-end: 3px;
 }
 
 #typeField {
   background-color: transparent;
-  margin: 1px 5px 2px 6px !important;
+  margin-top: 1px !important;
+  margin-bottom: 2px !important;
+  -moz-margin-start: 6px !important;
+  -moz-margin-end: 5px !important;
 }
 
 #extensionField {
@@ -191,7 +200,10 @@ filefield[disabled="true"] .fileFieldIcon {
 }
 
 #ChangeActionDialog .dialog-button-box {
-  padding: 8px 10px 10px 8px;
+  padding-top: 8px;
+  padding-bottom: 10px;
+  -moz-padding-start: 8px;
+  -moz-padding-end: 10px;
 }
 
 #changeActionHeader {
@@ -203,16 +215,19 @@ filefield[disabled="true"] .fileFieldIcon {
 }
 
 #changeActionContent {
-  padding: 8px 10px 10px 9px;
+  padding-top: 8px;
+  padding-bottom: 10px;
+  -moz-padding-start: 9px;
+  -moz-padding-end: 10px;
 }
 
 #defaultAppIcon {
   width: 16px;
   height: 16px;
-  margin-left: 2px;
+  -moz-margin-start: 2px;
 }
 
 #defaultAppName {
-  margin-left: 6px !important; 
+  -moz-margin-start: 6px !important; 
   font-weight: bold;
 }
diff --git a/mail/themes/qute/mail/searchBox.css b/mail/themes/qute/mail/searchBox.css
index 4cf702bbfaba..2a618dab5737 100644
--- a/mail/themes/qute/mail/searchBox.css
+++ b/mail/themes/qute/mail/searchBox.css
@@ -49,7 +49,11 @@
 }
 
 #quick-search-button  {
-  margin: 0 2px 0 0;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  -moz-margin-start: 0px;
+  -moz-margin-end: 2px;
+
 }
 
 .quick-search-button-image {
@@ -62,7 +66,7 @@
 }
 
 .quick-search-button-dropmarker {
-  margin-left: 12px;
+  -moz-margin-start: 12px;
   margin-top: 8px;
   list-style-image: url("chrome://messenger/skin/icons/search-arrow.gif");
 }
diff --git a/mail/themes/qute/mail/searchDialog.css b/mail/themes/qute/mail/searchDialog.css
index 03516a91e9c5..d8c64b6aa116 100644
--- a/mail/themes/qute/mail/searchDialog.css
+++ b/mail/themes/qute/mail/searchDialog.css
@@ -67,7 +67,7 @@ menulist {
 }
 
 menulist > menupopup > menuitem {
-  padding-right: 2px;
+  -moz-padding-end: 2px;
 }
 
 textbox {
@@ -107,7 +107,7 @@ treechildren::-moz-tree-cell-text(container, closed, hasUnread, read) {
 
 treecol.threadColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/thread-col.png");
-  padding-right: 3px; 
+  -moz-padding-end: 3px; 
 }
 
 treecol.threadColumnHeader[sortDirection="ascending"]  {
@@ -138,7 +138,7 @@ treechildren::-moz-tree-image(threadCol, container, hasUnread, open) {
 
 treecol.readColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/readcol.png");
-  padding-right: 5px;
+  -moz-padding-end: 5px;
   padding-bottom: 5px;
 }
 
@@ -154,7 +154,7 @@ treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
 
 treecol.attachmentColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/attachment-col.png");
-  padding-right: 5px; 
+  -moz-padding-end: 5px; 
 }
 
 treechildren::-moz-tree-image(attachmentCol, attach) {
@@ -165,7 +165,7 @@ treechildren::-moz-tree-image(attachmentCol, attach) {
 
 treecol.flagColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/flag-col.png");
-  padding-right: 5px; 
+  -moz-padding-end: 5px; 
 }
 
 treechildren::-moz-tree-image(flaggedCol) {
@@ -181,13 +181,13 @@ treechildren::-moz-tree-image(flaggedCol, flagged) {
 
 treecol.junkStatusHeader {
   list-style-image: url("chrome://messenger/skin/icons/junk-col.png");
-  padding-right: 5px; 
+  -moz-padding-end: 5px; 
 }
 
 /* "unknown" now looks like "not junk".  see bug #182386 */
 treechildren::-moz-tree-image(junkStatusCol) {
   list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
-  padding-left: 0px;
+  -moz-padding-start: 0px;
 }
 
 treechildren::-moz-tree-image(junkStatusCol, junk) {
@@ -196,13 +196,13 @@ treechildren::-moz-tree-image(junkStatusCol, junk) {
 
 treechildren::-moz-tree-image(junkStatusCol, notjunk) {
   list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
-  padding-left: 0px;
+  -moz-padding-start: 0px;
 }
 
 /* ..... subject column ..... */
 
 treechildren::-moz-tree-image(subjectCol) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/message-mail.png ");
 }
 
diff --git a/mail/themes/qute/mail/smileys.css b/mail/themes/qute/mail/smileys.css
index 9846eaae069f..6d87416e101f 100644
--- a/mail/themes/qute/mail/smileys.css
+++ b/mail/themes/qute/mail/smileys.css
@@ -61,8 +61,8 @@ span.moz-smiley-s15,
 span.moz-smiley-s16 
 {
   font-size: 15px;
-  padding-left: 20px; 
-  margin-left: 2px; 
+  -moz-padding-start: 20px; 
+  -moz-margin-start: 2px; 
   margin-top: 2px;
   background-repeat: no-repeat; 
   -moz-user-select: all;
diff --git a/mail/themes/qute/mail/subscribe.css b/mail/themes/qute/mail/subscribe.css
index 9d7466d8aecf..8930d1845f64 100644
--- a/mail/themes/qute/mail/subscribe.css
+++ b/mail/themes/qute/mail/subscribe.css
@@ -10,7 +10,7 @@
 
 treechildren::-moz-tree-image(subscribedColumn),
 treechildren::-moz-tree-image(subscribedColumn2) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/notchecked.gif");
 }
 
@@ -31,13 +31,13 @@ treechildren::-moz-tree-cell-text(nameColumn, Subscribable-false) {
 /* ::::: Folders :::::: */
 
 treechildren::-moz-tree-image(nameColumn) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
 }
 
 treechildren::-moz-tree-image(nameColumn, ServerType-nntp),
 treechildren::-moz-tree-image(nameColumn2, nntp) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
 }
 
diff --git a/mail/themes/qute/mail/virtualFolderListDialog.css b/mail/themes/qute/mail/virtualFolderListDialog.css
index b81352942d6c..bfc47b303371 100644
--- a/mail/themes/qute/mail/virtualFolderListDialog.css
+++ b/mail/themes/qute/mail/virtualFolderListDialog.css
@@ -7,7 +7,7 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 treechildren::-moz-tree-image(selectedColumn) {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/notchecked.gif");
 }
 
diff --git a/other-licenses/branding/thunderbird/content/jar.mn b/other-licenses/branding/thunderbird/content/jar.mn
index 9ce26dfaf284..bb7ef50c4994 100644
--- a/other-licenses/branding/thunderbird/content/jar.mn
+++ b/other-licenses/branding/thunderbird/content/jar.mn
@@ -1,10 +1,12 @@
 messenger.jar:
 % content branding %content/branding/ xpcnativewrappers=yes
-  content/branding/about-credits.png             (about-credits.png)
-  content/branding/about-thunderbird.png         (about-thunderbird.png)
-  content/branding/thunderbird-wizard-badge.png  (thunderbird-wizard-badge.png)
-  content/branding/thunderbird-watermark.png     (thunderbird-watermark.png)
-  content/branding/icon64.png                    (icon64.png)
+  content/branding/about-credits.png                (about-credits.png)
+  content/branding/about-thunderbird.png            (about-thunderbird.png)
+  content/branding/thunderbird-wizard-badge.png     (thunderbird-wizard-badge.png)
+  content/branding/thunderbird-wizard-badge-rtl.png (thunderbird-wizard-badge-rtl.png)
+  content/branding/thunderbird-watermark.png        (thunderbird-watermark.png)
+  content/branding/thunderbird-watermark-rtl.png    (thunderbird-watermark-rtl.png)
+  content/branding/icon64.png                       (icon64.png)
 #ifdef XP_WIN
-  content/branding/uninstall.properties          (uninstall.properties)
+  content/branding/uninstall.properties             (uninstall.properties)
 #endif
diff --git a/other-licenses/branding/thunderbird/content/thunderbird-watermark-rtl.png b/other-licenses/branding/thunderbird/content/thunderbird-watermark-rtl.png
new file mode 100644
index 000000000000..b90ebdc4e2fb
Binary files /dev/null and b/other-licenses/branding/thunderbird/content/thunderbird-watermark-rtl.png differ
diff --git a/other-licenses/branding/thunderbird/content/thunderbird-wizard-badge-rtl.png b/other-licenses/branding/thunderbird/content/thunderbird-wizard-badge-rtl.png
new file mode 100644
index 000000000000..31ee644cf5d7
Binary files /dev/null and b/other-licenses/branding/thunderbird/content/thunderbird-wizard-badge-rtl.png differ
diff --git a/toolkit/content/widgets/text.xml b/toolkit/content/widgets/text.xml
index a0526fca41ec..247b7fd3c950 100644
--- a/toolkit/content/widgets/text.xml
+++ b/toolkit/content/widgets/text.xml
@@ -298,6 +298,8 @@
         if (this.disabled || event.getPreventDefault())
           return;
         var href = this.getAttribute('href');
+
+        dump('calling text link with: ' + href + '\n');
         if (href)
         {
           try {
diff --git a/toolkit/content/widgets/wizard.xml b/toolkit/content/widgets/wizard.xml
index ef97e414ab00..2900a3da35aa 100644
--- a/toolkit/content/widgets/wizard.xml
+++ b/toolkit/content/widgets/wizard.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
 
+<!DOCTYPE bindings [
+  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
+  %globalDTD;
+]>
+
 <bindings id="wizardBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -13,7 +18,7 @@
   
   <binding id="wizard" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
     <content>
-      <xul:hbox class="wizard-header" anonid="Header"/>
+      <xul:hbox class="wizard-header" chromedir="&locale.dir;" anonid="Header"/>
       
       <xul:deck class="wizard-page-box" flex="1" anonid="Deck">
         <children includes="wizardpage"/>
diff --git a/toolkit/themes/qute/communicator/alerts/alert.css b/toolkit/themes/qute/communicator/alerts/alert.css
index 577144e2481c..b88b106c4ff7 100644
--- a/toolkit/themes/qute/communicator/alerts/alert.css
+++ b/toolkit/themes/qute/communicator/alerts/alert.css
@@ -52,8 +52,8 @@
 
 .alertImageBox 
 {
-  margin-left: 4px;
-  margin-right: 6px;
+  -moz-margin-start: 4px;
+  -moz-margin-end: 6px;
   min-height: 46px;
   background-color: transparent;
 }
@@ -66,7 +66,7 @@
 
 .alertText 
 {
-  margin-right: 6px;
+  -moz-margin-end: 6px;
   background-color: transparent;
 }
 
@@ -83,6 +83,6 @@
 
 .alertTextBox
 {
-  padding-right: 10px;
+  -moz-padding-end: 10px;
   padding-top: 5px;
 }
diff --git a/toolkit/themes/qute/communicator/brand.css b/toolkit/themes/qute/communicator/brand.css
index 267170445e3e..fa0eeb423edd 100644
--- a/toolkit/themes/qute/communicator/brand.css
+++ b/toolkit/themes/qute/communicator/brand.css
@@ -46,7 +46,10 @@
   -moz-user-focus: ignore;
   -moz-box-align: center;
   -moz-box-pack: center;
-  margin: 1px 2px 1px 10px;
+  margin-top: 1px;
+  margin-bottom: 1px;
+  -moz-margin-start: 10px;
+  -moz-margin-end: 2px;
   border: 2px solid;
   -moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight;
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
diff --git a/toolkit/themes/qute/communicator/button.css b/toolkit/themes/qute/communicator/button.css
index c183f4353847..a6d265bc9dac 100644
--- a/toolkit/themes/qute/communicator/button.css
+++ b/toolkit/themes/qute/communicator/button.css
@@ -56,13 +56,19 @@
 .toolbarbutton-1,
 .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 .toolbarbutton-1[disabled="true"]:hover:active {
-  padding: 2px 7px 2px 6px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  -moz-padding-start: 6px;
+  -moz-padding-end: 7px;
 }
 
 .toolbarbutton-1:hover:active,
 .toolbarbutton-1[open="true"],
 .toolbarbutton-1[buttondown="true"] > .toolbarbutton-menubutton-button {
-  padding: 3px 6px 1px 7px;
+  padding-top: 3px;
+  padding-bottom: 1px;
+  -moz-padding-start: 7px;
+  -moz-padding-end: 6px;
 }
 
 .toolbarbutton-1[type="menu-button"],
@@ -101,12 +107,15 @@
 }
 
 .button-toolbar:hover:active > .button-box  {
-  padding: 2px 1px 0px 3px;
+  padding-top: 2px;
+  padding-bottom: 0px;
+  -moz-padding-start: 3px;
+  -moz-padding-end: 1px;
 }
 
 .button-toolbar > .button-box > .button-icon,
 .button-toolbar > .button-box > .button-text {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
 }  
 
 .button-toolbar, 
diff --git a/toolkit/themes/qute/communicator/pref/pref.css b/toolkit/themes/qute/communicator/pref/pref.css
index bd7eab44a00d..88821a1ac089 100644
--- a/toolkit/themes/qute/communicator/pref/pref.css
+++ b/toolkit/themes/qute/communicator/pref/pref.css
@@ -54,7 +54,10 @@
 /*** Styles for the pref category buttons **/
 
 .buttonBox {
-  margin: 0px 5px 0px 0px !important;
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  -moz-margin-start: 0px !important;
+  -moz-margin-end: 5px !important;
 }
 
 .buttonBoxButton {
diff --git a/toolkit/themes/qute/communicator/prefpanels.css b/toolkit/themes/qute/communicator/prefpanels.css
index 361a1d9ee5f7..ac01cef9678e 100644
--- a/toolkit/themes/qute/communicator/prefpanels.css
+++ b/toolkit/themes/qute/communicator/prefpanels.css
@@ -47,7 +47,7 @@
 }
 
 *|*.themesLink {
-  margin-left: 5px;
+  -moz-margin-start: 5px;
   text-decoration: underline;
   color: blue;
   cursor: pointer;
diff --git a/toolkit/themes/qute/communicator/profile/profileManager.css b/toolkit/themes/qute/communicator/profile/profileManager.css
index 6718d5e35955..b8a2e3b78319 100644
--- a/toolkit/themes/qute/communicator/profile/profileManager.css
+++ b/toolkit/themes/qute/communicator/profile/profileManager.css
@@ -10,5 +10,5 @@
 }
 
 #buttons-box {
-  margin-left: 1em;
+  -moz-margin-start: 1em;
 }
diff --git a/toolkit/themes/qute/communicator/smileys.css b/toolkit/themes/qute/communicator/smileys.css
index 4f6fc47ce699..bbe8e923d63a 100644
--- a/toolkit/themes/qute/communicator/smileys.css
+++ b/toolkit/themes/qute/communicator/smileys.css
@@ -61,8 +61,8 @@ span.moz-smiley-s15,
 span.moz-smiley-s16 
 {
   font-size: 15px;
-  padding-left: 20px; 
-  margin-left: 2px; 
+  -moz-padding-start: 20px; 
+  -moz-margin-start: 2px; 
   margin-top: 2px;
   background-repeat: no-repeat; 
   -moz-user-select: all;
diff --git a/toolkit/themes/qute/communicator/tasksOverlay.css b/toolkit/themes/qute/communicator/tasksOverlay.css
index be3ac7ad2bf9..10ccc1fff9b1 100644
--- a/toolkit/themes/qute/communicator/tasksOverlay.css
+++ b/toolkit/themes/qute/communicator/tasksOverlay.css
@@ -49,7 +49,10 @@
 }
 
 .taskbutton:hover:active {
-  padding: 2px 0 0 2px;
+  padding-top: 2px;
+  padding-bottom: 0px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
 }
 
 #mini-nav {
diff --git a/toolkit/themes/qute/communicator/xpinstall/xpinstall.css b/toolkit/themes/qute/communicator/xpinstall/xpinstall.css
index 3785998ca254..8af4669b7528 100644
--- a/toolkit/themes/qute/communicator/xpinstall/xpinstall.css
+++ b/toolkit/themes/qute/communicator/xpinstall/xpinstall.css
@@ -47,7 +47,7 @@
 }
 
 #urlColumn {
-  margin-left: 1ex;
+  -moz-margin-start: 1ex;
 }
 
 .confirmSeparator {
diff --git a/toolkit/themes/qute/global/autocomplete.css b/toolkit/themes/qute/global/autocomplete.css
index 23644d1b2b84..e93c2fcbdb03 100644
--- a/toolkit/themes/qute/global/autocomplete.css
+++ b/toolkit/themes/qute/global/autocomplete.css
@@ -52,7 +52,10 @@ textbox {
 
 /* Used by autocomplete widgets that don't have an icon. Gross. -dwh */
 textbox.padded {
-  padding: 1px 0px 1px 2px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
 }
 
 .textbox-input-box {
@@ -83,7 +86,10 @@ textbox.padded {
   -moz-border-right-colors: ThreeDShadow ThreeDFace;
   -moz-border-bottom-colors: ThreeDShadow ThreeDFace;
   -moz-border-left-colors: ThreeDShadow ThreeDFace;
-  padding: 2px 0 0 2px;
+  padding-top: 2px;
+  padding-bottom: 0px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
 }
 
 /* ::::: autocomplete popups ::::: */
@@ -119,7 +125,7 @@ popup[type="autocomplete"],
 }
 
 .autocomplete-treebody::-moz-tree-cell-text {
-  padding-left: 8px;
+  -moz-padding-start: 8px;
 }
 
 treechildren.autocomplete-treebody::-moz-tree-row(selected) {
diff --git a/toolkit/themes/qute/global/browser.css b/toolkit/themes/qute/global/browser.css
index 6c5226b51982..4814b3b9876d 100644
--- a/toolkit/themes/qute/global/browser.css
+++ b/toolkit/themes/qute/global/browser.css
@@ -21,7 +21,7 @@ tabpanels {
 
 .tab-icon {
   margin-top: 1px;
-  margin-right: 3px;
+  -moz-margin-end: 3px;
   width: 16px;
   height: 16px;
   list-style-image: url("chrome://global/skin/icons/folder-item.png");
diff --git a/toolkit/themes/qute/global/button.css b/toolkit/themes/qute/global/button.css
index 686ee1f5ce50..93333a81b454 100644
--- a/toolkit/themes/qute/global/button.css
+++ b/toolkit/themes/qute/global/button.css
@@ -59,7 +59,10 @@ button {
 
 .button-box {
   border: 1px solid transparent;
-  padding: 1px 4px 2px 3px;
+  padding-top: 1px;
+  padding-bottom: 2px;
+  -moz-padding-start: 3px;
+  -moz-padding-end: 4px;
 }
 
 .button-text {
@@ -104,7 +107,10 @@ button[checked="true"] {
 button:hover:active > .button-box,
 button[open="true"] > .button-box,
 button[checked="true"] > .button-box {
-  padding: 2px 3px 1px 4px;
+  padding-top: 2px;
+  padding-bottom: 1px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 3px;
 }
 
 /* .......... disabled state .......... */
@@ -118,7 +124,10 @@ button[disabled="true"] {
 }
 
 button[disabled="true"] > .button-box {
-  padding: 1px 4px 2px 3px !important;
+  padding-top: 1px !important;
+  padding-bottom: 2px !important;
+  -moz-padding-start: 3px !important;
+  -moz-padding-end: 4px !important;
 }
 
 /* ::::: menu/menu-button buttons ::::: */
@@ -144,7 +153,10 @@ button[type="menu-button"] {
 }
 
 .button-menubutton-dropmarker[open="true"] {
-  margin: 2px 0px 0px 2px;
+  margin-top: 2px;
+  margin-bottom: 0px;
+  -moz-margin-start: 2px;
+  -moz-margin-end: 0px;
 }
 
 /* ::::: plain buttons ::::: */
diff --git a/toolkit/themes/qute/global/checkbox.css b/toolkit/themes/qute/global/checkbox.css
index 963489e8d955..b40e26af1af6 100644
--- a/toolkit/themes/qute/global/checkbox.css
+++ b/toolkit/themes/qute/global/checkbox.css
@@ -47,17 +47,20 @@ checkbox {
   -moz-appearance: checkbox-container;
   -moz-box-align: center;
   margin: 2px 4px;
-  padding: 1px 2px 1px 4px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 2px;
 }
 
 .checkbox-label-box {
-  margin-left: 2px;
+  -moz-margin-start: 2px;
   border: 1px solid transparent;
   padding: 0px 1px;
 }
 
 .checkbox-icon {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
 }
 
 .checkbox-label {
diff --git a/toolkit/themes/qute/global/console/console.css b/toolkit/themes/qute/global/console/console.css
index 526cbe8a29e8..4791ed5688f0 100644
--- a/toolkit/themes/qute/global/console/console.css
+++ b/toolkit/themes/qute/global/console/console.css
@@ -67,7 +67,10 @@
 /* ..... error rows ..... */
 
 .console-row-code {
-  padding: 3px 0px 3px 3px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  -moz-padding-start: 3px;
+  -moz-padding-end: 0px;
   color: #0000BB;
   font-size: larger;
 }
@@ -132,7 +135,7 @@ toolbarseparator {
 /* Toolbar icons */
 
 .toolbarbutton-text {
-  margin-left: 4px !important;
+  -moz-margin-start: 4px !important;
 } 
 
 toolbar#ToolbarMode toolbarbutton {
diff --git a/toolkit/themes/qute/global/dialog.css b/toolkit/themes/qute/global/dialog.css
index 24721fc712fa..af1cc8a213b1 100644
--- a/toolkit/themes/qute/global/dialog.css
+++ b/toolkit/themes/qute/global/dialog.css
@@ -44,7 +44,10 @@
 /* ::::: dialog ::::: */
 
 dialog { 
-  padding: 8px 10px 10px 8px;
+  padding-top: 8px;
+  padding-bottom: 10px;
+  -moz-padding-start: 8px;
+  -moz-padding-end: 10px;
 }
 
 /* ::::: dialog buttons ::::: */
@@ -83,7 +86,10 @@ dialogheader {
   border-right: none;
   border-top: none;
   -moz-border-bottom-colors: ThreeDHighlight ThreeDShadow;
-  padding: 12px 5px 12px 25px;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  -moz-padding-start: 25px;
+  -moz-padding-end: 5px;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
@@ -94,5 +100,5 @@ dialogheader {
 }
 
 .header-large > .dialogheader-description {
-  margin-left: 12px !important;
+  -moz-margin-start: 12px !important;
 }
\ No newline at end of file
diff --git a/toolkit/themes/qute/global/expander.css b/toolkit/themes/qute/global/expander.css
index 7b9073661e00..d643d8c9df71 100644
--- a/toolkit/themes/qute/global/expander.css
+++ b/toolkit/themes/qute/global/expander.css
@@ -40,5 +40,8 @@
 }
 
 .settingsContainer {
-  padding: 3px 5px 5px 20px;
+  padding-top: 3px;
+  padding-bottom: 5px;
+  -moz-padding-start: 20px;
+  -moz-padding-end: 5px;
 }
diff --git a/toolkit/themes/qute/global/formatting.css b/toolkit/themes/qute/global/formatting.css
index 9c977f249a74..5bd956a45cb1 100644
--- a/toolkit/themes/qute/global/formatting.css
+++ b/toolkit/themes/qute/global/formatting.css
@@ -148,7 +148,10 @@
 
   label
     {
-      margin              : 1px 5px 2px 6px;
+      margin-top: 1px;
+      margin-bottom: 2px;
+      -moz-margin-start: 6px;
+      -moz-margin-end: 5px;
     }
 
   .header 
@@ -173,7 +176,7 @@
     
   .indent
     {
-      margin-left         : 23px;
+      -moz-margin-start   : 23px;
     }
 
   .box-padded
@@ -226,7 +229,10 @@
 
   .caption-text
     {
-      margin: 0px 2px 0px 1px !important;
+      margin-top: 0px !important;
+      margin-bottom: 0px !important;
+      -moz-margin-start: 1px !important;
+      -moz-margin-end: 2px !important;
     }
 
 
diff --git a/toolkit/themes/qute/global/global.css b/toolkit/themes/qute/global/global.css
index 047fb4506441..448d870adf7d 100644
--- a/toolkit/themes/qute/global/global.css
+++ b/toolkit/themes/qute/global/global.css
@@ -79,7 +79,10 @@ prefwindow {
 }
 
 window.dialog {
-  padding: 8px 10px 10px 8px;
+  padding-top: 8px;
+  padding-bottom: 10px;
+  -moz-padding-start: 8px;
+  -moz-padding-end: 10px;
 }
 
 [wait-cursor] {
@@ -173,7 +176,7 @@ sidebarheader {
 }
 
 sidebarheader > label {
-  padding-left: 4px;
+  -moz-padding-start: 4px;
 }
 
 /* ::::: miscellaneous ::::: */
diff --git a/toolkit/themes/qute/global/listbox.css b/toolkit/themes/qute/global/listbox.css
index c6300cad50c3..6c4e2f20b3b1 100644
--- a/toolkit/themes/qute/global/listbox.css
+++ b/toolkit/themes/qute/global/listbox.css
@@ -109,11 +109,15 @@ listheader[sortable="true"]:hover:active {
   -moz-border-right-colors: ThreeDShadow;
   -moz-border-bottom-colors: ThreeDShadow;
   -moz-border-left-colors: ThreeDShadow -moz-Dialog;
-  padding: 1px 4px 0 5px;
+  padding-top: 1px;
+  padding-bottom: 0px;
+  -moz-padding-start: 5px;
+  -moz-padding-end: 4px;
+
 }
 
 .listheader-icon {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
 }
 
 .listheader-label {
@@ -138,12 +142,15 @@ listheader[sortable="true"]:hover:active {
 
 .listcell-label {
   margin: 0px !important;
-  padding: 0px 0px 1px 4px;
+  padding-top: 0px;
+  padding-bottom: 1px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 0px;
   white-space: nowrap;
 }
 
 .listcell-icon {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
 }
 
 .listcell-label[disabled="true"] {
diff --git a/toolkit/themes/qute/global/menu.css b/toolkit/themes/qute/global/menu.css
index cb89ee1ac000..00f4e4e1f63d 100644
--- a/toolkit/themes/qute/global/menu.css
+++ b/toolkit/themes/qute/global/menu.css
@@ -68,19 +68,25 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
 .menu-text,
 .menu-iconic-left,
 .menu-iconic-text {
-  margin: 0px 2px 0px 0px !important;
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  -moz-margin-start: 0px !important;
+  -moz-margin-end: 2px !important;
   color: inherit;
 }
 
 .menu-text {
-  margin-left: 18px !important;
+  -moz-margin-start: 18px !important;
   font-weight: inherit;
 }
 
 .menu-accel,
 .menu-iconic-accel {
-  margin: 0px 2px 0px 7px !important;
-  padding-right: 14px;
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  -moz-margin-start: 7px !important;
+  -moz-margin-end: 2px !important;
+  -moz-padding-end: 14px;
   color: inherit;
 }
 
@@ -91,7 +97,10 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
 /* ..... menu arrow box ..... */
 
 .menu-right {
-  margin: 0px 0px 0px 6px;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: 0px;
   width: 8px;
   list-style-image: url("chrome://global/skin/menu/Menu-arrow.png");
   -moz-image-region: auto;
@@ -107,11 +116,26 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
   -moz-image-region: auto;
 }
 
+.menu-right[chromedir="rtl"] {
+  list-style-image: url("chrome://global/skin/menu/Menu-arrow-rtl.png");
+}
+
+.menu-right[chromedir="rtl"][_moz-menuactive="true"] {
+  list-style-image: url("chrome://global/skin/menu/Menu-arrow-hover-rtl.png");
+}
+
+.menu-right[chromedir="rtl"][disabled="true"] {
+  list-style-image: url("chrome://global/skin/menu/Menu-arrow-disabled-rtl.png") !important;
+}
+
 /* ::::: menu/menuitems in menubar ::::: */
 
 menubar > menu {
   border: 1px solid transparent;
-  padding: 2px 5px 2px 7px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  -moz-padding-start: 7px;
+  -moz-padding-end: 5px;
   margin: 1px 0px 1px 0px;
 }
 menubar > menu[_moz-menuactive="true"] {
@@ -130,12 +154,18 @@ menubar > menu[_moz-menuactive="true"][open="true"] {
 /* ..... internal content .... */
 
 .menubar-left {
-  margin: 0px 2px 0px 0px;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  -moz-margin-start: 0px;
+  -moz-margin-end: 2px;
   color: inherit;
 }
 
 .menubar-text {
-  margin: 0px 2px 0px 0px !important;
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  -moz-margin-start: 0px !important;
+  -moz-margin-end: 2px !important;
   color: inherit;
 }
 
@@ -164,7 +194,10 @@ menulist > menupopup > menuitem,
 .menulist-menupopup > menu,
 menulist > menupopup > menu {
   border: 1px solid transparent;
-  padding: 1px 30px 1px 5px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  -moz-padding-start: 5px;
+  -moz-padding-end: 30px;
   max-width: none;
   font: message-box;
   color: -moz-FieldText;
@@ -240,7 +273,7 @@ menulist > menupopup > menuseparator,
 /* ::::: tree column picker ::::: */
 
 .treecell-popupcell-menu {
-  margin-left: -2px;
+  -moz-margin-start: -2px;
   list-style-image: url("chrome://global/skin/columnselect.gif");
   -moz-image-region: auto;
 }
diff --git a/toolkit/themes/qute/global/menu/Menu-arrow-disabled-rtl.png b/toolkit/themes/qute/global/menu/Menu-arrow-disabled-rtl.png
new file mode 100644
index 000000000000..efc7e1de8375
Binary files /dev/null and b/toolkit/themes/qute/global/menu/Menu-arrow-disabled-rtl.png differ
diff --git a/toolkit/themes/qute/global/menu/Menu-arrow-hover-rtl.png b/toolkit/themes/qute/global/menu/Menu-arrow-hover-rtl.png
new file mode 100644
index 000000000000..202d451a0bc9
Binary files /dev/null and b/toolkit/themes/qute/global/menu/Menu-arrow-hover-rtl.png differ
diff --git a/toolkit/themes/qute/global/menu/Menu-arrow-rtl.png b/toolkit/themes/qute/global/menu/Menu-arrow-rtl.png
new file mode 100644
index 000000000000..9a6a0aa94d51
Binary files /dev/null and b/toolkit/themes/qute/global/menu/Menu-arrow-rtl.png differ
diff --git a/toolkit/themes/qute/global/menulist.css b/toolkit/themes/qute/global/menulist.css
index a533092b7415..26d7f01f398a 100644
--- a/toolkit/themes/qute/global/menulist.css
+++ b/toolkit/themes/qute/global/menulist.css
@@ -109,7 +109,10 @@ menulist:hover:active > .menulist-dropmarker {
   -moz-border-right-colors: ThreeDShadow ThreeDFace;
   -moz-border-bottom-colors: ThreeDShadow ThreeDFace;
   -moz-border-left-colors: ThreeDShadow ThreeDFace;
-  padding: 2px 0px 0px 2px;
+  padding-top: 2px;
+  padding-bottom: 0px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
 }
 
 /* ..... focused state ..... */
@@ -130,7 +133,10 @@ menulist[disabled="true"] {
 /* ::::: editable menulists ::::: */
 
 .menulist-editable-box {
-  padding: 3px 0px 3px 2px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
 }
 
 html|*.menulist-editable-input {
@@ -161,7 +167,7 @@ html|*.menulist-editable-input {
 }  
 
 .menulist-compact > .menulist-dropmarker {
-  margin-left: 2px;
+  -moz-margin-start: 2px;
   border: none;
   padding: 0 !important;
   background: transparent;
diff --git a/toolkit/themes/qute/global/preferences.css b/toolkit/themes/qute/global/preferences.css
index 0674045d87ec..1ad050d1073e 100644
--- a/toolkit/themes/qute/global/preferences.css
+++ b/toolkit/themes/qute/global/preferences.css
@@ -48,11 +48,17 @@ prefwindow {
 }
 
 prefpane {
-  padding: 8px 10px 10px 8px;
+  padding-top: 8px;
+  padding-bottom: 10px;
+  -moz-padding-start: 8px;
+  -moz-padding-end: 10px;
 }
 
 prefwindow[type="child"] {
-  padding: 8px 10px 10px 8px;
+  padding-top: 8px;
+  padding-bottom: 10px;
+  -moz-padding-start: 8px;
+  -moz-padding-end: 10px;
 }
 
 prefwindow[type="child"] > prefpane {
@@ -61,7 +67,7 @@ prefwindow[type="child"] > prefpane {
 
 .prefWindow-dlgbuttons {
   padding-bottom: 10px;
-  padding-right: 10px;
+  -moz-padding-end: 10px;
 }
 
 prefwindow[type="child"] .prefWindow-dlgbuttons {
@@ -78,7 +84,7 @@ radio[pane] {
 .paneSelector {
   border-bottom: 2px groove ThreeDFace;
   margin: 0px;
-  padding-left: 10px;
+  -moz-padding-start: 10px;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
diff --git a/toolkit/themes/qute/global/printPreview.css b/toolkit/themes/qute/global/printPreview.css
index c9d56ed79b06..fd71b0d74108 100644
--- a/toolkit/themes/qute/global/printPreview.css
+++ b/toolkit/themes/qute/global/printPreview.css
@@ -1,18 +1,18 @@
 /* ..... page navigation ..... */
 
-.home-arrow {
+.home-arrow, .end-arrow[chromedir="rtl"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-lft-sharp-end.gif");
 }
 
-.end-arrow {
+.end-arrow, .home-arrow[chromedir="rtl"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp-end.gif");
 }
 
-.left-arrow {
+.left-arrow, .right-arrow[chromedir="rtl"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-lft-sharp.gif");
 }
 
-.right-arrow {
+.right-arrow, .left-arrow[chromedir="rtl"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp.gif");
 }
 
@@ -39,5 +39,5 @@
 }
 
 .toolbarbutton-text { 
-  margin-left: 4px !important;
+  -moz-margin-start: 4px !important;
 }
diff --git a/toolkit/themes/qute/global/radio.css b/toolkit/themes/qute/global/radio.css
index 12dc7a486d27..f85b150d354e 100644
--- a/toolkit/themes/qute/global/radio.css
+++ b/toolkit/themes/qute/global/radio.css
@@ -47,17 +47,23 @@ radio {
   -moz-appearance: radio-container;
   -moz-box-align: center;
   margin: 2px 4px;
-  padding: 1px 2px 1px 4px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 2px;
 }
 
 .radio-label-box {
-  margin-left: 2px;
+  -moz-margin-start: 2px;
   border: 1px solid transparent;
-  padding: 0px 0px 1px 1px;
+  padding-top: 0px;
+  padding-bottom: 1px;
+  -moz-padding-start: 1px;
+  -moz-padding-end: 0px;
 }
 
 .radio-icon {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
 }
 
 .radio-label {
diff --git a/toolkit/themes/qute/global/scrollbox.css b/toolkit/themes/qute/global/scrollbox.css
index ff92557fb6a9..e4aa514a5752 100644
--- a/toolkit/themes/qute/global/scrollbox.css
+++ b/toolkit/themes/qute/global/scrollbox.css
@@ -19,7 +19,10 @@ autorepeatbutton
   {
     -moz-box-align        : center;
     -moz-box-pack         : center;
-    margin                : 1px 2px 2px 1px;
+    margin-top: 1px;
+    margin-bottom: 2px;
+    -moz-margin-start: 1px;
+    -moz-margin-end: 2px;
     border                : 1px solid transparent;
     padding               : 1px;
   }
@@ -28,5 +31,8 @@ autorepeatbutton:hover
   {
     margin                : 1px;
     border                : 1px inset ThreeDFace;
-    padding               : 2px 1px 1px 2px;
+    padding-top: 2px;
+    padding-bottom: 1px;
+    -moz-padding-start: 2px;
+    -moz-padding-end: 1px;
   }
diff --git a/toolkit/themes/qute/global/tabbox.css b/toolkit/themes/qute/global/tabbox.css
index 49268e520bfc..1442f58f624e 100644
--- a/toolkit/themes/qute/global/tabbox.css
+++ b/toolkit/themes/qute/global/tabbox.css
@@ -86,6 +86,11 @@ tab
   color: -moz-DialogText;
 }
 
+tab[chromedir="rtl"] {
+  -moz-border-radius-bottomleft: 1px;
+  -moz-border-radius-bottomright: 0px;
+}
+
 .tab-text {
   margin: 0 !important;
 }
@@ -101,13 +106,15 @@ tab:focus > .tab-middle {
   outline: 1px dotted invert;
 }
 
-tab[beforeselected="true"] {
+tab[beforeselected="true"],
+tab[afterselected="true"][chromedir="rtl"] {
   -moz-appearance: tab-left-edge;
   border-right: none;
   -moz-border-radius-topright: 0;
 }
 
-tab[afterselected="true"] {
+tab[afterselected="true"],
+tab[beforeselected="true"][chromedir="rtl"] {
   -moz-appearance: tab-right-edge;
   border-left: none;
   -moz-border-radius-topleft: 0;
@@ -143,11 +150,13 @@ tab[first-tab="true"][selected="true"] {
   padding: 4px 6px 1px 6px;
 }
 
-.tab-bottom[beforeselected="true"] {
+.tab-bottom[beforeselected="true"],
+.tab-bottom[afterselected="true"][chromedir="rtl"] {
   -moz-border-radius-bottomright: 0;
 }
 
-.tab-bottom[afterselected="true"] {
+.tab-bottom[afterselected="true"],
+.tab-bottom[beforeselected="true"][chromedir="rtl"] {
   -moz-border-radius-bottomleft: 0;
 }
 
diff --git a/toolkit/themes/qute/global/textbox.css b/toolkit/themes/qute/global/textbox.css
index d63a7cf43578..ac1de9a4c98c 100644
--- a/toolkit/themes/qute/global/textbox.css
+++ b/toolkit/themes/qute/global/textbox.css
@@ -55,7 +55,10 @@ textbox
   -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-  padding: 2px 2px 3px 4px;
+  padding-top: 2px;
+  padding-bottom: 3px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 2px;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
diff --git a/toolkit/themes/qute/global/toolbar.css b/toolkit/themes/qute/global/toolbar.css
index f08486c0bdc3..b9d6ac216e67 100644
--- a/toolkit/themes/qute/global/toolbar.css
+++ b/toolkit/themes/qute/global/toolbar.css
@@ -101,7 +101,10 @@ toolbarpaletteitem[place="toolbar"] > toolbarspacer {
 
 .toolbarpaletteitem-box[type="spacer"][place="toolbar"],
 .toolbarpaletteitem-box[type="spring"][place="toolbar"] {
-  margin: 2px 2px 2px 0;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -moz-margin-start: 0px;
+  -moz-margin-end: 2px;
 }
 
 .toolbarpaletteitem-box[type="separator"][place="palette"] {
diff --git a/toolkit/themes/qute/global/toolbarbutton.css b/toolkit/themes/qute/global/toolbarbutton.css
index ac0dc54699a0..278724805e2c 100644
--- a/toolkit/themes/qute/global/toolbarbutton.css
+++ b/toolkit/themes/qute/global/toolbarbutton.css
@@ -81,7 +81,10 @@ toolbarbutton[buttonover="true"] {
 toolbarbutton:hover:active,
 toolbarbutton[open="true"] {
   border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow;
-  padding: 7px 5px 5px 7px;
+  padding-top: 7px;
+  padding-bottom: 5px;
+  -moz-padding-start: 7px;
+  -moz-padding-end: 5px;
 }
 
 toolbarbutton[disabled="true"],
@@ -97,7 +100,10 @@ toolbarbutton[disabled="true"][open="true"] {
 
 toolbarbutton[checked="true"] {
   border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow !important;
-  padding: 7px 5px 5px 7px !important;
+  padding-top: 7px !important;
+  padding-bottom: 5px !important;
+  -moz-padding-start: 7px !important;
+  -moz-padding-end: 5px !important;
   background-image: url("chrome://global/skin/toolbar/Lighten.png");
   color: ButtonText !important;
 }
@@ -111,7 +117,7 @@ toolbarbutton[checked="true"]:hover {
 .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
   -moz-image-region: auto; /* cut off inheritance */
-  margin-left: 6px;
+  -moz-margin-start: 6px;
 }
 
 .toolbarbutton-menu-dropmarker[disabled="true"] {
@@ -140,24 +146,27 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
   -moz-box-align: center;
   -moz-box-pack: center;
   -moz-box-orient: vertical;
-  padding-right: 3px;
+  -moz-padding-end: 3px;
 }
 
 .toolbarbutton-menubutton-button:hover:active {
-  padding-right: 2px;
+  -moz-padding-end: 2px;
 }
 .toolbarbutton-menubutton-button[disabled="true"],
 .toolbarbutton-menubutton-button[disabled="true"]:hover,
 .toolbarbutton-menubutton-button[disabled="true"]:hover:active,
 .toolbarbutton-menubutton-button[disabled="true"][open="true"] {
-  padding-right: 3px
+  -moz-padding-end: 3px
 }
 
 /* .......... dropmarker .......... */
 
 .toolbarbutton-menubutton-dropmarker {
   -moz-box-align: center;
-  padding: 0 4px 0 2px;
+  padding-top: 0px;
+  padding-bottom: 0px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 4px;
   list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
   -moz-image-region: auto; /* cut off inheritance */
 }
diff --git a/toolkit/themes/qute/global/wizard.css b/toolkit/themes/qute/global/wizard.css
index 71ea76a677ee..08efa742f6a1 100644
--- a/toolkit/themes/qute/global/wizard.css
+++ b/toolkit/themes/qute/global/wizard.css
@@ -8,12 +8,12 @@
 }
 
 .wizard-header-label {
-  margin-left: 23px;
+  -moz-margin-start: 23px;
   font-weight: bold;
 }
 
 .wizard-header-description {
-  margin-left: 44px;
+  -moz-margin-start: 44px;
 }
 
 .wizard-page-box {
@@ -30,9 +30,9 @@
 
 .wizard-button[wizardbutton="finish"],
 .wizard-button[wizardbutton="next"] {
-  margin-left: -1px !important;
+  -moz-margin-start: -1px !important;
 }
 
 .wizard-button[wizardbutton="back"] {
-  margin-right: 0px !important;
+  -moz-margin-end: 0px !important;
 }
diff --git a/toolkit/themes/qute/help/helpFileLayout.css b/toolkit/themes/qute/help/helpFileLayout.css
index 97f5f49c59c8..d595cc6106fc 100644
--- a/toolkit/themes/qute/help/helpFileLayout.css
+++ b/toolkit/themes/qute/help/helpFileLayout.css
@@ -78,7 +78,7 @@ li {
 }
 
 .makeLeftMargin {
-	margin-left: 25px;
+  -moz-margin-start: 25px;
 }
 
 .menuPath {
diff --git a/toolkit/themes/qute/help/sidebar.css b/toolkit/themes/qute/help/sidebar.css
index e56628c30232..37f410127495 100644
--- a/toolkit/themes/qute/help/sidebar.css
+++ b/toolkit/themes/qute/help/sidebar.css
@@ -62,7 +62,10 @@
 .box-texttab[selected="true"],
 .box-texttab[selected="true"]:hover,
 .box-texttab[selected="true"]:hover:active {
-  padding: 2px 1px 2px 0px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  -moz-padding-start: 0px;
+  -moz-padding-end: 1px;
   font-weight: bold;
   cursor: default;
 }
diff --git a/toolkit/themes/qute/mozapps/downloads/downloads.css b/toolkit/themes/qute/mozapps/downloads/downloads.css
index e4b23dc7847d..f72332668ae9 100644
--- a/toolkit/themes/qute/mozapps/downloads/downloads.css
+++ b/toolkit/themes/qute/mozapps/downloads/downloads.css
@@ -41,7 +41,10 @@
 }
 
 #cleanUpButton .button-icon, #optionsButton .button-icon {
-  margin: 0px 5px 0px 0px !important;
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  -moz-margin-start: 0px !important;
+  -moz-margin-end: 5px !important;
 }
 
 #cleanUpButton[disabled="true"] {
@@ -49,12 +52,15 @@
 }
 
 #commandBarSeparator {
-  margin-left: 5px;
+  -moz-margin-start: 5px;
 }
 
 /* Download View Items */
 download {
-  padding: 13px 10px 13px 13px;
+  padding-top: 13px;
+  padding-bottom: 13px;
+  -moz-padding-start: 13px;
+  -moz-padding-end: 10px;
   min-height: 25px;
   border-bottom: 1px dotted #C0C0C0;
 }
@@ -80,6 +86,6 @@ download[state="5"], download[state="6"] {
 }
 
 .downloadTypeIcon {
-  margin-right: 10px;
+  -moz-margin-end: 10px;
 }
 
diff --git a/toolkit/themes/qute/mozapps/downloads/unknownContentType.css b/toolkit/themes/qute/mozapps/downloads/unknownContentType.css
index 8411b1cc46f0..676f15d116a0 100644
--- a/toolkit/themes/qute/mozapps/downloads/unknownContentType.css
+++ b/toolkit/themes/qute/mozapps/downloads/unknownContentType.css
@@ -8,7 +8,10 @@
 }
 
 #contentTypeImage {
-  margin: 0px 5px 0px 0px;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  -moz-margin-start: 0px;
+  -moz-margin-end: 5px;
 }
 
 .small-indent {
diff --git a/toolkit/themes/qute/mozapps/extensions/about.css b/toolkit/themes/qute/mozapps/extensions/about.css
index 2be4c2cf55c1..113277455b88 100644
--- a/toolkit/themes/qute/mozapps/extensions/about.css
+++ b/toolkit/themes/qute/mozapps/extensions/about.css
@@ -32,7 +32,7 @@
 }
 
 #extensionDescription, #extensionContributors, #creatorBox, #contributorsBox {
-  margin-left: 6px;
+  -moz-margin-start: 6px;
 }
 
 #extensionCreator, .contributor {
diff --git a/toolkit/themes/qute/mozapps/extensions/extensions.css b/toolkit/themes/qute/mozapps/extensions/extensions.css
index 0a86d3329393..b47a7efdddbe 100644
--- a/toolkit/themes/qute/mozapps/extensions/extensions.css
+++ b/toolkit/themes/qute/mozapps/extensions/extensions.css
@@ -64,7 +64,10 @@
 }
 
 #uninstallButton .button-icon, #updateButton .button-icon {
-  margin: 0px 5px 0px 0px !important;
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  -moz-margin-start: 0px !important;
+  -moz-margin-end: 5px !important;
 }
 
 #installButton .button-icon,
@@ -72,11 +75,14 @@
 #updateButton .button-icon,
 #optionsButton .button-icon,
 #useThemeButton .button-icon {
-  margin: 0px 5px 0px 0px !important;
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  -moz-margin-start: 0px !important;
+  -moz-margin-end: 5px !important;
 }
 
 .commandBarSeparator {
-  margin-left: 5px;
+  -moz-margin-start: 5px;
 }
 
 #getMore {
@@ -93,7 +99,10 @@ extension[selected="true"] {
 }
 
 extension {
-  padding: 13px 10px 13px 13px;
+  padding-top: 13px;
+  padding-bottom: 13px;
+  -moz-padding-start: 13px;
+  -moz-padding-end: 10px;
   min-height: 25px;
   border-bottom: 1px dotted #C0C0C0;
   background-image: url("chrome://mozapps/skin/shared/itemFader.png");
@@ -117,7 +126,7 @@ extension[disabled="true"] .extension-icon {
 }
 
 .extension-icon {
-  margin-right: 10px;
+  -moz-margin-end: 10px; 
 }
 
 .previewText {
@@ -128,15 +137,21 @@ extension[disabled="true"] .extension-icon {
 }
 
 extension[itemType="theme"] {
-  padding: 7px 5px 7px 6px;
+  padding-top: 7px;
+  padding-bottom: 7px;
+  -moz-padding-start: 6px;
+  -moz-padding-end: 5px;
 }
 
 extension[itemType="theme"] .extension-icon {
-  margin-right: 3px;
+  -moz-margin-end: 3px;
 }
 
 .themePreviewArea {
   -moz-appearance: listbox;
-  margin: 10px 10px 5px 5px;
+  margin-top: 10px;
+  margin-bottom: 5px;
+  -moz-margin-start: 5px;
+  -moz-margin-end: 10px;
 }
 
diff --git a/toolkit/themes/qute/mozapps/pref/pref.css b/toolkit/themes/qute/mozapps/pref/pref.css
index f82c14c3c6ab..5c741b5c0b4d 100644
--- a/toolkit/themes/qute/mozapps/pref/pref.css
+++ b/toolkit/themes/qute/mozapps/pref/pref.css
@@ -49,12 +49,12 @@
 }
 
 .indent {
-  margin-left: 23px;
-  margin-right: 23px;
+  -moz-margin-start: 23px;
+  -moz-margin-end: 23px;
 }
 
 .small-indent {
-  margin-left: 15px; 
+  -moz-margin-start: 15px; 
 }
 
 .uniWidthButton {
@@ -78,21 +78,30 @@
 #typeIcon, 
 .extensionChildren::-moz-tree-image(fileExtension),
 .pluginTypesChildren::-moz-tree-image(fileExtension) {
-  margin: 0px 5px 0px 0px;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  -moz-margin-start: 0px;
+  -moz-margin-end: 5px;
 }
 
 .pluginTypesChildren::-moz-tree-image(pluginEnabled) {
-  margin: 0px 5px 0px 0px;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  -moz-margin-start: 0px;
+  -moz-margin-end: 5px;
   list-style-image: url(chrome://mozapps/skin/pref/dot.gif);  
 }
 
 .pluginTypesChildren::-moz-tree-image(pluginEnabled, enabled) {
-  margin: 0px 5px 0px 0px;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  -moz-margin-start: 0px;
+  -moz-margin-end: 5px;
   list-style-image: url(chrome://mozapps/skin/pref/check.gif);  
 }
 
 .biggerIndent {
-  margin-left: 28px; 
+  -moz-margin-start: 28px; 
 }
 
 #typeField {
@@ -100,7 +109,7 @@
 }
 
 #defaultAppName {
-  margin-left: 6px !important; 
+  -moz-margin-start: 6px !important; 
 }
 
 /* 
diff --git a/toolkit/themes/qute/mozapps/update/updates.css b/toolkit/themes/qute/mozapps/update/updates.css
index e5a17213d82c..a70b4b7a1cc0 100755
--- a/toolkit/themes/qute/mozapps/update/updates.css
+++ b/toolkit/themes/qute/mozapps/update/updates.css
@@ -59,7 +59,10 @@ license {
  */
 
 #moreDetails {
-  margin: 1px 5px 4px 3px;
+  margin-top: 1px;
+  margin-bottom: 4px;
+  -moz-margin-start: 3px;
+  -moz-margin-end: 5px;
 }
 
 wizard[currentpageid="updatesfound"] .wizard-button[dlgtype="next"] {
@@ -72,7 +75,7 @@ wizard[currentpageid="updatesfound"] .wizard-button[dlgtype="next"] > .button-bo
 }
 
 #updateForMoreInfo {
-  margin-left: 5px;
+  -moz-margin-start: 5px;
 }
 
 #updateName, #updateFinishedName {
@@ -82,7 +85,7 @@ wizard[currentpageid="updatesfound"] .wizard-button[dlgtype="next"] > .button-bo
 
 #alertImage {
   list-style-image: url("chrome://global/skin/icons/Warning.png");
-  margin-right: 5px;
+  -moz-margin-end: 5px;
 }
 
 #incompatibleWarning {
@@ -106,7 +109,10 @@ wizard[currentpageid="updatesfound"] .wizard-button[dlgtype="next"] > .button-bo
 }
 
 #downloadThrobber {
-  margin: 5px 3px 0px 5px;
+  margin-top: 5px;
+  margin-bottom: 0px;
+  -moz-margin-start: 5px;
+  -moz-margin-end: 3px;
   list-style-image: url("chrome://global/skin/throbber/Throbber-small.png");
 }
 
@@ -120,7 +126,10 @@ wizard[currentpageid="updatesfound"] .wizard-button[dlgtype="next"] > .button-bo
 
 #verificationFailedIcon {
   list-style-image: url("chrome://global/skin/icons/notfound.png");
-  margin: 5px 3px 0px 5px;
+  margin-top: 5px;
+  margin-bottom: 0px;
+  -moz-margin-start: 5px;
+  -moz-margin-end: 3px;
 }
 
 /**
@@ -170,7 +179,7 @@ update {
 
 .updatePrefsInfo {
   font-size: smaller;
-  margin-left: 27px;
+  -moz-margin-start: 27px;
   margin-bottom: 10px;
 }
 
diff --git a/toolkit/themes/qute/mozapps/xpinstall/xpinstallConfirm.css b/toolkit/themes/qute/mozapps/xpinstall/xpinstallConfirm.css
index 66f5de15958d..9bf2cd389611 100644
--- a/toolkit/themes/qute/mozapps/xpinstall/xpinstallConfirm.css
+++ b/toolkit/themes/qute/mozapps/xpinstall/xpinstallConfirm.css
@@ -14,7 +14,10 @@
 }
 
 installitem {
-  padding: 5px 0px 5px 5px;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  -moz-padding-start: 5px;
+  -moz-padding-end: 0px;
   border-bottom: 1px dotted #C0C0C0;
   margin-bottom: 5px;
 }
@@ -28,7 +31,7 @@ installitem {
   height: 32px;
   max-width: 32px !important;
   max-height: 32px !important;
-  margin-right: 5px;
+  -moz-margin-end: 5px;
 }
 
 .xpinstallItemName {