1.5.9beta1

<b>[fix(es)]</b>
- Fx51+ & customizing mode: missing icons and wrong icon colors
- Fx51+ & big icon mode: missing icons and wrong icon colors
- Fx51+ & Location bar (3) > Autocomplete popup > 'Alt. appearance': key
event issues
- Win10 & tabs not on top v2: caption buttons glitch

21 files changed, 219 insertions, 38 deletions

diff --git a/xpi/content/css/alt_autocomplete.css b/xpi/content/css/alt_autocomplete.css
index b71d89e..3628eef 100644
--- a/xpi/content/css/alt_autocomplete.css
+++ b/xpi/content/css/alt_autocomplete.css
@@ -27,6 +27,7 @@
 	  -moz-binding: url("chrome://classic_theme_restorer/content/urlbarBindings51.xml#autocomplete-richlistitem") !important;
 	}
 
+	/* restyle popup items */
 	panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem,
 	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem {
 	  -moz-box-orient: vertical !important;
diff --git a/xpi/content/css/autocompl_no_title2.css b/xpi/content/css/autocompl_no_title2.css
index 3f304ac..4afe8e2 100644
--- a/xpi/content/css/autocompl_no_title2.css
+++ b/xpi/content/css/autocompl_no_title2.css
@@ -14,7 +14,7 @@
 	#main-window[fx50plus="true"] #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] {
 	  -moz-binding: url("chrome://classic_theme_restorer/content/urlbarBindings51.xml#urlbar-rich-result-popup") !important;
 	}
-
+	
 	panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem:not(:-moz-any([collapse="true"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"])) .ac-title,
 	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not(:-moz-any([collapse="true"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"])) .ac-title,
 	panel[type="autocomplete-richlistbox"]:not(#PopupAutoComplete) .autocomplete-richlistitem:not([collapse="true"]) .ac-separator,
diff --git a/xpi/content/css/linux/mode_icons_big_extra.css b/xpi/content/css/linux/mode_icons_big_extra.css
index f06f0f3..7355beb 100644
--- a/xpi/content/css/linux/mode_icons_big_extra.css
+++ b/xpi/content/css/linux/mode_icons_big_extra.css
@@ -6,6 +6,10 @@
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
 	
+	#main-window[fx51plus="true"] #nav-bar :-moz-any(#back-button, #forward-button)[cui-areatype="toolbar"] {
+	  list-style-image: url(chrome://browser/skin/menuPanel.svg) !important;
+	}
+	
 	#nav-bar #back-button:not(:hover) > .toolbarbutton-icon,
 	#nav-bar #forward-button:not(:hover) > .toolbarbutton-icon,
 	#nav-bar #back-button:hover[disabled] > .toolbarbutton-icon,
@@ -64,13 +68,22 @@
 	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3.png) !important;
 	}
-
+	#main-window[fx51plus="true"] #nav-bar #forward-button{
+	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3_2.png) !important;
+	}
+	
 	/* prevents small button mode from altering image region */
 	#nav-bar #urlbar-container #back-button:not([cui-areatype="menu-panel"]),
 	#nav-bar #back-button{
 	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3.png) !important;
 	}
+	#main-window[fx51plus="true"] #nav-bar #urlbar-container #back-button:not([cui-areatype="menu-panel"]),
+	#main-window[fx51plus="true"] #nav-bar #back-button{
+	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3_2.png) !important;
+	}
 
 	/* remove back/forward buttons clipping */
 	#nav-bar * {
diff --git a/xpi/content/css/mode_icons_big.css b/xpi/content/css/mode_icons_big.css
index c2bf3cf..d008004 100644
--- a/xpi/content/css/mode_icons_big.css
+++ b/xpi/content/css/mode_icons_big.css
@@ -7,7 +7,7 @@
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
 	
-	#main-window[fx52plus="true"] #nav-bar :-moz-any(#home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #ctraddon_preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button,#e10s-button,#panic-button,#web-apps-button)[cui-areatype="toolbar"] {
+	#main-window[fx51plus="true"] #nav-bar :-moz-any(#home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #ctraddon_preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button,#e10s-button,#panic-button,#web-apps-button)[cui-areatype="toolbar"] {
 	  list-style-image: url(chrome://browser/skin/menuPanel.svg) !important;
 	}
 	
@@ -16,11 +16,22 @@
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3.png) !important;
 	}
 	
+	#main-window[fx51plus="true"] #nav-bar #ctraddon_back-button > .toolbarbutton-icon{
+	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3_2.png) !important;
+	}
+	
 	#nav-bar #ctraddon_go-button > .toolbarbutton-icon,
 	#nav-bar #ctraddon_forward-button > .toolbarbutton-icon{
 	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3.png) !important;
 	}
+	
+	#main-window[fx51plus="true"] #nav-bar #ctraddon_go-button > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] #nav-bar #ctraddon_forward-button > .toolbarbutton-icon{
+	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3_2.png) !important;
+	}
 
 	#nav-bar #home-button[cui-areatype="toolbar"] {
 	  -moz-image-region: rect(0px, 128px, 32px, 96px) !important;
@@ -64,7 +75,7 @@
 					0, 256, 32, 224) center no-repeat !important;
 	}
 	
-	#main-window[fx52plus="true"] #nav-bar #downloads-indicator-icon {
+	#main-window[fx51plus="true"] #nav-bar #downloads-indicator-icon {
 	  width:32px !important;
 	  height:32px !important;
 	  background: -moz-image-rect(url("chrome://browser/skin/menuPanel.svg"),
@@ -144,57 +155,106 @@
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/appbutton_menuPanel.png) !important;
 	}
 	
+	#main-window[fx51plus="true"] #nav-bar #ctraddon_appbutton > .toolbarbutton-icon{
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/appbutton_menuPanel_2.png) !important;
+	}
+
 	#nav-bar #PanelUI-menu-button {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2.png") !important;
 	  -moz-image-region: rect(0px, 32px, 32px, 0px) !important;
 	}
+	
+	#main-window[fx51plus="true"] #nav-bar #PanelUI-menu-button {
+	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2_2.png") !important;
+	  -moz-image-region: rect(0px, 32px, 32px, 0px) !important;
+	}
 
 	#nav-bar #cut-button {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2.png") !important;
 	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
 	}
 
+	#main-window[fx51plus="true"] #nav-bar #cut-button {
+	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2_2.png") !important;
+	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
+	}
+
 	#nav-bar #copy-button {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2.png") !important;
 	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
 	}
+	
+	#main-window[fx51plus="true"] #nav-bar #copy-button {
+	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2_2.png") !important;
+	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
+	}
 
 	#nav-bar #paste-button {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2.png") !important;
 	  -moz-image-region: rect(0px, 128px, 32px, 96px) !important;
 	}
 
+	#main-window[fx51plus="true"] #nav-bar #paste-button {
+	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2_2.png") !important;
+	  -moz-image-region: rect(0px, 128px, 32px, 96px) !important;
+	}
+
 	#nav-bar #zoom-out-button {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2.png") !important;
 	  -moz-image-region: rect(0px, 160px, 32px, 128px) !important;
 	}
+	
+	#main-window[fx51plus="true"] #nav-bar #zoom-out-button {
+	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2_2.png") !important;
+	  -moz-image-region: rect(0px, 160px, 32px, 128px) !important;
+	}
 
 	#nav-bar #zoom-in-button {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2.png") !important;
 	  -moz-image-region: rect(0px, 192px, 32px, 160px) !important;
 	}
 
+	#main-window[fx51plus="true"] #nav-bar #zoom-in-button {
+	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2_2.png") !important;
+	  -moz-image-region: rect(0px, 192px, 32px, 160px) !important;
+	}
+
 	#nav-bar #webrtc-status-button {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2.png") !important;
 	  -moz-image-region: rect(0px, 224px, 32px, 192px) !important;
 	}
+	
+	#main-window[fx51plus="true"] #nav-bar #webrtc-status-button {
+	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2_2.png") !important;
+	  -moz-image-region: rect(0px, 224px, 32px, 192px) !important;
+	}
 
 	#nav-bar-overflow-button {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2.png") !important;
 	  -moz-image-region: rect(0px, 256px, 32px, 224px) !important;
 	}
+
+	#main-window[fx51plus="true"] #nav-bar-overflow-button {
+	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2_2.png") !important;
+	  -moz-image-region: rect(0px, 256px, 32px, 224px) !important;
+	}
 	
 	#nav-bar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2.png") !important;
 	  -moz-image-region: rect(0px, 288px, 32px, 256px) !important;
 	}
+	
+	#main-window[fx51plus="true"] #nav-bar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+	  list-style-image: url("chrome://classic_theme_restorer/content/images/menuPanel2_2.png") !important;
+	  -moz-image-region: rect(0px, 288px, 32px, 256px) !important;
+	}
 
 	#nav-bar #pocket-button[cui-areatype="toolbar"] {
 	  list-style-image: url("chrome://browser/skin/menuPanel.png") !important;
 	  -moz-image-region: rect(0px, 992px, 32px, 960px) !important;
 	}
 	
-	#main-window[fx52plus="true"] #nav-bar #pocket-button[cui-areatype="toolbar"] {
+	#main-window[fx51plus="true"] #nav-bar #pocket-button[cui-areatype="toolbar"] {
 	  list-style-image: url("chrome://browser/skin/menuPanel.svg") !important;
 	  -moz-image-region: rect(0px, 992px, 32px, 960px) !important;
 	}
@@ -207,9 +267,9 @@
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
 	
-	#main-window[fx52plus="true"] #nav-bar #tabview-button[cui-areatype="toolbar"],
-	#main-window[fx52plus="true"] #tabview-button[cui-areatype="menu-panel"],
-	#main-window[fx52plus="true"] toolbarpaletteitem[place="palette"] > #tabview-button {
+	#main-window[fx51plus="true"] #nav-bar #tabview-button[cui-areatype="toolbar"],
+	#main-window[fx51plus="true"] #tabview-button[cui-areatype="menu-panel"],
+	#main-window[fx51plus="true"] toolbarpaletteitem[place="palette"] > #tabview-button {
 	  -moz-image-region: rect(0px, 608px, 32px, 576px) !important;
 	  list-style-image: url(chrome://browser/skin/menuPanel.svg) !important;
 	}
@@ -220,7 +280,7 @@
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
 	
-	#main-window[fx52plus="true"] #ctraddon_stop-button > .toolbarbutton-icon{
+	#main-window[fx51plus="true"] #ctraddon_stop-button > .toolbarbutton-icon{
 	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
 	  list-style-image: url(chrome://browser/skin/menuPanel.svg) !important;
 	}
@@ -230,7 +290,7 @@
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
 	
-	#main-window[fx52plus="true"] #ctraddon_reload-button > .toolbarbutton-icon{
+	#main-window[fx51plus="true"] #ctraddon_reload-button > .toolbarbutton-icon{
 	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
 	  list-style-image: url(chrome://browser/skin/menuPanel.svg) !important;
 	}
@@ -243,19 +303,35 @@
 	  -moz-image-region: rect(0px, 32px, 32px, 0px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/history_sidebar.png) !important;
 	}
+	#main-window[fx51plus="true"] #nav-bar #ctraddon_history-button > .toolbarbutton-icon{
+	  -moz-image-region: rect(0px, 32px, 32px, 0px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/history_sidebar_2.png) !important;
+	}
 	#nav-bar #ctraddon_history-menu-toolbar-button > .toolbarbutton-icon {
 	  -moz-image-region: rect(0px, 32px, 32px, 0px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/history_menu.png) !important;
 	}
+	#main-window[fx51plus="true"] #nav-bar #ctraddon_history-menu-toolbar-button > .toolbarbutton-icon {
+	  -moz-image-region: rect(0px, 32px, 32px, 0px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/history_menu_2.png) !important;
+	}
 	/* star icon instead of old bookmarks icon */
 	#nav-bar #ctraddon_bookmarks-menu-toolbar-button > .toolbarbutton-icon{
 	  -moz-image-region: rect(0px, 32px, 32px, 0px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/bookmarks_menu.png) !important;
 	}
+	#main-window[fx51plus="true"] #nav-bar #ctraddon_bookmarks-menu-toolbar-button > .toolbarbutton-icon{
+	  -moz-image-region: rect(0px, 32px, 32px, 0px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/bookmarks_menu_2.png) !important;
+	}
 	#nav-bar #ctraddon_bookmarks-button > .toolbarbutton-icon{
 	  -moz-image-region: rect(0px, 32px, 32px, 0px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/bookmarks_sidebar.png) !important;
 	}
+	#main-window[fx51plus="true"] #nav-bar #ctraddon_bookmarks-button > .toolbarbutton-icon{
+	  -moz-image-region: rect(0px, 32px, 32px, 0px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/bookmarks_sidebar_2.png) !important;
+	}
 	
 	/*call button*/
 	#nav-bar toolbarbutton[id^="loop-"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack image{
diff --git a/xpi/content/css/panelmenucolor.css b/xpi/content/css/panelmenucolor.css
index d02c0bc..55af0fb 100644
--- a/xpi/content/css/panelmenucolor.css
+++ b/xpi/content/css/panelmenucolor.css
@@ -5,7 +5,9 @@
 	.panel-subviews,
 	#BMB_bookmarksPopup menupopup box,
 	#ctraddon_BMB_bookmarksPopup[panelopen="true"] menupopup[placespopup=true] > hbox,
-	#ctraddon_BMB_bookmarksPopup[panelopen="true"] #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
+	#ctraddon_BMB_bookmarksPopup[panelopen="true"] #ctraddon_BMB_subscribeToPageSubmenuMenupopup,
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup[panelopen="true"] menupopup[placespopup=true] > hbox,
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup[panelopen="true"] #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
 	  background: linear-gradient(white, -moz-dialog 30px) !important;    
 	}
 }
\ No newline at end of file
diff --git a/xpi/content/css/tabsontop_off2.css b/xpi/content/css/tabsontop_off2.css
index 508a995..924b31c 100644
--- a/xpi/content/css/tabsontop_off2.css
+++ b/xpi/content/css/tabsontop_off2.css
@@ -72,10 +72,5 @@
 	  box-shadow: none !important;
 	  border: none !important;
 	}
-	
-	/* force min/max/close to be accessible*/
-	#titlebar-buttonbox {
-	  z-index: 99999 !important;
-	}
 
 }
\ No newline at end of file
diff --git a/xpi/content/css/win8/mode_icons_big_extra.css b/xpi/content/css/win8/mode_icons_big_extra.css
index ae4900d..040f2b1 100644
--- a/xpi/content/css/win8/mode_icons_big_extra.css
+++ b/xpi/content/css/win8/mode_icons_big_extra.css
@@ -6,6 +6,10 @@
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
 	
+	#main-window[fx51plus="true"] #nav-bar :-moz-any(#back-button, #forward-button)[cui-areatype="toolbar"] {
+	  list-style-image: url(chrome://browser/skin/menuPanel.svg) !important;
+	}
+	
 	#nav-bar #back-button:not(:hover) > .toolbarbutton-icon,
 	#nav-bar #forward-button:not(:hover) > .toolbarbutton-icon,
 	#nav-bar #back-button:hover[disabled] > .toolbarbutton-icon,
@@ -74,18 +78,27 @@
 	  }
 	}
 	
-	
 	#nav-bar #forward-button{
 	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3.png) !important;
 	}
-
+	#main-window[fx51plus="true"] #nav-bar #forward-button{
+	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3_2.png) !important;
+	}
+	
 	/* prevents small button mode from altering image region */
 	#nav-bar #urlbar-container #back-button:not([cui-areatype="menu-panel"]),
 	#nav-bar #back-button{
 	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3.png) !important;
 	}
+	#main-window[fx51plus="true"] #nav-bar #urlbar-container #back-button:not([cui-areatype="menu-panel"]),
+	#main-window[fx51plus="true"] #nav-bar #back-button{
+	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3_2.png) !important;
+	}ist-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3.png) !important;
+	}
 
 	/* remove back/forward buttons clipping */
 	#nav-bar * {
diff --git a/xpi/content/css/winaero/mode_icons_big_extra.css b/xpi/content/css/winaero/mode_icons_big_extra.css
index 201a465..ede0627 100644
--- a/xpi/content/css/winaero/mode_icons_big_extra.css
+++ b/xpi/content/css/winaero/mode_icons_big_extra.css
@@ -5,6 +5,10 @@
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
 	
+	#main-window[fx51plus="true"] #nav-bar :-moz-any(#back-button, #forward-button)[cui-areatype="toolbar"] {
+	  list-style-image: url(chrome://browser/skin/menuPanel.svg) !important;
+	}
+	
 	#nav-bar #back-button:not(:hover) > .toolbarbutton-icon,
 	#nav-bar #forward-button:not(:hover) > .toolbarbutton-icon,
 	#nav-bar #back-button:hover[disabled] > .toolbarbutton-icon,
@@ -63,13 +67,22 @@
 	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3.png) !important;
 	}
-
+	#main-window[fx51plus="true"] #nav-bar #forward-button{
+	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3_2.png) !important;
+	}
+	
 	/* prevents small button mode from altering image region */
 	#nav-bar #urlbar-container #back-button:not([cui-areatype="menu-panel"]),
 	#nav-bar #back-button{
 	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3.png) !important;
 	}
+	#main-window[fx51plus="true"] #nav-bar #urlbar-container #back-button:not([cui-areatype="menu-panel"]),
+	#main-window[fx51plus="true"] #nav-bar #back-button{
+	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3_2.png) !important;
+	}
 
 	/* remove back/forward buttons clipping */
 	#nav-bar * {
diff --git a/xpi/content/css/winxp/mode_icons_big_extra.css b/xpi/content/css/winxp/mode_icons_big_extra.css
index 6143ade..4f180a4 100644
--- a/xpi/content/css/winxp/mode_icons_big_extra.css
+++ b/xpi/content/css/winxp/mode_icons_big_extra.css
@@ -5,6 +5,10 @@
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
 	
+	#main-window[fx51plus="true"] #nav-bar :-moz-any(#back-button, #forward-button)[cui-areatype="toolbar"] {
+	  list-style-image: url(chrome://browser/skin/menuPanel.svg) !important;
+	}
+	
 	#nav-bar #back-button:not(:hover) > .toolbarbutton-icon,
 	#nav-bar #forward-button:not(:hover) > .toolbarbutton-icon,
 	#nav-bar #back-button:hover[disabled] > .toolbarbutton-icon,
@@ -63,13 +67,22 @@
 	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3.png) !important;
 	}
-
+	#main-window[fx51plus="true"] #nav-bar #forward-button{
+	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3_2.png) !important;
+	}
+	
 	/* prevents small button mode from altering image region */
 	#nav-bar #urlbar-container #back-button:not([cui-areatype="menu-panel"]),
 	#nav-bar #back-button{
 	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3.png) !important;
 	}
+	#main-window[fx51plus="true"] #nav-bar #urlbar-container #back-button:not([cui-areatype="menu-panel"]),
+	#main-window[fx51plus="true"] #nav-bar #back-button{
+	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3_2.png) !important;
+	}
 
 	/* remove back/forward buttons clipping */
 	#nav-bar * {
diff --git a/xpi/content/images/appbutton_menuPanel_2.png b/xpi/content/images/appbutton_menuPanel_2.png
new file mode 100644
index 0000000..6d89e83
--- /dev/null
+++ b/xpi/content/images/appbutton_menuPanel_2.png
diff --git a/xpi/content/images/bookmarks_menu_2.png b/xpi/content/images/bookmarks_menu_2.png
new file mode 100644
index 0000000..ba9515c
--- /dev/null
+++ b/xpi/content/images/bookmarks_menu_2.png
diff --git a/xpi/content/images/bookmarks_sidebar_2.png b/xpi/content/images/bookmarks_sidebar_2.png
new file mode 100644
index 0000000..c6d8692
--- /dev/null
+++ b/xpi/content/images/bookmarks_sidebar_2.png
diff --git a/xpi/content/images/history_menu_2.png b/xpi/content/images/history_menu_2.png
new file mode 100644
index 0000000..322a8c1
--- /dev/null
+++ b/xpi/content/images/history_menu_2.png
diff --git a/xpi/content/images/history_sidebar_2.png b/xpi/content/images/history_sidebar_2.png
new file mode 100644
index 0000000..0cfe222
--- /dev/null
+++ b/xpi/content/images/history_sidebar_2.png
diff --git a/xpi/content/images/menuPanel2_2.png b/xpi/content/images/menuPanel2_2.png
new file mode 100644
index 0000000..cb33f89
--- /dev/null
+++ b/xpi/content/images/menuPanel2_2.png
diff --git a/xpi/content/images/menuPanel3_2.png b/xpi/content/images/menuPanel3_2.png
new file mode 100644
index 0000000..7b1ed2b
--- /dev/null
+++ b/xpi/content/images/menuPanel3_2.png
diff --git a/xpi/content/overlay.css b/xpi/content/overlay.css
index f13fdbf..2cbc8f7 100644
--- a/xpi/content/overlay.css
+++ b/xpi/content/overlay.css
@@ -299,9 +299,9 @@
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/appbutton_menuPanel.png);
 	}
 	
-	#main-window[fx52plus="true"] #ctraddon_appbutton[cui-areatype="menu-panel"] > .toolbarbutton-icon,
-	#main-window[fx52plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_appbutton > .toolbarbutton-icon{
-	  list-style-image: url(chrome://classic_theme_restorer/content/images/appbutton_menuPanel.svg);
+	#main-window[fx51plus="true"] #ctraddon_appbutton[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_appbutton > .toolbarbutton-icon{
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/appbutton_menuPanel_2.png);
 	}
 
 	#ctraddon_panelui-button[cui-areatype="menu-panel"] #PanelUI-menu-button > .toolbarbutton-icon,
@@ -311,6 +311,13 @@
 	  border:none;
 	}
 	
+	#main-window[fx51plus="true"] #ctraddon_panelui-button[cui-areatype="menu-panel"] #PanelUI-menu-button > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_panelui-button {
+	  background: -moz-image-rect(url("chrome://classic_theme_restorer/content/images/menuPanel2_2.png"),
+					0, 32, 32, 0) center no-repeat;
+	  border:none;
+	}
+	
 	#ctraddon_panelui-button[cui-areatype="menu-panel"] #PanelUI-menu-button > .toolbarbutton-icon,
 	toolbarpaletteitem[place="palette"] > #ctraddon_panelui-button #PanelUI-menu-button > .toolbarbutton-icon{
 	  list-style-image: none !important;
@@ -324,10 +331,10 @@
 	  list-style-image: url(chrome://browser/skin/menuPanel.png);
 	}
 	
-	#main-window[defaultfxtheme="true"][fx52plus="true"]  #ctraddon_stop-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
-	#main-window[defaultfxtheme="true"][fx52plus="true"]  toolbarpaletteitem[place="palette"] > #ctraddon_stop-button > .toolbarbutton-icon,
-	#main-window[fx52plus="true"] #ctraddon_stop-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
-	#main-window[fx52plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_stop-button > .toolbarbutton-icon {
+	#main-window[defaultfxtheme="true"][fx51plus="true"]  #ctraddon_stop-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[defaultfxtheme="true"][fx51plus="true"]  toolbarpaletteitem[place="palette"] > #ctraddon_stop-button > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] #ctraddon_stop-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_stop-button > .toolbarbutton-icon {
 	  -moz-image-region: rect(0px, 96px, 32px, 64px);
 	  list-style-image: url(chrome://browser/skin/menuPanel.svg);
 	}
@@ -340,10 +347,10 @@
 	  list-style-image: url(chrome://browser/skin/menuPanel.png);
 	}
 	
-	#main-window[defaultfxtheme="true"][fx52plus="true"] #ctraddon_reload-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
-	#main-window[defaultfxtheme="true"][fx52plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_reload-button > .toolbarbutton-icon,
-	#main-window[fx52plus="true"] #ctraddon_reload-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
-	#main-window[fx52plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_reload-button > .toolbarbutton-icon{
+	#main-window[defaultfxtheme="true"][fx51plus="true"] #ctraddon_reload-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[defaultfxtheme="true"][fx51plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_reload-button > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] #ctraddon_reload-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_reload-button > .toolbarbutton-icon{
 	  -moz-image-region: rect(0px, 64px, 32px, 32px);
 	  list-style-image: url(chrome://browser/skin/menuPanel.svg);
 	}
@@ -355,6 +362,14 @@
 	  -moz-image-region: rect(0px, 96px, 32px, 64px);
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3.png);
 	}
+	
+	#main-window[fx51plus="true"][defaultfxtheme="true"] #ctraddon_go-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx51plus="true"][defaultfxtheme="true"] toolbarpaletteitem[place="palette"] > #ctraddon_go-button > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] #ctraddon_go-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_go-button > .toolbarbutton-icon{
+	  -moz-image-region: rect(0px, 96px, 32px, 64px);
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3_2.png);
+	}
 
 	#main-window[defaultfxtheme="true"] #ctraddon_history-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
 	#main-window[defaultfxtheme="true"] toolbarpaletteitem[place="palette"] > #ctraddon_history-button > .toolbarbutton-icon,
@@ -364,6 +379,14 @@
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/history_sidebar.png);
 	}
 	
+	#main-window[fx51plus="true"][defaultfxtheme="true"] #ctraddon_history-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx51plus="true"][defaultfxtheme="true"] toolbarpaletteitem[place="palette"] > #ctraddon_history-button > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] #ctraddon_history-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_history-button > .toolbarbutton-icon{
+	  -moz-image-region: rect(0px, 32px, 32px, 0);
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/history_sidebar_2.png);
+	}
+	
 	#main-window[defaultfxtheme="true"] #ctraddon_history-menu-toolbar-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
 	#main-window[defaultfxtheme="true"] toolbarpaletteitem[place="palette"] > #ctraddon_history-menu-toolbar-button > .toolbarbutton-icon,
 	#ctraddon_history-menu-toolbar-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
@@ -371,6 +394,14 @@
 	  -moz-image-region: rect(0px, 32px, 32px, 0);
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/history_menu.png);
 	}
+	
+	#main-window[fx51plus="true"][defaultfxtheme="true"] #ctraddon_history-menu-toolbar-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx51plus="true"][defaultfxtheme="true"] toolbarpaletteitem[place="palette"] > #ctraddon_history-menu-toolbar-button > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] #ctraddon_history-menu-toolbar-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_history-menu-toolbar-button > .toolbarbutton-icon{
+	  -moz-image-region: rect(0px, 32px, 32px, 0);
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/history_menu_2.png);
+	}
 
 	#ctraddon_bookmarks-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
 	toolbarpaletteitem[place="palette"] > #ctraddon_bookmarks-button > .toolbarbutton-icon{
@@ -378,12 +409,24 @@
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/bookmarks_sidebar.png);
 	}
 	
+	#main-window[fx51plus="true"] #ctraddon_bookmarks-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_bookmarks-button > .toolbarbutton-icon{
+	  -moz-image-region: rect(0px, 32px, 32px, 0);
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/bookmarks_sidebar_2.png);
+	}
+	
 	#ctraddon_bookmarks-menu-toolbar-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
 	toolbarpaletteitem[place="palette"] > #ctraddon_bookmarks-menu-toolbar-button > .toolbarbutton-icon{
 	  -moz-image-region: rect(0px, 32px, 32px, 0);
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/bookmarks_menu.png);
 	}
 	
+	#main-window[fx51plus="true"] #ctraddon_bookmarks-menu-toolbar-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx51plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_bookmarks-menu-toolbar-button > .toolbarbutton-icon{
+	  -moz-image-region: rect(0px, 32px, 32px, 0);
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/bookmarks_menu_2.png);
+	}
+	
 	#main-window[defaultfxtheme="true"] #ctraddon_restart-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
 	#main-window[defaultfxtheme="true"] toolbarpaletteitem[place="palette"] > #ctraddon_restart-button > .toolbarbutton-icon,
 	#ctraddon_restart-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
diff --git a/xpi/content/overlay.js b/xpi/content/overlay.js
index f5f2885..1b93376 100644
--- a/xpi/content/overlay.js
+++ b/xpi/content/overlay.js
@@ -6108,6 +6108,10 @@ classicthemerestorerjs.ctr = {
 					  margin-left: '+this.prefs.getIntPref('navbarmar_l')+'px !important;\
 					  margin-right: '+this.prefs.getIntPref('navbarmar_r')+'px !important;\
 					}\
+					/* force min/max/close to be accessible*/\
+					#titlebar-buttonbox {\
+					  z-index: 99999 !important;\
+					}\
 				'), null, null);
 				
 				applyNewSheet(this.navbarpadding);
diff --git a/xpi/content/urlbarBindings51.xml b/xpi/content/urlbarBindings51.xml
index d99531a..9b22aeb 100644
--- a/xpi/content/urlbarBindings51.xml
+++ b/xpi/content/urlbarBindings51.xml
@@ -95,6 +95,11 @@
 
       <field name="_oneOffSearchesEnabled">false</field>
 
+      <field name="_overrideValue">null</field>
+      <property name="overrideValue"
+                onget="return this._overrideValue;"
+                onset="this._overrideValue = val; return val;"/>
+
       <method name="enableOneOffSearches">
         <parameter name="enable"/>
         <body><![CDATA[
@@ -291,6 +296,7 @@
       <method name="_showSearchSuggestionsNotification">
         <body>
           <![CDATA[
+
           this.richlistbox.flex = 0;
           this.setAttribute("dontanimate", "true");
 
@@ -433,7 +439,7 @@
           <![CDATA[
             if (this.selectedIndex == -1 && this._isFirstResultHeuristic) {
               this.richlistbox.suppressMenuItemEvent = true;
-              this.selectedIndex = 0;
+              this.input.controller.setInitiallySelectedIndex(0);
               this.richlistbox.suppressMenuItemEvent = false;
             }
 
@@ -442,9 +448,12 @@
             if (this.input.handleEnterInstance) {
               let instance = this.input.handleEnterInstance;
               this.input.handleEnterInstance = null;
+
               setTimeout(() => {
-                if (this.input.mController.searchString == instance.searchString) {
-                  this.input.mController.handleEnter(false, instance.event);
+                let { event, searchString } = instance;
+                if (this.input.mController.searchString == searchString) {
+                  this.input.maybeCanonizeURL(event, searchString);
+                  this.input.mController.handleEnter(false, event);
                 }
               }, 0);
             }
@@ -454,7 +463,6 @@
 
       <method name="_onSearchBegin">
         <body><![CDATA[
-          this.selectedIndex = 0;
         ]]></body>
       </method>
 
@@ -470,7 +478,7 @@
 
     </handlers>
   </binding>
- 
+
   <binding id="autocomplete-richlistitem" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
 
     <content align="start"
diff --git a/xpi/install.rdf b/xpi/install.rdf
index b403aff..c19d861 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.8.1</em:version>
+		<em:version>1.5.9beta1</em:version>
 		<em:type>2</em:type>
 		<em:multiprocessCompatible>true</em:multiprocessCompatible>
 
diff --git a/xpi/locale/de/options.dtd b/xpi/locale/de/options.dtd
index 6526bb4..847b784 100644
--- a/xpi/locale/de/options.dtd
+++ b/xpi/locale/de/options.dtd
@@ -179,7 +179,7 @@
 <!ENTITY Ctr_osearch_iwidth	"Pop-up-Breite automatisch der Suchfeldbreite anpassen">
 <!ENTITY Ctr_osearch_cwidth	"Eigene Breite für Such-Pop-ups">
 <!ENTITY Ctr_osearch_dm		"Kleinere Aufklapp-Schaltfläche">
-<!ENTITY Ctr_addonmanager	"Add-ons-Manager">
+<!ENTITY Ctr_addonmanager	"Add-ons-Verwaltung">
 <!ENTITY Ctr_alt_addonsp	"'Mehr Details'-Seite: Alternative Anordnung">
 <!ENTITY Ctr_am_showrecup	"'Zuletzt durchgeführte Updates' immer anzeigen">
 <!ENTITY Ctr_alt_addonsm	"Alternative Darstellung">