1.5.6beta1

<b>[locale(s)]</b>
- Japanese (ja) translation updated (thanks to mm_k)
- French (fr) translation updated (thanks to BlackJack)

<b>[fix(es)]</b>
- Location bar (3) > Autocomplete popup > disable height limit (thanks
to atelierJVA)
-- miscalculation on a dual vertical screen setup
- Fx51+: Location bar (2) > "Favicon": image color/opacity
- Fx51+: Location bar (2) > "replace i-icon with globe": image
color/opacity

<b>[new option(s)]</b>
- Fx48+: General UI (1) > General 'about:' pages: alternative appearance

- Windows/Linux & Fx50+: General UI (2) > Bookmarks on toolbar: old
appearance

<b>[general change(s)]</b>
- Location bar (3) > Autocomplete popup > Remove 'search with' and
'visit' items
-- tweaked code, if no items are visible (experimental!)

34 files changed, 390 insertions, 77 deletions

diff --git a/xpi/content/css/aboutpages.css b/xpi/content/css/aboutpages.css
new file mode 100644
index 0000000..636334b
--- /dev/null
+++ b/xpi/content/css/aboutpages.css
@@ -0,0 +1,158 @@
+@-moz-document	url-prefix(about:support),
+				url-prefix(about:performance),
+				url-prefix(about:profiles),
+				url-prefix(about:sessionrestore),
+				url-prefix(about:welcomeback),
+				url-prefix(about:neterror),
+				url-prefix(about:crashes),
+				url-prefix(about:tabcrashed){
+  
+	:root {
+	  background: white !important;
+	}
+ 
+	button {
+	  min-height: unset !important;
+	  height: unset !important;
+	  font-size: 90% !important;
+	  background-image: linear-gradient(to bottom, rgba(255,255,255,0.15), rgba(255,255,255,0.20),rgba(0,0,0,0.01)) !important;
+	}
+    
+	*.radio-check,
+	*.checkbox-check,
+	input[type="checkbox"] + label:before {
+	  width: 16px !important;
+	  height: 16px !important;
+	}
+
+}
+
+@-moz-document	url-prefix(about:debugging),
+				url-prefix(about:networking) {
+
+ 	html {
+	  background: linear-gradient(to bottom right, #f5f5f5,-moz-Dialog,#f5f5f5,-moz-Dialog) !important;
+	}
+	
+	.category-icon {
+	  background: grey !important;
+	}
+
+	@media (-moz-os-version: windows-win7), (-moz-os-version: windows-vista){
+	  @media (-moz-windows-theme:aero) {
+	    html{
+		  background: linear-gradient(to bottom right, #edf6ff,#dbeaf9,#edf6ff,#dbeaf9) !important;
+	    }
+		.category-icon {
+		  background: lightblue !important;
+		}
+	  }
+	}
+		
+	#categories {
+	  background: transparent !important;
+	}
+		
+	#categories .category[selected],
+	#categories .category.selected{
+	  background-color: white !important;
+	  color: black !important;
+	}
+
+	#categories .category:not([selected]):hover,
+	#categories .category:not(.selected):hover{
+	  background-color: Highlight !important;
+	  color: HighlightText !important;
+	}
+
+	#categories .category:not([selected]):not(:hover),
+	#categories .category:not(.selected):not(:hover){
+	  color: black !important;
+	}
+
+	#categories .category {
+	  transition-duration: unset !important;
+	}
+
+	.targets h2,
+	.header-name {
+	  font-weight: bold !important;
+	  font-size: 130% !important;
+	  padding-bottom: 0 !important;
+	}		
+
+	button {
+	  min-height: unset !important;
+	  height: unset !important;
+	  font-size: 90% !important;
+	  background-image: linear-gradient(to bottom, rgba(255,255,255,0.15), rgba(255,255,255,0.20),rgba(0,0,0,0.01)) !important;
+	}
+	
+	input[type="text"] {
+	  min-height: 18px !important;
+	  height: 18px !important;
+	}
+
+	description,
+	.main-content label{
+	  font-size:90% !important;
+	}
+	
+	.main-content {
+	  margin-top: 20px !important;
+	  margin-bottom: 20px !important;
+	  background-color: white !important;
+	}
+		
+
+	*.checkbox-check,
+	*.radio-check,
+	input[type="checkbox"] + label:before {
+	  width: 16px !important;
+	  height: 16px !important;
+	}
+
+}
+
+@-moz-document	url-prefix(about:debugging) {
+  *.header {
+	visibility: collapse !important;
+    display:none !important;
+  }
+}
+
+@-moz-document	url-prefix(about:networking) {
+  #sectionTitle {
+	visibility: collapse !important;
+    display:none !important;
+  }
+  *.header {
+	padding-bottom: unset !important;
+	border: unset !important;
+  }
+  #warning_message{
+    background: white !important;
+  }
+  #categories > hr {
+    display: none !important;
+  }
+}
+
+@-moz-document	url-prefix(about:privatebrowsing) {
+	html.normal {
+	  background: white !important;
+	}
+	html.normal button {
+	  min-height: unset !important;
+	  height: unset !important;
+	  font-size: 90% !important;
+	  background-image: linear-gradient(to bottom, rgba(255,255,255,0.15), rgba(255,255,255,0.20),rgba(0,0,0,0.01)) !important;
+	}
+}
+
+#errorPageContainer	button {
+  min-height: unset !important;
+  height: unset !important;
+  font-size: 90% !important;
+  background-image: linear-gradient(to bottom, rgba(255,255,255,0.15), rgba(255,255,255,0.20),rgba(0,0,0,0.01)) !important;
+}
\ No newline at end of file
diff --git a/xpi/content/css/alt_autocompl_items.css b/xpi/content/css/alt_autocompl_items.css
index 8754238..15417da 100644
--- a/xpi/content/css/alt_autocompl_items.css
+++ b/xpi/content/css/alt_autocompl_items.css
@@ -20,5 +20,29 @@
 	  border-top: 1px solid transparent !important;
 	  border-bottom: 1px solid transparent !important;
 	}
+	
+	@media not all and (-moz-windows-classic) {
+	
+		panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not([collapse="true"]),
+		#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]) {
+		  margin: 0px 4px 0px 4px !important;
+		}
+
+		panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not([collapse="true"]):nth-of-type(2),
+		#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]):nth-of-type(2) {
+		  margin: 4px 4px 0px 4px !important;
+		}
+
+		panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not([collapse="true"]):last-of-type,
+		#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]):last-of-type {
+		  margin: 0px 4px 4px 4px !important;
+		}
+
+		panel[type="autocomplete-richlistbox"] .autocomplete-richlistbox,
+		#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistbox {
+		  padding: 0 !important;
+		}
+		
+	}
 
 }
\ No newline at end of file
diff --git a/xpi/content/css/alt_autocompl_items2.css b/xpi/content/css/alt_autocompl_items2.css
index a85f3c6..c82b7f1 100644
--- a/xpi/content/css/alt_autocompl_items2.css
+++ b/xpi/content/css/alt_autocompl_items2.css
@@ -29,5 +29,25 @@
 	  border-top: 1px solid transparent !important;
 	  border-bottom: 1px solid transparent !important;
 	}
-
+	
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistbox,
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistbox {
+	  transition: unset !important;
+	}
+	
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistbox[style="height: 0px;"],
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistbox[style="height: 0px;"],
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistbox[style="height: 8px;"],
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistbox[style="height: 8px;"] {
+	  padding-top: 0 !important;
+	  padding-bottom: 0 !important;
+	  margin-bottom: -1px !important;
+	  min-width: 0 !important;
+      width: 0 !important;
+      max-width: 0 !important;
+      padding-left: 0 !important;
+      padding-right: 0 !important;
+      margin-left: 0 !important;
+      margin-right: 0 !important;
+	}
 }
\ No newline at end of file
diff --git a/xpi/content/css/alt_autocomplete.css b/xpi/content/css/alt_autocomplete.css
index 6204927..eb0fd0d 100644
--- a/xpi/content/css/alt_autocomplete.css
+++ b/xpi/content/css/alt_autocomplete.css
@@ -95,5 +95,10 @@
 		padding: 0 !important;
 	  }
 	}
+	
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem #ibox-spacer,
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem #ibox-spacer {
+	  width:100000px !important;
+	}
 
 }
\ No newline at end of file
diff --git a/xpi/content/css/faviconurl_extra.css b/xpi/content/css/faviconurl_extra.css
new file mode 100644
index 0000000..8bec451
--- /dev/null
+++ b/xpi/content/css/faviconurl_extra.css
@@ -0,0 +1,10 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@-moz-document url(chrome://browser/content/browser.xul){
+
+	#identity-icon {
+	  filter: unset !important;
+	  fill: unset !important;
+	  opacity: 1.0 !important;
+	}
+
+}
\ No newline at end of file
diff --git a/xpi/content/css/hide_ibinfoico.css b/xpi/content/css/hide_ibinfoico.css
index 1aa4688..ab52758 100644
--- a/xpi/content/css/hide_ibinfoico.css
+++ b/xpi/content/css/hide_ibinfoico.css
@@ -3,5 +3,8 @@
 	*:not(.chromeUI) > #identity-icon,
 	*:not(.chromeUI):not(.verifiedDomain):not(.verifiedIdentity) > #page-proxy-favicon {
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/globe.png') !important;
+	  filter: unset !important;
+	  fill: unset !important;
+	  opacity: 1.0 !important;
 	}
 }
\ No newline at end of file
diff --git a/xpi/content/css/oldplacesbut.css b/xpi/content/css/oldplacesbut.css
new file mode 100644
index 0000000..e05366e
--- /dev/null
+++ b/xpi/content/css/oldplacesbut.css
@@ -0,0 +1,8 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@-moz-document url(chrome://browser/content/browser.xul){
+ 
+	#PlacesToolbar toolbarbutton {
+	  -moz-appearance: toolbarbutton !important;
+	}
+
+}
\ No newline at end of file
diff --git a/xpi/content/css/urlbar_results.css b/xpi/content/css/urlbar_results.css
index 32bff8b..51375c8 100644
--- a/xpi/content/css/urlbar_results.css
+++ b/xpi/content/css/urlbar_results.css
@@ -5,6 +5,7 @@
 	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistbox {
 	  max-height: unset !important;
 	  height: auto !important;
+	  transition: unset !important;
 	}
 
 }
\ No newline at end of file
diff --git a/xpi/content/options.js b/xpi/content/options.js
index fae3122..82c949b 100644
--- a/xpi/content/options.js
+++ b/xpi/content/options.js
@@ -406,6 +406,7 @@ classicthemerestorerjso.ctr = {
 	  document.getElementById('ctraddon_pw_anewtaburlpcb').style.visibility = 'collapse';
 	  document.getElementById('ctraddon_pw_anewtaburlpurlbox').style.visibility = 'collapse';
 	  document.getElementById('ctraddon_pw_cresultshbox').style.visibility = 'collapse';
+	  document.getElementById('ctraddon_pw_aboutpages').style.visibility = 'collapse';
 	}
 
 	if (this.appversion >= 48) {
@@ -422,6 +423,7 @@ classicthemerestorerjso.ctr = {
 	  document.getElementById('ctraddon_pw_findbarhlgb').style.visibility = 'collapse';
 	  document.getElementById('ctraddon_pw_flywebgb').style.visibility = 'collapse';
 	  document.getElementById('ctraddon_pw_autocompl_it2').style.visibility = 'collapse';
+	  document.getElementById('ctraddon_pw_oldplacesbut').style.visibility = 'collapse';
 	}
 	
 	if (this.appversion >= 50) {
@@ -1191,6 +1193,9 @@ classicthemerestorerjso.ctr = {
 	this.prefs.setBoolPref("hideurlsrg",true);
 
 	this.prefs.setBoolPref("oldsearch",true);
+	
+	if(this.appversion >= 50)
+	  this.prefs.setBoolPref("oldplacesbut",true);
 
 	if(this.appversion >= 48)
 	  this.prefs.setBoolPref("altautocompl",true);
diff --git a/xpi/content/options.xul b/xpi/content/options.xul
index 26840bb..1c0f3f8 100644
--- a/xpi/content/options.xul
+++ b/xpi/content/options.xul
@@ -104,6 +104,7 @@
 		<preference id="ctraddon_alt_addonsp"	name="extensions.classicthemerestorer.alt_addonsp"	 type="bool"	instantApply="true"/>
 		<preference id="ctraddon_alt_addonsm"	name="extensions.classicthemerestorer.alt_addonsm"	 type="bool"	instantApply="true"/>
 		<preference id="ctraddon_altoptions"	name="extensions.classicthemerestorer.altoptions"	type="string"	instantApply="true"/>
+		<preference id="ctraddon_aboutpages"	name="extensions.classicthemerestorer.aboutpages"	type="bool"		instantApply="true"/>
 		<preference id="ctraddon_svgfilters"	name="extensions.classicthemerestorer.svgfilters"	type="bool"		instantApply="true"/>
 		<preference id="ctraddon_wincontrols"	name="extensions.classicthemerestorer.wincontrols"	type="bool"		instantApply="true"/>
 		<preference id="ctraddon_puibuttonsep"	name="extensions.classicthemerestorer.puibuttonsep"	type="string"	instantApply="true"/>
@@ -251,6 +252,7 @@
 		<preference id="ctraddon_hidezoomres"	name="extensions.classicthemerestorer.hidezoomres"	 type="bool"	instantApply="true"/>
 		<preference id="ctraddon_hiderecentbm"	name="extensions.classicthemerestorer.hiderecentbm"	 type="bool"	instantApply="true"/>
 		<preference id="ctraddon_hideeditbm"	name="extensions.classicthemerestorer.hideeditbm"	 type="bool"	instantApply="true"/>
+		<preference id="ctraddon_oldplacesbut"	name="extensions.classicthemerestorer.oldplacesbut"	 type="bool"	instantApply="true"/>
 		<preference id="ctraddon_bmbutpanelm"	name="extensions.classicthemerestorer.bmbutpanelm"	 type="bool"	instantApply="true"/>
 		<preference id="ctraddon_bmbunsortbm"	name="extensions.classicthemerestorer.bmbunsortbm"	 type="bool"	instantApply="true"/>
 		<preference id="ctraddon_bmbunsortbm2"	name="extensions.classicthemerestorer.bmbunsortbm2"	 type="bool"	instantApply="true"/>
@@ -346,8 +348,8 @@
 	  <radio value="ctraddon_tabsbox2" 		label="&Ctr_tabs; (2)"		class="ctraddontab ctraddon_new_in_v48"/>
 	  <radio value="ctraddon_fontbox"    	label="&Ctr_tabcolors_t;"	id="ctraddon_sqtabcolorstab" class="ctraddontab"/>
 	  <radio value="ctraddon_appbuttonbox" 	label="&Ctr_appbutton;"		class="ctraddontab"/>
-	  <radio value="ctraddon_generaluibox"	label="&Ctr_ui; (1)"		class="ctraddontab"/>
-	  <radio value="ctraddon_generaluibox2"	label="&Ctr_ui; (2)"		class="ctraddontab ctraddon_new_in_v47"/>
+	  <radio value="ctraddon_generaluibox"	label="&Ctr_ui; (1)"		class="ctraddontab ctraddon_new_in_v48"/>
+	  <radio value="ctraddon_generaluibox2"	label="&Ctr_ui; (2)"		class="ctraddontab ctraddon_new_in_v47 ctraddon_new_in_v50"/>
 	  <radio value="ctraddon_generaluibox3"	label="&Ctr_ui; (3)"		class="ctraddontab"/>
 	  <radio value="ctraddon_prefpagebox"	label="&Ctr_prefpage;"		class="ctraddontab"/>
 	  <radio value="ctraddon_addonmngrbox"	label="&Ctr_addonmanager;"	class="ctraddontab"/>
@@ -909,6 +911,7 @@
 		<checkbox label="&Ctr_noconicons;"		preference="ctraddon_noconicons" id="ctraddon_pw_noconicons"/>
 		<checkbox label="&Ctr_alt_newtabp;"		preference="ctraddon_alt_newtabp" id="ctraddon_pw_alt_newtabp"/>
 		<checkbox label="&Ctr_nosnippets;"		preference="ctraddon_nosnippets" id="ctraddon_pw_nosnippets"/>
+		<checkbox label="&Ctr_aboutpages;"		preference="ctraddon_aboutpages" id="ctraddon_pw_aboutpages" class="ctraddon_new_in_v48"/>
 		<checkbox label="&Ctr_svgfilters;"		preference="ctraddon_svgfilters" id="ctraddon_pw_svgfilters"/>
 		<checkbox label="&Ctr_combrelstop;"		preference="ctraddon_combrelstop" id="ctraddon_pw_stopreload"/>
 		<description class="ctraddonsuboption">&Ctr_stoprel1;</description>
@@ -954,6 +957,7 @@
 		<checkbox label="&Ctr_menupopupscr;"	preference="ctraddon_menupopupscr"/>
 		<checkbox label="&Ctr_hiderecentbm;"	preference="ctraddon_hiderecentbm" id="ctraddon_pw_hiderecentbm" class="ctraddon_new_in_v47"/>
 		<checkbox label="&Ctr_hideeditbm;"		preference="ctraddon_hideeditbm" id="ctraddon_pw_hideeditbm" class="ctraddon_new_in_v47" oncommand="classicthemerestorerjso.ctr.needsBrowserRestart()"/>
+		<checkbox label="&Ctr_oldplacesbut;"	preference="ctraddon_oldplacesbut" id="ctraddon_pw_oldplacesbut" class="ctraddon_winlinonly ctraddon_new_in_v50"/>
 		<description class="ctraddon_font1">&Ctr_bmbutton;</description>
 		<checkbox label="&Ctr_bmbutpanelm;"		preference="ctraddon_bmbutpanelm" id="ctraddon_pw_bmbutpanelm"/>
 		<checkbox label="&Ctr_bmbunsortbm;"		preference="ctraddon_bmbunsortbm" id="ctraddon_pw_bmbunsortbm" oncommand="if(this.checked) {classicthemerestorerjso.ctr.ctrpwUnsortBM(true);} else {classicthemerestorerjso.ctr.ctrpwUnsortBM(false);}"/>
diff --git a/xpi/content/overlay.js b/xpi/content/overlay.js
index 7f653ab..159ffa9 100644
--- a/xpi/content/overlay.js
+++ b/xpi/content/overlay.js
@@ -870,6 +870,11 @@ classicthemerestorerjs.ctr = {
 			}
 
 		  break;
+		  
+		  case "aboutpages":
+			if (branch.getBoolPref("aboutpages") && classicthemerestorerjs.ctr.appversion >= 48) classicthemerestorerjs.ctr.loadUnloadCSS("aboutpages",true);
+			  else classicthemerestorerjs.ctr.loadUnloadCSS("aboutpages",false);
+		  break;
 
 		  case "svgfilters":
 			if (branch.getBoolPref("svgfilters")) classicthemerestorerjs.ctr.loadUnloadCSS("svgfilters",true);
@@ -2088,6 +2093,11 @@ classicthemerestorerjs.ctr = {
 				}
 			}
 		  break;
+		  
+		  case "oldplacesbut":
+			if (branch.getBoolPref("oldplacesbut") && classicthemerestorerjs.ctr.appversion >= 50) classicthemerestorerjs.ctr.loadUnloadCSS("oldplacesbut",true);
+			  else classicthemerestorerjs.ctr.loadUnloadCSS("oldplacesbut",false);
+		  break;
 
 		  case "bmbutpanelm":
 			if (branch.getBoolPref("bmbutpanelm")) classicthemerestorerjs.ctr.loadUnloadCSS("bmbutpanelm",true);
@@ -2345,7 +2355,12 @@ classicthemerestorerjs.ctr = {
 		  break;
 
 		  case "faviconurl": case "padlockex":
-			if (branch.getBoolPref("faviconurl")) classicthemerestorerjs.ctr.favIconinUrlbarCTR();
+			if (branch.getBoolPref("faviconurl")) {
+				classicthemerestorerjs.ctr.favIconinUrlbarCTR();
+				classicthemerestorerjs.ctr.loadUnloadCSS("faviconurl",true);
+			} else {
+				classicthemerestorerjs.ctr.loadUnloadCSS("faviconurl",false);
+			}
 		  break;
 		  
 		  case "padlock":
@@ -4046,6 +4061,7 @@ classicthemerestorerjs.ctr = {
 		case "options_win_alt": 	manageCSS("alt_optionswindow2.css");	break;
 		case "options_win_ct": 		manageCSS("alt_optionswindow_ct.css");	break;
 		case "altoptionsmitem": 	manageCSS("alt_options_mitem.css");		break;
+		case "aboutpages": 			manageCSS("aboutpages.css");			break;
 		case "svgfilters": 			manageCSS("svgfilters.css");			break;
 		case "iat_notf_vt": 		manageCSS("mode_iat_no_vt.css");		break;
 		case "to_notf_vt": 			manageCSS("mode_to_no_vt.css");			break;
@@ -4142,6 +4158,7 @@ classicthemerestorerjs.ctr = {
 		break;
 		
 		case "hiderecentbm": 		manageCSS("hide_recently_bm.css");		break;
+		case "oldplacesbut": 		manageCSS("oldplacesbut.css");			break;
 		case "bmbutpanelm": 		manageCSS("bmbut_pmenu.css");			break;
 		case "bmbunsortbm": 		manageCSS("bmbut_unsortedbookm.css");	break;
 		case "bmbunsortbm2": 		manageCSS("bmbut_unsortedbookm2.css");	break;
@@ -4156,6 +4173,7 @@ classicthemerestorerjs.ctr = {
 		case "ib_nohovcolor": 		manageCSS("ib_nohovcolor.css");			break;
 		case "ib_graycolor": 		manageCSS("ib_graycolor.css");			break;
 		case "verifiedcolors": 		manageCSS("verifiedcolors.css");		break;
+		case "faviconurl": 			manageCSS("faviconurl_extra.css");		break;
 		case "ibinfoico": 			manageCSS("hide_ibinfoico.css");		break;
 		case "ibinfoico2": 			manageCSS("hide_ibinfoico2.css");		break;
 		case "iblabels": 			manageCSS("hide_iblabels.css");			break;
diff --git a/xpi/content/urlbarBindings.xml b/xpi/content/urlbarBindings.xml
index b8d8c82..7922c11 100644
--- a/xpi/content/urlbarBindings.xml
+++ b/xpi/content/urlbarBindings.xml
@@ -216,7 +216,8 @@
 			var cheight = Services.prefs.getBranch("extensions.classicthemerestorer.").getIntPref("cresultsh");
 			
 			// urlbars bottom position
-			var urlbbotpos = document.getElementById("urlbar").boxObject.screenY + document.getElementById("urlbar").boxObject.height;
+			//var urlbbotpos = document.getElementById("urlbar").boxObject.screenY + document.getElementById("urlbar").boxObject.height;
+			var urlbbotpos = document.getElementById("urlbar").boxObject.screenY + document.getElementById("urlbar").boxObject.height - window.screen.top;
 			
 			try{
 			  if(document.getElementById("main-window").hasAttribute("inFullscreen"))
@@ -244,13 +245,12 @@
 			}
 
 		  }
-	  
+  
 		  // if CTRs movable location bar is on a bottom toolbar, open autocomplete popup above location bar
 		  if(document.getElementById('urlbar-container').parentNode.parentNode.id=="browser-bottombox")
 		    this.openPopup(aElement, "before_end", 0, 0, false, false);
 		  else
             this.openPopup(aElement, "after_start", 0, -1, false, false);
-
         ]]></body>
       </method>
 
@@ -474,32 +474,38 @@
     <content align="start"
              onoverflow="this._onOverflow();"
              onunderflow="this._onUnderflow();">
-      <xul:hbox align="center">
-		  <xul:image anonid="site-icon"
-					 class="ac-site-icon"
-					 xbl:inherits="src=image,selected"/>
-		  <xul:hbox class="ac-title"
-					align="center"
-					xbl:inherits="selected">
-			<xul:description class="ac-text-overflow-container">
-			  <xul:description anonid="title-text"
-							   class="ac-title-text"
-							   xbl:inherits="selected"/>
-			</xul:description>
-		    <xul:image anonid="type-icon"
-					 class="ac-type-icon"
-					 xbl:inherits="selected,current"/>
-		  </xul:hbox>
-		  <xul:hbox anonid="tags"
-					class="ac-tags"
-					align="center"
-					xbl:inherits="selected">
-			<xul:description class="ac-text-overflow-container">
-			  <xul:description anonid="tags-text"
-							   class="ac-tags-text"
-							   xbl:inherits="selected"/>
-			</xul:description>
+	  <xul:hbox>
+		  <xul:hbox align="center">
+			  <xul:image anonid="site-icon"
+						 class="ac-site-icon"
+						 xbl:inherits="src=image,selected"/>
+			  <xul:hbox class="ac-title"
+						align="center"
+						xbl:inherits="selected">
+				<xul:description class="ac-text-overflow-container">
+				  <xul:description anonid="title-text"
+								   class="ac-title-text"
+								   xbl:inherits="selected"/>
+				</xul:description>
+
+			  </xul:hbox>
+			  <xul:hbox anonid="tags"
+						class="ac-tags"
+						align="center"
+						xbl:inherits="selected">
+				<xul:description class="ac-text-overflow-container">
+				  <xul:description anonid="tags-text"
+								   class="ac-tags-text"
+								   xbl:inherits="selected"/>
+				</xul:description>
+			  </xul:hbox>
 		  </xul:hbox>
+		  <xul:spacer flex="1" id="ibox-spacer"/>
+		  <xul:hbox align="end" id="ibox-box">
+				<xul:image anonid="type-icon"
+						 class="ac-type-icon"
+						 xbl:inherits="selected,current"/>
+		</xul:hbox>
 	  </xul:hbox>
 	  <xul:hbox align="center">
 		  <xul:hbox anonid="separator"
@@ -1132,7 +1138,7 @@
                 tagsAvailable,
                 titleTagsMaxWidth * (1 - titlePct)
               );
-			  this._titleText.style.maxWidth = titleMaxWidth + "px";
+			  this._titleText.style.maxWidth = (-16 + titleMaxWidth) + "px";
               this._tagsText.style.maxWidth = titleMaxWidth + "px";
             }
             let urlActionMaxWidth = Math.max(
diff --git a/xpi/content/urlbarBindings51.xml b/xpi/content/urlbarBindings51.xml
index 5159e17..2240642 100644
--- a/xpi/content/urlbarBindings51.xml
+++ b/xpi/content/urlbarBindings51.xml
@@ -234,7 +234,8 @@
 			var cheight = Services.prefs.getBranch("extensions.classicthemerestorer.").getIntPref("cresultsh");
 			
 			// urlbars bottom position
-			var urlbbotpos = document.getElementById("urlbar").boxObject.screenY + document.getElementById("urlbar").boxObject.height;
+			//var urlbbotpos = document.getElementById("urlbar").boxObject.screenY + document.getElementById("urlbar").boxObject.height;
+			var urlbbotpos = document.getElementById("urlbar").boxObject.screenY + document.getElementById("urlbar").boxObject.height - window.screen.top;
 		
 			try{
 			  if(document.getElementById("main-window").hasAttribute("inFullscreen"))
@@ -260,7 +261,12 @@
 			} else {
 			  this.setAttribute("maxheight", height);
 			}
-
+			
+			/*var currentbox = document.getAnonymousElementByAttribute(this, "anonid", "richlistbox");
+			
+			if(currentbox.getAttribute('style')=="height: 0px;" || currentbox.getAttribute('style')=="height: 8px;")
+			  this.closePopup();*/
+			  
 		  }
 	  
 		  // if CTRs movable location bar is on a bottom toolbar, open autocomplete popup above location bar
@@ -513,32 +519,37 @@
     <content align="start"
              onoverflow="this._onOverflow();"
              onunderflow="this._onUnderflow();">
-	<xul:hbox align="center">
-      <xul:image anonid="site-icon"
-                 class="ac-site-icon"
-                 xbl:inherits="src=image,selected,type"/>
-      <xul:hbox class="ac-title"
-                align="center"
-                xbl:inherits="selected">
-        <xul:description class="ac-text-overflow-container">
-          <xul:description anonid="title-text"
-                           class="ac-title-text"
-                           xbl:inherits="selected"/>
-        </xul:description>
-      <xul:image anonid="type-icon"
-                 class="ac-type-icon"
-                 xbl:inherits="selected,current,type"/>
-      </xul:hbox>
-      <xul:hbox anonid="tags"
-                class="ac-tags"
-                align="center"
-                xbl:inherits="selected">
-        <xul:description class="ac-text-overflow-container">
-          <xul:description anonid="tags-text"
-                           class="ac-tags-text"
-                           xbl:inherits="selected"/>
-        </xul:description>
-      </xul:hbox>
+	<xul:hbox>
+		<xul:hbox align="center">
+		  <xul:image anonid="site-icon"
+					 class="ac-site-icon"
+					 xbl:inherits="src=image,selected,type"/>
+		  <xul:hbox class="ac-title"
+					align="center"
+					xbl:inherits="selected">
+			<xul:description class="ac-text-overflow-container">
+			  <xul:description anonid="title-text"
+							   class="ac-title-text"
+							   xbl:inherits="selected"/>
+			</xul:description>
+			<xul:hbox anonid="tags"
+					class="ac-tags"
+					align="center"
+					xbl:inherits="selected">
+			  <xul:description class="ac-text-overflow-container">
+				<xul:description anonid="tags-text"
+							   class="ac-tags-text"
+							   xbl:inherits="selected"/>
+			  </xul:description>
+			</xul:hbox>
+		  </xul:hbox>
+		</xul:hbox>
+		<xul:spacer flex="1" id="ibox-spacer"/>
+		<xul:hbox align="end" id="ibox-box">
+		  <xul:image anonid="type-icon"
+				   class="ac-type-icon"
+				   xbl:inherits="selected,current,type"/>
+		</xul:hbox>
 	</xul:hbox>
 	<xul:hbox align="center">
       <xul:hbox anonid="separator"
@@ -1172,7 +1183,7 @@
                 tagsAvailable,
                 titleTagsMaxWidth * (1 - titlePct)
               );
-              this._titleText.style.maxWidth = titleMaxWidth + "px";
+              this._titleText.style.maxWidth = (-16 + titleMaxWidth) + "px";
               this._tagsText.style.maxWidth = titleMaxWidth + "px";
             }
             let urlActionMaxWidth = Math.max(
diff --git a/xpi/defaults/preferences/options.js b/xpi/defaults/preferences/options.js
index 99a503d..a54d359 100644
--- a/xpi/defaults/preferences/options.js
+++ b/xpi/defaults/preferences/options.js
@@ -40,6 +40,7 @@ pref("extensions.classicthemerestorer.nbcompact",false);
 pref("extensions.classicthemerestorer.statusbar",true);
 pref("extensions.classicthemerestorer.noconicons",false);
 pref("extensions.classicthemerestorer.altoptions",'options_default');
+pref("extensions.classicthemerestorer.aboutpages",false);
 pref("extensions.classicthemerestorer.svgfilters",false);
 pref("extensions.classicthemerestorer.combrelstop",false);
 pref("extensions.classicthemerestorer.activndicat",false);
@@ -78,6 +79,7 @@ pref("extensions.classicthemerestorer.am_hovshowb",false);
 pref("extensions.classicthemerestorer.alt_addonsp",false);
 pref("extensions.classicthemerestorer.hiderecentbm",false);
 pref("extensions.classicthemerestorer.hideeditbm",false);
+pref("extensions.classicthemerestorer.oldplacesbut",false);
 pref("extensions.classicthemerestorer.bmbutpanelm",false);
 pref("extensions.classicthemerestorer.bmbunsortbm",false);
 pref("extensions.classicthemerestorer.bmbunsortbm2",true);
diff --git a/xpi/install.rdf b/xpi/install.rdf
index 3247546..1da257c 100644
--- a/xpi/install.rdf
+++ b/xpi/install.rdf
@@ -5,7 +5,7 @@
 	<Description rdf:about="urn:mozilla:install-manifest">
 		<em:id>ClassicThemeRestorer@ArisT2Noia4dev</em:id>
 		<em:name>Classic Theme Restorer</em:name>
-		<em:version>1.5.5.3</em:version>
+		<em:version>1.5.6beta1</em:version>
 		<em:type>2</em:type>
 		<em:multiprocessCompatible>true</em:multiprocessCompatible>
 
diff --git a/xpi/locale/cs/options.dtd b/xpi/locale/cs/options.dtd
index 65dabbd..dae496a 100644
--- a/xpi/locale/cs/options.dtd
+++ b/xpi/locale/cs/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Výška">
 <!ENTITY Ctr_altoptionsi	"V simulaci nastavení už není dialogové okno, ale 'okno prohlížeče' s lištami je skryto. Volba 'Použít stávající stránku' přidávající URL stránek, otevřených v současném okně, je dostupná přes 'about:preferences'. Tlačítko 'Možnosti' je nahrazeno novým, aby bylo možné otevírat možnosti v okně.">
 <!ENTITY Ctr_options_rem	"Pamatovat poslední zvolenou kategorii">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"SVG barvy pro defaultní ikony tlačítek lišty">
 <!ENTITY Ctr_wincontrols	"Přesunutelné ovládací prvky okna v režimu celé obrazovky">
 <!ENTITY Ctr_puibuttonsep	"Oddělovač tlačítka menu">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Tlačítko menu záložek">
 <!ENTITY Ctr_hiderecentbm	"Záložky (bublina): skrýt posledně přidané záložky">
 <!ENTITY Ctr_hideeditbm		"Hvězdička záložek: skrýt bublinu (pokud stránka není v záložkách)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Popup: panel menu vzhledu">
 <!ENTITY Ctr_bmbunsortbm	"Popup: 'Netříděné záložky' v submenu">
 <!ENTITY Ctr_bmbunsortbm2	"Menu nad záložkami">
diff --git a/xpi/locale/da/options.dtd b/xpi/locale/da/options.dtd
index d6fd628..57a6537 100644
--- a/xpi/locale/da/options.dtd
+++ b/xpi/locale/da/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Højde">
 <!ENTITY Ctr_altoptionsi	"Det simulerede indstillinger-vindue er ikke længere en dialog men et 'browservindue' med alle værktøjslinjer skjult. Funktionen 'Anvend nuværende side' tilføjer kun url'er fra sider som er åbne i det nuværende vindue, hvilket i dette tilfælde kun er 'about:preferences'. Værktøjslinjeknappen 'indstillinger' erstattes af en ny en for at kunne åbne indstillinger i et vindue.">
 <!ENTITY Ctr_options_rem	"Husk senest valgte kategori">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"SVG-farver til standard værktøjslinje knap ikoner">
 <!ENTITY Ctr_wincontrols	"Flytbar fuldskærmsvindue kontrolelementer">
 <!ENTITY Ctr_puibuttonsep	"Menuknapseparator">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Bogmærker-menuknap">
 <!ENTITY Ctr_hiderecentbm	"Bogmærkers popup: skjul senest tilførte bogmærker">
 <!ENTITY Ctr_hideeditbm		"Bogmærkers stjerne: skjul popup (hvis side ikke er bogmærket)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Popup: panelmenu udseende">
 <!ENTITY Ctr_bmbunsortbm	"Popup: 'Usorterede bogmærker'-undermenu">
 <!ENTITY Ctr_bmbunsortbm2	"Menu over bogmærker">
diff --git a/xpi/locale/de/options.dtd b/xpi/locale/de/options.dtd
index 9c169bc..15c6e05 100644
--- a/xpi/locale/de/options.dtd
+++ b/xpi/locale/de/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Höhe:">
 <!ENTITY Ctr_altoptionsi	"Das simulierte Einstellungsfenster ist kein Dialogfenster mehr, sondern ein leistenloses normales Fenster. Die Leistenschaltfläche 'Einstellungen' wird durch 'Einstellungen (Fenster)' ersetzt. Diese Schaltfläche muss einmalig im Modus 'Anpassen' zur Menüleiste hinzugefügt werden.">
 <!ENTITY Ctr_options_rem	"Zuletzt besuchte Kategorie speichern">
+<!ENTITY Ctr_aboutpages		"Allgemeine 'about:'-Seiten: alternative Darstellung">
 <!ENTITY Ctr_svgfilters		"SVG-Farben für Symbole von 'Standard-Schaltflächen'">
 <!ENTITY Ctr_wincontrols	"Verschiebbare Fenster-Schaltflächen im Vollbildmodus">
 <!ENTITY Ctr_puibuttonsep	"Menüschaltfläche">
@@ -133,7 +134,7 @@
 <!ENTITY Ctr_puibut_r_sep	"Trennlinie rechts">
 <!ENTITY Ctr_html5warning	"HTML5-Vollbildwarnung">
 <!ENTITY Ctr_oldtoplevimg	"Klassische 'Bilddarstellung' auf weißem Hintergrund">
-<!ENTITY Ctr_altalertbox	"'Benachrichtigungs-Box': alternative Darstellung">
+<!ENTITY Ctr_altalertbox	"Benachrichtigungs-Box: alternative Darstellung">
 <!ENTITY Ctr_emptygfavico	"Allgemeines Lesezeichensymbol ersetzen">
 <!ENTITY Ctr_mstatusbar		"Statusbereich: sichtbar und verschiebbar">
 <!ENTITY Ctr_mstatusbars4e	"Statusbereich wird von 'Status-4-Evar' kontrolliert">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Lesezeichen-Menüschaltfläche">
 <!ENTITY Ctr_hiderecentbm	"Lesezeichen-Pop-up: zuletzt hinzugefügte Lesezeichen verstecken">
 <!ENTITY Ctr_hideeditbm		"Lesezeichen-Stern: Pop-up verstecken (wenn Seite noch kein Lesezeichen ist)">
+<!ENTITY Ctr_oldplacesbut	"Leisten-Lesezeichen: Alte Darstellung">
 <!ENTITY Ctr_bmbutpanelm	"Aufklappmenü: 'Panel'-Darstellung">
 <!ENTITY Ctr_bmbunsortbm	"Aufklappmenü: 'Weitere Lesezeichen'-Menü anzeigen">
 <!ENTITY Ctr_bmbunsortbm2	"Menü über den Lesezeichen">
diff --git a/xpi/locale/dsb/options.dtd b/xpi/locale/dsb/options.dtd
index 9855ba5..106d20c 100644
--- a/xpi/locale/dsb/options.dtd
+++ b/xpi/locale/dsb/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Wusokosć">
 <!ENTITY Ctr_altoptionsi	"Simulěrowane wokno nastajenjow wěcej njejo dialog, ale 'wobglědowakowe wokno', źož wšykne symbolowe rědki su schowane. Funkcija 'Aktualny bok wužywaś' pśidawa jano URL bokow, kótarež wócynjaju se w aktualnem woknje, kótarež jo w toś tom paźe 'about:preferences'. 'Tłocašk symboloweje rědki Nastajenja' wuměnja se pśez nowy, aby se nastajenja we woknje wócynili.">
 <!ENTITY Ctr_options_rem	"Kategoriju se spomnjeś, kótaraž jo se ako slědna wubrała">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"SVG-barwy za symbole tłocaškow symbolowych rědkow">
 <!ENTITY Ctr_wincontrols	"Pśesuwajobne wóźeńske elementy połneje wobrazowki">
 <!ENTITY Ctr_puibuttonsep	"Źěleńska smužka menijowego tłocaška">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Tłocašk menija cytańskich znamjenjow">
 <!ENTITY Ctr_hiderecentbm	"Wuskokujuce wokno cytańskich znamjenjow: Njedawno pśidany cytańske znamjenja schowaś">
 <!ENTITY Ctr_hideeditbm		"Gwězdku cytańskich znamjenjow: Wuskokujuce wokno schowaś (jolic bok njejo ako cytańske znamje skłaźony)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Wuskokujucy meni: Naglěd menijowego wuskokujucego wokna">
 <!ENTITY Ctr_bmbunsortbm	"Wuskokujucy meni: Meni 'Njesortěrowane cytańske znamjenja'">
 <!ENTITY Ctr_bmbunsortbm2	"Meni nad cytańskimi znamjenjami">
diff --git a/xpi/locale/el/options.dtd b/xpi/locale/el/options.dtd
index 6e5fb30..449b647 100644
--- a/xpi/locale/el/options.dtd
+++ b/xpi/locale/el/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Ύψος:">
 <!ENTITY Ctr_altoptionsi	"Το προσομοιωμένο παράθυρο επιλογών δεν είναι πια παράθυρο διαλόγου, αλλά ένα «παράθυρο περιηγητή» με όλες τις εργαλειοθήκες σε απόκρυψη. Το χαρακτηριστικό «Χρήση τρέχουσας σελίδας» προσθέτει μόνο τις διευθύνσεις URL των ανοιγμένων στο τρέχον παράθυρο σελίδων, που είναι μόνο «about:preferences» σε αυτή την περίπτωση. Το κουμπί εργαλειοθήκης «Επιλογές» αντικαθίσταται από ένα νέο, για να είναι δυνατόν το άνοιγμα επιλογών σε παράθυρο.">
 <!ENTITY Ctr_options_rem	"Απομνημόνευση τελευταία επιλεχθείσας κατηγορίας">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"Χρώματα SVG για προεπιλεγμένα εικονίδια κουμπιών εργαλειοθήκης">
 <!ENTITY Ctr_wincontrols	"Μετακινήσιμα στοιχεία ελέγχου παραθύρου σε προβολή πλήρους οθόνης">
 <!ENTITY Ctr_puibuttonsep	"Διαχωριστικό κουμπιού μενού">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Κουμπί-μενού σελιδοδεικτών">
 <!ENTITY Ctr_hiderecentbm	"Αναδυόμενο σελιδοδεικτών: απόκρυψη πρόσφατα προστεθέντων σελιδοδεικτών">
 <!ENTITY Ctr_hideeditbm		"Αστέρι σελιδοδεικτών: απόκρυψη αναδυόμενου (αν η σελίδα δεν είναι στους σελιδοδείκτες)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Αναδυόμενο: εμφάνιση ως μενού πίνακα">
 <!ENTITY Ctr_bmbunsortbm	"Αναδυόμενο: υπομενού «Αταξινόμητοι σελιδοδείκτες»">
 <!ENTITY Ctr_bmbunsortbm2	"Πάνω από τους σελιδοδείκτες">
diff --git a/xpi/locale/en-US/options.dtd b/xpi/locale/en-US/options.dtd
index 579af60..2a86ef5 100644
--- a/xpi/locale/en-US/options.dtd
+++ b/xpi/locale/en-US/options.dtd
@@ -125,8 +125,9 @@
 <!ENTITY Ctr_altoptionswh	"Height:">
 <!ENTITY Ctr_altoptionsi	"The simulated options window is not a dialog anymore but a 'browser window' with all toolbars hidden. The 'Use Current Page' feature only adds urls of pages opened in the current window, which is only 'about:preferences' in this case. The 'options toolbar button' gets replaced by a new one to be able to open options in a window.">
 <!ENTITY Ctr_options_rem	"Remember last selected category">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"SVG colors for default toolbar button icons">
-<!ENTITY Ctr_wincontrols	"Movable full screen window controls">
+<!ENTITY Ctr_wincontrols	"Movable window controls for full screen mode">
 <!ENTITY Ctr_puibuttonsep	"Menu button separator">
 <!ENTITY Ctr_puibut_no_sep	"Hidden">
 <!ENTITY Ctr_puibut_l_sep	"Left">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Bookmarks menu button">
 <!ENTITY Ctr_hiderecentbm	"Bookmarks popup: hide recently added bookmarks">
 <!ENTITY Ctr_hideeditbm		"Bookmarks star: hide popup (if page is not bookmarked)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Popup: panel menu appearance">
 <!ENTITY Ctr_bmbunsortbm	"Popup: 'Other Bookmarks' menu">
 <!ENTITY Ctr_bmbunsortbm2	"Menu above bookmarks">
diff --git a/xpi/locale/es/options.dtd b/xpi/locale/es/options.dtd
index 6816b17..c825a45 100644
--- a/xpi/locale/es/options.dtd
+++ b/xpi/locale/es/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Alto">
 <!ENTITY Ctr_altoptionsi	"La ventana simulada de opciones ya no es un cuadro de diálogo sino una 'ventana de navegador' con todas las barras de herramientas ocultas. La característica 'Usar página actual' como página de inicio sólo añade URLs de páginas abiertas en la ventana actual, que en este caso sólo es 'about:preferences'. El botón de barra de herramientas 'Opciones' se sustituye por uno nuevo para poder abrir las opciones en una ventana.">
 <!ENTITY Ctr_options_rem	"Recordar la última categoría seleccionada">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"Colores SVG para iconos predeterminados de botones de barra de herramientas">
 <!ENTITY Ctr_wincontrols	"Controles de ventana móviles en pantalla completa">
 <!ENTITY Ctr_puibuttonsep	"Posición del separador del botón de menú">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Botón de menú emergente de Marcadores">
 <!ENTITY Ctr_hiderecentbm	"Menú emergente de Marcadores: Ocultar marcadores añadidos recientemente">
 <!ENTITY Ctr_hideeditbm		"Estrella de marcadores: Ocultar panel emergente (si la página no está en marcadores)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Estilo de panel para el menú emergente ">
 <!ENTITY Ctr_bmbunsortbm	"Mostrar submenú 'Marcadores no ordenados'">
 <!ENTITY Ctr_bmbunsortbm2	"Menú por encima de los marcadores">
diff --git a/xpi/locale/et/options.dtd b/xpi/locale/et/options.dtd
index ddd36a0..7070ac4 100644
--- a/xpi/locale/et/options.dtd
+++ b/xpi/locale/et/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Kõrgus">
 <!ENTITY Ctr_altoptionsi	"Simuleeritud sätete aken ei ole enam dialoogiaken, vaid peidetud tööriistaribadega 'brauseri aken'. Säte 'Kasuta aktiivset veebilehte' lisab avalehtede hulka ainult aktiivses aknas avatud lehtede aadressid, mis on antud juhul ainult 'about:preferences'. Sätete nupp tööriistaribal asendatakse uuega, et sätteid saaks aknas avada.">
 <!ENTITY Ctr_options_rem	"Jäta meelde viimati valitud kategooria">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"Kasuta vaikimisi tööriistariba nuppude jaoks SVG-värve">
 <!ENTITY Ctr_wincontrols	"Liigutatavad akna juhtelemendid täisekraani režiimis">
 <!ENTITY Ctr_puibuttonsep	"Menüünupu eraldaja">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Järjehoidjate menüü nupp">
 <!ENTITY Ctr_hiderecentbm	"Järjehoidjate hüpik: peida viimati lisatud järjehoidjad">
 <!ENTITY Ctr_hideeditbm		"Järjehoidjate täht: peida hüpik (kui leht pole järjehoidjates)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Menüühüpik: paneelimenüü välimus">
 <!ENTITY Ctr_bmbunsortbm	"Menüühüpik: alammenüü 'Muud järjehoidjad'">
 <!ENTITY Ctr_bmbunsortbm2	"Menüü järjehoidjate kohal">
diff --git a/xpi/locale/fr/options.dtd b/xpi/locale/fr/options.dtd
index 4cfaa16..a74a9e9 100644
--- a/xpi/locale/fr/options.dtd
+++ b/xpi/locale/fr/options.dtd
@@ -99,7 +99,7 @@
 <!ENTITY Ctr_appbuttonc_cu	"De couleur personnalisée">
 <!ENTITY Ctr_appbuttonct	"Personnaliser la couleur du bouton s'il est sur une barre d'outils">
 <!ENTITY Ctr_appbuttonI1	"Redémarrage recommandé">
-<!ENTITY Ctr_appbuttonI1e	"Uniquement visible sur la barre de titre &brandShortName;, pas sur la barre de titre de Windows !">
+<!ENTITY Ctr_appbuttonI1e	"Uniquement visible sur la barre de titre de &brandShortName;, pas sur la barre de titre de Windows !">
 <!ENTITY Ctr_appbuttonI2	"Les couleurs du bouton sont visibles uniquement s'il est sur la barre de titre ou la barre des onglets !">
 <!ENTITY Ctr_appbutmhi		"Position plus élevée (sur la barre des onglets)">
 <!ENTITY Ctr_appbautocol	"Définir automatiquement la couleur du canal (par défaut/Aurora/Nightly) du navigateur">
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Hauteur :">
 <!ENTITY Ctr_altoptionsi	"La fenêtre simulée des options n'est plus une boite de dialogue mais une « fenêtre du navigateur » avec toutes les barres d'outils masquées. La fonctionnalité « Utiliser la page actuelle » ajoute seulement les URL des pages ouvertes dans la fenêtre actuelle, qui est uniquement « about:preferences » dans ce cas. Le bouton de barre d'outils « Options » est remplacé par un nouveau afin de pouvoir ouvrir les options dans une fenêtre.">
 <!ENTITY Ctr_options_rem	"Mémoriser la dernière catégorie sélectionnée">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"Couleurs SVG pour les icônes des boutons de barres d'outils par défaut">
 <!ENTITY Ctr_wincontrols	"Rendre mobiles les commandes de la fenêtre en plein écran">
 <!ENTITY Ctr_puibuttonsep	"Séparateur du bouton de menu :">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Bouton de menu des marque-pages">
 <!ENTITY Ctr_hiderecentbm	"Menu déroulant des marque-pages : masquer les marque-pages récemment ajoutés">
 <!ENTITY Ctr_hideeditbm		"Étoile des marque-pages : masquer le menu déroulant (si la page n'a pas été marquée)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Menu déroulant : apparence de menu de type « panneau »">
 <!ENTITY Ctr_bmbunsortbm	"Menu déroulant : menu « Autres marque-pages »">
 <!ENTITY Ctr_bmbunsortbm2	"Menu au-dessus des marque-pages">
@@ -209,9 +211,9 @@
 
 <!ENTITY Ctr_navthrobber1	"Cliquer sur l'indicateur d'activité ouvre l'URL suivante dans un nouvel onglet :">
 <!ENTITY Ctr_navthrobber2	"Saisir une URL ou bien laisser vide">
-<!ENTITY Ctr_anewtaburl		"URL de la page de nouvel onglet">
-<!ENTITY Ctr_anewtaburlcb	"Personnaliser l'URL (par défaut : « about:newtab ») :">
-<!ENTITY Ctr_anewtaburlpcb	"Custom private new tab page url (default: 'about:privatebrowsing')">
+<!ENTITY Ctr_anewtaburl		"URL de nouvel onglet et de page d'accueil privée">
+<!ENTITY Ctr_anewtaburlcb	"Modifier l'URL de nouvel onglet (« about:newtab » par défaut) :">
+<!ENTITY Ctr_anewtaburlpcb	"Modifier l'URL d'accueil de navigation privée (« about:privatebrowsing » par défaut) :">
 
 <!ENTITY Ctr_tab_tf_info1	"Les noms de couleurs, les codes hexadécimaux, les valeurs RVB(A) et TSL(A) sont pris en charge.">
 <!ENTITY Ctr_tab_tf_info2	"Les saisies ne seront pas vérifiées !">
@@ -275,9 +277,9 @@
 <!ENTITY Ctr_autocompl_rhl	"Utiliser des couleurs Aero pour les résultats surlignés">
 <!ENTITY Ctr_autocompl_sep	"Afficher un séparateur entre les résultats">
 <!ENTITY Ctr_lbsugresi		"Désactiver la limite de hauteur">
-<!ENTITY Ctr_cresultshcb	"Custom height limit: ">
+<!ENTITY Ctr_cresultshcb	"Limite de hauteur personnalisée :">
 <!ENTITY Ctr_lbsugres		"Nombre de résultats :">
-<!ENTITY Ctr_lbsbradius		"Rayon de bordure personnalisé pour la barre d'adresse et la barre de recherche">
+<!ENTITY Ctr_lbsbradius		"Personnaliser le rayon de bordure de la barre d'adresse et/ou de la barre de recherche">
 
 <!ENTITY Ctr_menubar_items	"Position des éléments de menu :">
 <!ENTITY Ctr_extrabar		"Barres d'outils supplémentaires">
@@ -374,8 +376,8 @@
 <!ENTITY Ctr_fx50findbarhl	"Décocher ces paramètres désactive les fonctionnalités avancées de surlignage de la barre de recherche.">
 <!ENTITY Ctr_e_flyweb		"FlyWeb">
 <!ENTITY Ctr_fx50flyweb		"Décocher ce paramètre désactive « FlyWeb ».">
-<!ENTITY Ctr_e_oneoffsearch	"Autocomplete popups search selection">
-<!ENTITY Ctr_fx51OOSeach	"Unchecking this preference removes location bar popups search selection.">
+<!ENTITY Ctr_e_oneoffsearch	"Sélection de recherche des fenêtres surgissantes d'autocomplétion">
+<!ENTITY Ctr_fx51OOSeach	"Décocher ce paramètre retire la sélection de recherche des fenêtres surgissantes de la barre de navigation.">
 
 
 <!ENTITY Ctr_pw_settings	"Paramètres">
@@ -402,7 +404,7 @@
 <!ENTITY goCmd.label					"Se rendre à la page indiquée dans la barre d'adresse">
 <!ENTITY Ctr_menu_restart.label			"Redémarrer">
 <!ENTITY Ctr_restartapp					"Afficher « Redémarrer » dans le menu « Fichier » et dans le menu de l'ancien bouton &brandShortName;">
-<!ENTITY Ctr_ctrnewinv					"Underline new options for current &brandShortName; version">
+<!ENTITY Ctr_ctrnewinv					"Souligner les nouvelles options de la version actuelle de &brandShortName;">
 
 <!ENTITY Ctr_openInCurrentTab			"Ouvrir les entrées dans l'onglet actuel">
 <!ENTITY Ctr_openInNewTab				"Ouvrir les entrées dans un nouvel onglet">
diff --git a/xpi/locale/hsb/options.dtd b/xpi/locale/hsb/options.dtd
index 20a2e56..20a7946 100644
--- a/xpi/locale/hsb/options.dtd
+++ b/xpi/locale/hsb/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Wysokosć">
 <!ENTITY Ctr_altoptionsi	"Simulowane wokno nastajenjow dialog hižo njeje, ale 'wobhladowakowe wokno', hdźež wšě symbolowe lajsty su schowane. Funkcija 'Aktualnu stronu wužiwać' přidawa jenož URL stronow, kotrež so w aktualnym woknje wočinjeja, kotrež je w tutym padźe jenož 'about:preferences'. 'Tłóčatko symboloweje lajsty Nastajenja' so přez nowe wuměnja, zo bychu so nastajenja we woknje wočinili.">
 <!ENTITY Ctr_options_rem	"Kategoriju sej spomjatkować, kotraž je so jako poslednja wubrała">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"SVG-barby za symbole standardnych tłóčatkow">
 <!ENTITY Ctr_wincontrols	"Přesuwajomne wodźenske elementy połneje wobrazowki">
 <!ENTITY Ctr_puibuttonsep	"Dźělatko menijoweho tłóčatka">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Tłóčatko menija zapołožkow">
 <!ENTITY Ctr_hiderecentbm	"Wuskakowace wokno zapołožkow: Njedawo přidate zapołožki schować">
 <!ENTITY Ctr_hideeditbm		"Hwěžka zapołožkow: Wuskakowace wokno schować (jeli strona jako zapołožka składowana njeje)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Wuskakowacy meni: Napohlad wuskakowaceho menija">
 <!ENTITY Ctr_bmbunsortbm	"Wuskakowacy meni: Meni 'Njesortěrowane zapołožki'">
 <!ENTITY Ctr_bmbunsortbm2	"Meni nad zapołožkami">
diff --git a/xpi/locale/it/options.dtd b/xpi/locale/it/options.dtd
index e8a48fd..e7c66e5 100644
--- a/xpi/locale/it/options.dtd
+++ b/xpi/locale/it/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Altezza">
 <!ENTITY Ctr_altoptionsi	"La finestra delle opzioni non si presenta più come un dialogo ma come una finestra del browser con tutte le barre degli strumenti nascoste. La caratteristica 'Usa la pagina corrente' aggiunge gli url delle pagine aperte nella finestra corrente, che in questo caso è solo 'about:preferences'. Il pulsante delle 'opzioni' è sostituito da uno nuovo che è in grado di aprire le opzioni in una finestra.">
 <!ENTITY Ctr_options_rem	"Ricorda l'ultima categoria selezionata">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"Colori SVG per le icone dei pulsanti della barra strumenti">
 <!ENTITY Ctr_wincontrols	"Angoli finestra mobili in modalità schermo intero">
 <!ENTITY Ctr_puibuttonsep	"Separatore del pulsante Menu">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Menu del pulsante segnalibri">
 <!ENTITY Ctr_hiderecentbm	"Popup segnalibri: nascondi i segnalibri aggiunti di recente">
 <!ENTITY Ctr_hideeditbm		"Stella dei segnalibri: nascondi popup (se la pagina non è nei segnalibri)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Aspetto del menu a pannello">
 <!ENTITY Ctr_bmbunsortbm	"Menu dei 'Segnalibri non catalogati'">
 <!ENTITY Ctr_bmbunsortbm2	"Menu above bookmarks">
diff --git a/xpi/locale/ja/options.dtd b/xpi/locale/ja/options.dtd
index 95dbcf0..878a60e 100644
--- a/xpi/locale/ja/options.dtd
+++ b/xpi/locale/ja/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"高さ:">
 <!ENTITY Ctr_altoptionsi	"オプションウィンドウは、すべてのツールバーが隠されたブラウザウィンドウであり、ダイアログではありません。このウィンドウを開いて「現在のページを使用」機能を使用すると、オプションウィンドウの URL(about:preferences) が追加されます。オプションツールバーボタンは、オプションウィンドウを開けるように新しいものに置き換えられます。">
 <!ENTITY Ctr_options_rem	"最後に開いたカテゴリを記憶する">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"デフォルトのツールバーボタンのアイコンを SVG カラーにする">
 <!ENTITY Ctr_wincontrols	"フルスクリーン用ウィンドウ制御ボタンを移動可能にする">
 <!ENTITY Ctr_puibuttonsep	"メニューボタンパネルのセパレーター">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"ブックマークメニューボタン">
 <!ENTITY Ctr_hiderecentbm	"ブックマークポップアップ: 「最近ブックマークしたページ」を隠す">
 <!ENTITY Ctr_hideeditbm		"ブックマークスター: ポップアップを隠す (ページがブックマークされていない場合)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"ポップアップ: パネルメニューで表示する">
 <!ENTITY Ctr_bmbunsortbm	"ポップアップ: 未整理のブックマークをメニューとして表示">
 <!ENTITY Ctr_bmbunsortbm2	"メニュー上部に表示">
@@ -275,7 +277,7 @@
 <!ENTITY Ctr_autocompl_sep	"結果を境界線で区切る">
 <!ENTITY Ctr_urlbar_uc		"検索候補機能を統合しない">
 <!ENTITY Ctr_lbsugresi		"候補数を制限しない">
-<!ENTITY Ctr_cresultshcb	"Custom height limit: ">
+<!ENTITY Ctr_cresultshcb	"リストの高さを制限する: ">
 <!ENTITY Ctr_lbsugres		"候補の表示数">
 <!ENTITY Ctr_lbsbradius		"ロケーションバーと検索バーの枠線の角の丸みを設定する">
 
@@ -374,8 +376,8 @@
 <!ENTITY Ctr_fx50findbarhl	"この設定をオフにすると、検索バーのハイライト機能を無効にします。">
 <!ENTITY Ctr_e_flyweb		"FlyWeb">
 <!ENTITY Ctr_fx50flyweb		"この設定をオフにすると、FlyWeb を無効にします。">
-<!ENTITY Ctr_e_oneoffsearch	"Autocomplete popups search selection">
-<!ENTITY Ctr_fx51OOSeach	"Unchecking this preference removes location bar popups search selection.">
+<!ENTITY Ctr_e_oneoffsearch	"自動補完候補リストの検索エンジン">
+<!ENTITY Ctr_fx51OOSeach	"この設定をオフにすると、ロケーションバーの自動補完候補リストに検索エンジンを表示しません。">
 
 
 <!ENTITY Ctr_pw_settings	"設定">
diff --git a/xpi/locale/pl/options.dtd b/xpi/locale/pl/options.dtd
index 549b75f..216c74f 100644
--- a/xpi/locale/pl/options.dtd
+++ b/xpi/locale/pl/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Wysokość">
 <!ENTITY Ctr_altoptionsi	"Symulowane okno opcji nie jest już oknem dialogowym, ale 'oknem przeglądarki' z ukrytymi wszystkimi paskami narzędzi. Funkcja 'Użyj bieżących stron' dodaje tylko adresy stron otwartych w bieżącym oknie, w tym przypadku tylko 'about:preferences'. 'Przycisk opcji paska narzędzi' zostaje zastąpiony nowym, aby mógł otwierać opcje w oknie.">
 <!ENTITY Ctr_options_rem	"Pamiętaj ostatnio wybraną kategorię">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"Kolory SVG ikon przycisków domyślnego paska narzędzi">
 <!ENTITY Ctr_wincontrols	"Ruchome kontrolki okna pełnego ekranu">
 <!ENTITY Ctr_puibuttonsep	"Separator przycisku menu">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Przycisk menu zakładek">
 <!ENTITY Ctr_hiderecentbm	"Menu podręczne zakładek: ukryj ostatnio dodane zakładki">
 <!ENTITY Ctr_hideeditbm		"Gwiazdka zakładek: ukryj menu podręczne (jeżeli zakładka nie jest dodana do strony)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Menu podręczne: wygląd menu panelu">
 <!ENTITY Ctr_bmbunsortbm	"Menu podręczne: podmenu 'Pozostałe zakładki'">
 <!ENTITY Ctr_bmbunsortbm2	"Menu ponad zakładkami">
diff --git a/xpi/locale/pt-BR/options.dtd b/xpi/locale/pt-BR/options.dtd
index 37a7614..8f79aea 100644
--- a/xpi/locale/pt-BR/options.dtd
+++ b/xpi/locale/pt-BR/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Altura">
 <!ENTITY Ctr_altoptionsi	"A janela de opções simulada não é mais um diálogo, mas uma 'janela do navegador' com todas as barras de ferramentas ocultadas. O recurso 'Usar página atual' somente adicionas URLs de páginas abertas na janela atual, que é somente 'about:preferences' neste caso. O botão 'Opções' na barra de ferramentas foi substituída por uma nova para ser possível abrir as opções em uma janela.">
 <!ENTITY Ctr_options_rem	"Lembrar última categoria selecionada">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"Cores sVG para os ícones dos botões da barra de ferramentas padrão">
 <!ENTITY Ctr_wincontrols	"Controles móveis da janela em tela cheia">
 <!ENTITY Ctr_puibuttonsep	"Separador de botões do menu">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Botão do menu de favoritos">
 <!ENTITY Ctr_hiderecentbm	"Popup de favoritos: ocultar favoritos adicionados recentemente">
 <!ENTITY Ctr_hideeditbm		"Estrela de favoritos: ocultar popup (se a página não está nos favoritos)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Popup: aparência do menu do painel">
 <!ENTITY Ctr_bmbunsortbm	"Popup: menu 'outros favoritos'">
 <!ENTITY Ctr_bmbunsortbm2	"Menu acima dos favoritos">
diff --git a/xpi/locale/ru/options.dtd b/xpi/locale/ru/options.dtd
index 3455f74..57cb391 100644
--- a/xpi/locale/ru/options.dtd
+++ b/xpi/locale/ru/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Высота">
 <!ENTITY Ctr_altoptionsi	"Окно настроек больше не является диалогом, теперь это «Окно браузера», в котором скрыты все панели инструментов. Опция «Использовать текущие страницы» добавляет только URL-адреса открытые в текущем окне, в данном случае 'about:preferences'. Кнопка «Настройки» на панели инструментов заменяется на новую, чтобы позволить открывать параметры в окне.">
 <!ENTITY Ctr_options_rem	"Запоминать последнюю выбранную категорию">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"SVG цвета для стандартных значков панели инструментов">
 <!ENTITY Ctr_wincontrols	"Подвижное управление полноэкранным режимом">
 <!ENTITY Ctr_puibuttonsep	"Разделитель кнопки меню">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Кнопка меню закладок">
 <!ENTITY Ctr_hiderecentbm	"Всплывающее меню: скрыть недавно добавленные закладки">
 <!ENTITY Ctr_hideeditbm		"Звездочка закладок: скрыть всплывающее окно (если страница не в закладках)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Всплывающее меню: вид панели меню">
 <!ENTITY Ctr_bmbunsortbm	"Всплывающее меню: подменю «Неподшитые закладки»">
 <!ENTITY Ctr_bmbunsortbm2	"Меню над закладками">
diff --git a/xpi/locale/sl/options.dtd b/xpi/locale/sl/options.dtd
index d0ccf62..3c23177 100644
--- a/xpi/locale/sl/options.dtd
+++ b/xpi/locale/sl/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Višina">
 <!ENTITY Ctr_altoptionsi	"Simulirano okno možnosti ni več pogovorno okno, ampak 'okno brskalnika' s skritimi orodnimi vrsticami. Značilnost 'Uporabi trenutno stran' samo doda v trenutnem oknu odprte URL-je strani, ki je v tem primeru samo 'about:preferences'. Gumb orodne vrstice 'možnosti' se nadomesti z novim, da se lahko možnosti odprejo v oknu.">
 <!ENTITY Ctr_options_rem	"Zapomni si nazadnje izbrano kategorijo">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"Barve SVG za privzete ikone gumbov orodne vrstice">
 <!ENTITY Ctr_wincontrols	"Premakljive nadzorne tipke celozaslonskega okna">
 <!ENTITY Ctr_puibuttonsep	"Ločilo menijskega gumba">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Gumb menija zaznamkov">
 <!ENTITY Ctr_hiderecentbm	"Pojavno okno zaznamkov: skrij nedavno dodane zaznamke">
 <!ENTITY Ctr_hideeditbm		"Zvezdica za zaznamke: skrij pojavno okno (če stran ni dodana med zaznamke)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Pojavna okna: videz ploščastega menija">
 <!ENTITY Ctr_bmbunsortbm	"Pojavna okna: podmeni 'Nerazvrščeni zaznamki'">
 <!ENTITY Ctr_bmbunsortbm2	"Meni nad zaznamki">
diff --git a/xpi/locale/uk/options.dtd b/xpi/locale/uk/options.dtd
index e02da6e..cc4a3fa 100644
--- a/xpi/locale/uk/options.dtd
+++ b/xpi/locale/uk/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"Висота">
 <!ENTITY Ctr_altoptionsi	"Вікно змодельованих параметрів не є більше діалогом, але «вікно браузера» з усіма панелями інструментів приховані. Функція «Використовувати поточну сторінку» тільки додає URL-адреси сторінок, відкритих в поточному вікні, які є тільки «about:preferences» в цьому випадку. Кнопка «Параметри» панелі інструментів замінюється на нову, щоб бути в змозі відкрити параметри у вікні.">
 <!ENTITY Ctr_options_rem	"Пам’ятати останню обрану категорію">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"SVG кольори для типових іконок кнопок панелі інструментів">
 <!ENTITY Ctr_wincontrols	"Рухоме управління повноекранним режимом">
 <!ENTITY Ctr_puibuttonsep	"Розділювач кнопки меню">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"Кнопка меню закладок">
 <!ENTITY Ctr_hiderecentbm	"Спливаюче вікно закладок: приховати недавно додані закладки">
 <!ENTITY Ctr_hideeditbm		"Зірка закладок: приховати спливаюче вікно (якщо сторінка не закладена)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"Спливаюче вікно: вигляд меню панелі">
 <!ENTITY Ctr_bmbunsortbm	"Спливаюче вікно: субменю «несортованих закладок»">
 <!ENTITY Ctr_bmbunsortbm2	"Меню над закладками">
diff --git a/xpi/locale/zh-CN/options.dtd b/xpi/locale/zh-CN/options.dtd
index 3ad35c8..231aa74 100644
--- a/xpi/locale/zh-CN/options.dtd
+++ b/xpi/locale/zh-CN/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"高度">
 <!ENTITY Ctr_altoptionsi	"模拟的选项窗口再也不是一个对话框，而是一个隐藏所有工具栏的“浏览器窗口”。“使用当前页面”功能仅添加在已在当前窗口打开的页面地址，在这种情况下只是“about:preferences”选项。 “选项”工具栏图标被替换为新的，以便于在窗口中打开选项。">
 <!ENTITY Ctr_options_rem	"记住最后选中的分类">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"默认工具栏图标使用的SVG颜色">
 <!ENTITY Ctr_wincontrols	"全屏窗口控制按钮可以移动">
 <!ENTITY Ctr_puibuttonsep	"菜单按钮分隔符">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"书签菜单按钮">
 <!ENTITY Ctr_hiderecentbm	"书签弹出菜单: 隐藏最近添加的书签">
 <!ENTITY Ctr_hideeditbm		"书签星星图标: 隐藏弹出菜单(如果页面未添加到书签)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"弹出式菜单: 面板式菜单外观">
 <!ENTITY Ctr_bmbunsortbm	"弹出式菜单: “未分类书签”子菜单">
 <!ENTITY Ctr_bmbunsortbm2	"菜单在书签之上">
diff --git a/xpi/locale/zh-TW/options.dtd b/xpi/locale/zh-TW/options.dtd
index 8b5aa8f..79cd718 100644
--- a/xpi/locale/zh-TW/options.dtd
+++ b/xpi/locale/zh-TW/options.dtd
@@ -125,6 +125,7 @@
 <!ENTITY Ctr_altoptionswh	"高度">
 <!ENTITY Ctr_altoptionsi	"本套件模擬選項視窗將會是一個隱藏所有工具列的「瀏覽器視窗」。 若你在 [選項視窗]/[一般]/[首頁] 的設定頁內按下「使用目前頁面」按鈕，會將首頁網址設定變更為「about:preferences」，而非主瀏覽視窗的所有分頁。本套件會新增一個工具列按鈕，名為「選項(視窗)」，若你是第一次開啟本設定的話，可以在介面自訂模式中找到該按鈕。">
 <!ENTITY Ctr_options_rem	"記住上次選擇的選項分頁">
+<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
 <!ENTITY Ctr_svgfilters		"改變預設工具列按鈕圖示顏色">
 <!ENTITY Ctr_wincontrols	"可移動的全螢幕視窗控制項">
 <!ENTITY Ctr_puibuttonsep	"Menu button separator">
@@ -186,6 +187,7 @@
 <!ENTITY Ctr_bmbutton		"書籤選單按鈕">
 <!ENTITY Ctr_hiderecentbm	"Bookmarks popup: hide recently added bookmarks">
 <!ENTITY Ctr_hideeditbm		"Bookmarks star: hide popup (if page is not bookmarked)">
+<!ENTITY Ctr_oldplacesbut	"Bookmarks on toolbar: old appearance">
 <!ENTITY Ctr_bmbutpanelm	"彈出式書籤選單: 書籤選單使用和面板選單同風格的外觀">
 <!ENTITY Ctr_bmbunsortbm	"彈出式書籤選單: 「未排序書籤」項目附加子選單">
 <!ENTITY Ctr_bmbunsortbm2	"Menu above bookmarks">