diff -r -u pika/content/tabkit.css beroal/content/tabkit.css
--- pika/content/tabkit.css	2011-09-06 22:34:50.000000000 +0300
+++ beroal/content/tabkit.css	2011-09-06 22:34:22.967852931 +0300
@@ -181,31 +181,31 @@
 #content[vertitabbar] .tabbrowser-arrowscrollbox > scrollbox,
 #content[vertitabbar] .tabbrowser-arrowscrollbox > scrollbox > .scrollbox-innerbox,
 #content[vertitabbar] > tabbox > tabpanels,
-#TabsToolbar,/*[sinceFx4]*/
-#TabsToolbar .tabbrowser-tabs,/*[sinceFx4]*/
-#TabsToolbar .tabbrowser-arrowscrollbox,/*[sinceFx4]*/
-#TabsToolbar .tabbrowser-arrowscrollbox > scrollbox,/*[sinceFx4]*/
-#TabsToolbar .tabbrowser-arrowscrollbox > scrollbox > .scrollbox-innerbox/*[sinceFx4]*/
+#TabsToolbar[vertitabbar],/*[sinceFx4]*/
+#TabsToolbar[vertitabbar] .tabbrowser-tabs,/*[sinceFx4]*/
+#TabsToolbar[vertitabbar] .tabbrowser-arrowscrollbox,/*[sinceFx4]*/
+#TabsToolbar[vertitabbar] .tabbrowser-arrowscrollbox > scrollbox,/*[sinceFx4]*/
+#TabsToolbar[vertitabbar] .tabbrowser-arrowscrollbox > scrollbox > .scrollbox-innerbox/*[sinceFx4]*/
  {
 	-moz-box-orient: vertical !important;
 	max-height: none !important;	
 }
 
 #content[vertitabbar] .tabbrowser-arrowscrollbox .scrollbox-innerbox,
-#TabsToolbar .tabbrowser-arrowscrollbox .scrollbox-innerbox/*[sinceFx4]*/ {
+#TabsToolbar[vertitabbar] .tabbrowser-arrowscrollbox .scrollbox-innerbox/*[sinceFx4]*/ {
 	overflow-x: hidden !important;
 	overflow-y: auto !important;
 }
+
 /* Hide scrollbuttons since we're putting in a scrollbar */
 #content[vertitabbar] .tabbrowser-arrowscrollbox .scrollbutton-up,
 #content[vertitabbar] .tabbrowser-arrowscrollbox .scrollbutton-down-stack/*[Fx2only]*/,
 #content[vertitabbar] .tabbrowser-arrowscrollbox .scrollbutton-down,/*[Fx3only]*/ 
-#TabsToolbar .tabbrowser-arrowscrollbox .scrollbutton-up,/*[sinceFx4]*/
-#TabsToolbar .tabbrowser-arrowscrollbox .scrollbutton-down/*[sinceFx4]*/ {
+#TabsToolbar[vertitabbar] .tabbrowser-arrowscrollbox .scrollbutton-up,/*[sinceFx4]*/
+#TabsToolbar[vertitabbar] .tabbrowser-arrowscrollbox .scrollbutton-down/*[sinceFx4]*/ {
 	display: none !important;
 }
-#content[vertitabbar] .tabbrowser-tab,
-#TabsToolbar .tabbrowser-tab {
+#content[vertitabbar] .tabbrowser-tab {
 	-moz-box-sizing: padding-box !important;
 	min-height: 24px !important;
 	max-height: 24px !important;
@@ -215,6 +215,11 @@
 	margin-bottom: 0 !important; /*[sinceFx3]*/
 	padding-top: 0 !important; /*[sinceFx3]*/
 }
+#TabsToolbar[vertitabbar] .tabbrowser-tab {
+	-moz-box-sizing: padding-box !important;
+	min-height: 27px !important;
+	max-height: 27px !important;
+}
 
 /* The All Tabs button is redundant in Firefox 2 since the vertical tab bar is
  * a permanent equivalent to the All Tabs popup (Firefox 3 however adds the tab
@@ -230,7 +235,7 @@
 }
 
 #content[vertitabbar] .tabbrowser-tabs,
-#TabsToolbar .tabbrowser-tabs/*[sinceFx4]*/
+#TabsToolbar[vertitabbar] .tabbrowser-tabs/*[sinceFx4]*/
  {
 	-moz-box-align: stretch !important; /* Make sure tabs fill width */
 	background-image: none !important; /* Background was designed for repeat-x, and looks ugly when tiled vertically */
@@ -248,7 +253,7 @@
 }
 
 /* Add by Pika */
-#TabsToolbar .tabbrowser-tab {
+#TabsToolbar[vertitabbar] .tabbrowser-tab {
 	-moz-box-align: stretch !important; 
 	max-width: 9999px;/* Make sure tabs fill width */
 }
@@ -414,4 +419,4 @@
 }
 #main-window[persona] .tabbrowser-tab[selected="true"] {
 	opacity: 1.0 !important; /* Instead of default 0.8 */
-}
\ Наприкінці файлу немає нового рядка
+}
diff -r -u pika/content/tabkit.js beroal/content/tabkit.js
--- pika/content/tabkit.js	2011-09-06 22:34:50.000000000 +0300
+++ beroal/content/tabkit.js	2011-09-06 22:34:09.697904684 +0300
@@ -4871,23 +4871,6 @@
 		var tabsToolbar = document.getElementById("TabsToolbar"); //FF4+ tabbar
 		var appcontent = document.getElementById("appcontent");
 
-		//FF4+, Left
-		if (pos == tk.Positions.LEFT && tabsToolbar && tabsToolbar.nextSibling != appcontent) {
-          gBrowser.mTabContainer.mTabstrip._stopSmoothScroll();
-          appcontent.parentNode.insertBefore(tabsToolbar, appcontent);
-          tabsToolbar.orient = gBrowser.mTabContainer.orient = gBrowser.mTabContainer.mTabstrip.orient = "vertical";
-          TabsInTitlebar.allowedBy("tabbarposition", false);
-          gBrowser.mTabContainer.removeAttribute("overflow");
-		  tk.log("After vertical tabbar");
-        }
-		//FF4+, Right
-        if (pos == tk.Positions.RIGHT && tabsToolbar && tabsToolbar.previousSibling != appcontent) {
-          gBrowser.mTabContainer.mTabstrip._stopSmoothScroll();
-          appcontent.parentNode.insertBefore(tabsToolbar, appcontent.nextSibling);
-          tabsToolbar.orient = gBrowser.mTabContainer.orient = gBrowser.mTabContainer.mTabstrip.orient = "vertical";
-          TabsInTitlebar.allowedBy("tabbarposition", false);
-          gBrowser.mTabContainer.removeAttribute("overflow");
-        }
 		//End Edit by Pika
 
         // Calculate new orient attributes
@@ -4947,9 +4930,24 @@
 		*/
 
         // Now activate our css
+        if (pos == tk.Positions.LEFT || pos == tk.Positions.RIGHT) {
+            appcontent.parentNode.insertBefore(tabsToolbar, appcontent);
+        }
+        else if (pos == tk.Positions.TOP) {
+            a = document.getElementById("toolbar-menubar");
+            a.parentNode.insertBefore(tabsToolbar, a);
+        }
+        else if (pos == tk.Positions.BOTTOM) {
+            a = document.getElementById("browser-bottombox");
+            a.parentNode.insertBefore(tabsToolbar, a);
+        }
+        tabsToolbar.orient = gBrowser.mTabContainer.mTabstrip.orient = fromHorizontal;
         gBrowser.removeAttribute("horiztabbar");
         gBrowser.removeAttribute("vertitabbar");
         gBrowser.setAttribute(fromHorizontal.substring(0, 5) + "tabbar", flipDirection ? "reverse" : "normal");
+        tabsToolbar.removeAttribute("horiztabbar");
+        tabsToolbar.removeAttribute("vertitabbar");
+        tabsToolbar.setAttribute(fromHorizontal.substring(0, 5) + "tabbar", flipDirection ? "reverse" : "normal");
         
         // Toggle the splitter as appropriate
         var splitter = document.getElementById("tabkit-splitter");