2 files changed, 14 insertions, 2 deletions
diff --git a/application/palemoon/base/content/browser.css b/application/palemoon/base/content/browser.css
index a2970aefc..76e49436c 100644
--- a/application/palemoon/base/content/browser.css
+++ b/application/palemoon/base/content/browser.css
@@ -43,8 +43,6 @@ tabbrowser {
 
 .tabbrowser-tab:not([pinned]) {
   -moz-box-flex: 100;
-  max-width: 250px;
-  min-width: 100px;
   width: 0;
   transition: min-width 175ms ease-out,
               max-width 200ms ease-out,
@@ -67,6 +65,12 @@ tabbrowser {
   display: none;
 }
 
+.tabbrowser-tab[pinned] {
+  -moz-box-flex: 0;
+  min-width: 0 !important;
+  max-width: none !important;
+}
+
 .tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned] {
   position: fixed !important;
   display: block; /* position:fixed already does this (bug 579776), but let's be explicit */
diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml
index 1b8099785..10f109ce8 100644
--- a/application/palemoon/base/content/tabbrowser.xml
+++ b/application/palemoon/base/content/tabbrowser.xml
@@ -1445,6 +1445,9 @@
               t.setAttribute("label", aURI);
 
             t.setAttribute("crop", "end");
+            t.style.maxWidth = this.tabContainer.mTabMaxWidth + "px";
+            t.style.minWidth = this.tabContainer.mTabMinWidth + "px";
+            t.width = 0;
             t.setAttribute("validate", "never"); //PMed
             t.setAttribute("onerror", "this.removeAttribute('image');");
             t.className = "tabbrowser-tab";
@@ -3410,6 +3413,8 @@
     <implementation implements="nsIDOMEventListener">
       <constructor>
         <![CDATA[
+          this.mTabMinWidth = Services.prefs.getIntPref("browser.tabs.tabMinWidth");
+          this.mTabMaxWidth = Services.prefs.getIntPref("browser.tabs.tabMaxWidth");
           this.mTabClipWidth = Services.prefs.getIntPref("browser.tabs.tabClipWidth");
           this.mCloseButtons = Services.prefs.getIntPref("browser.tabs.closeButtons");
           this._closeWindowWithLastTab = Services.prefs.getBoolPref("browser.tabs.closeWindowWithLastTab");
@@ -3417,6 +3422,9 @@
           var tab = this.firstChild;
           tab.setAttribute("label",
                            this.tabbrowser.mStringBundle.getString("tabs.emptyTabTitle"));
+          tab.style.minWidth = this.mTabMinWidth + "px";
+          tab.style.maxWidth = this.mTabMaxWidth + "px";
+          tab.width = 0;
           tab.setAttribute("crop", "end");
           tab.setAttribute("onerror", "this.removeAttribute('image');");
           this.adjustTabstrip();