diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 24a2392198..ff084f1c97 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1396,45 +1396,55 @@ pref("status4evar.addonbar.borderStyle", false);
 pref("status4evar.addonbar.closeButton", false);
 pref("status4evar.addonbar.legacyShim", true);
 pref("status4evar.addonbar.windowGripper", true);
+
 pref("status4evar.advanced.showWarning", true);
 pref("status4evar.advanced.status.detectFullScreen", true);
 pref("status4evar.advanced.status.detectVideo", true);
 pref("status4evar.advanced.urlbar.forceBinding", false);
+
 pref("status4evar.download.button.action", 1);
 pref("status4evar.download.button.action.command", "");
-pref("status4evar.download.color.active", "#33FF33");
+pref("status4evar.download.color.active", "#333399");
 pref("status4evar.download.color.paused", "#808080");
-pref("status4evar.download.force", true);
+pref("status4evar.download.force", false);
 pref("status4evar.download.label", 0);
-pref("status4evar.download.label.force", false);
+pref("status4evar.download.label.force", true);
 pref("status4evar.download.notify.animate", true);
 pref("status4evar.download.notify.timeout", 60);
 pref("status4evar.download.progress", 1);
-pref("status4evar.download.tooltip", 1);
+pref("status4evar.download.tooltip", 2);
+
 pref("status4evar.firstRun", true);
 pref("status4evar.firstRun.australis", true);
+
 //pref("status4evar.progress.tab", 1);
-//pref("status4evar.progress.tab.css", "#33FF33");
+//pref("status4evar.progress.tab.css", "#333399");
 //pref("status4evar.progress.tab.style", true);
-pref("status4evar.progress.toolbar.css", "#33FF33");
+
+pref("status4evar.progress.toolbar.css", "#333399");
 pref("status4evar.progress.toolbar.force", false);
 pref("status4evar.progress.toolbar.style", false);
 pref("status4evar.progress.toolbar.style.advanced", false);
-pref("status4evar.progress.urlbar", 1);
-pref("status4evar.progress.urlbar.css", "#33FF33");
-pref("status4evar.progress.urlbar.style", true);
+
+pref("status4evar.progress.urlbar", 0);
+pref("status4evar.progress.urlbar.css", "#333399");
+pref("status4evar.progress.urlbar.style", false);
 pref("status4evar.progress.urlbar.style.advanced", false);
+
 pref("status4evar.status", 1);
 pref("status4evar.status.default", true);
 pref("status4evar.status.network", true);
 pref("status4evar.status.network.xhr", true);
-pref("status4evar.status.timeout", 10);
+pref("status4evar.status.timeout", 30);
 pref("status4evar.status.linkOver", 1);
-pref("status4evar.status.linkOver.delay.show", 70);
-pref("status4evar.status.linkOver.delay.hide", 150);
+pref("status4evar.status.linkOver.delay.show", 0);
+pref("status4evar.status.linkOver.delay.hide", 0);
+
 pref("status4evar.status.toolbar.maxLength", 0);
+
 pref("status4evar.status.urlbar.align", 0);
 pref("status4evar.status.urlbar.color", "GrayText");
 pref("status4evar.status.urlbar.position", 33);
+
 pref("status4evar.status.popup.invertMirror", false);
 pref("status4evar.status.popup.mouseMirror", true);
diff --git a/browser/components/statusbar/Status4Evar.jsm b/browser/components/statusbar/Status4Evar.jsm
index 4937caf291..ed77f5a5c8 100644
--- a/browser/components/statusbar/Status4Evar.jsm
+++ b/browser/components/statusbar/Status4Evar.jsm
@@ -147,32 +147,29 @@ Status4Evar.prototype =
 
 	launchOptions: function(currentWindow)
 	{
-		AddonManager.getAddonByID("status4evar@caligonstudios.com", function(aAddon)
+		let optionsURL = "chrome://browser/content/statusbar/prefs.xul";
+		let windows = Services.wm.getEnumerator(null);
+		while (windows.hasMoreElements())
 		{
-			let optionsURL = aAddon.optionsURL;
-			let windows = Services.wm.getEnumerator(null);
-			while (windows.hasMoreElements())
+			let win = windows.getNext();
+			if (win.document.documentURI == optionsURL)
 			{
-				let win = windows.getNext();
-				if (win.document.documentURI == optionsURL)
-				{
-					win.focus();
-					return;
-				}
+				win.focus();
+				return;
 			}
-
-			let features = "chrome,titlebar,toolbar,centerscreen";
-			try
-			{
-				let instantApply = Services.prefs.getBoolPref("browser.preferences.instantApply");
-				features += instantApply ? ",dialog=no" : ",modal";
-			}
-			catch(e)
-			{
-				features += ",modal";
-			}
-			currentWindow.openDialog(optionsURL, "", features);
-		});
+		}
+		
+		let features = "chrome,titlebar,toolbar,centerscreen";
+		try
+		{
+			let instantApply = Services.prefs.getBoolPref("browser.preferences.instantApply");
+			features += instantApply ? ",dialog=no" : ",modal";
+		}
+		catch(e)
+		{
+			features += ",modal";
+		}
+		currentWindow.openDialog(optionsURL, "", features);
 	}
 
 };
diff --git a/browser/components/statusbar/content/overlay.xul b/browser/components/statusbar/content/overlay.xul
index 7c1857a11b..7b569b7194 100644
--- a/browser/components/statusbar/content/overlay.xul
+++ b/browser/components/statusbar/content/overlay.xul
@@ -32,6 +32,16 @@
 		</hbox>
 	</popupset>
 
+    <menupopup id="menu_ToolsPopup">
+      <menuitem id="statusbar-options-fx" command="S4E:Options"
+        label="&status4evar.menu.options.label;"/>
+    </menupopup>
+    
+    <menupopup id="appmenu_customizeMenu">
+          <menuitem id="statusbar-options-app" command="S4E:Options"
+        label="&status4evar.menu.options.label;"/>
+    </menupopup>
+    
 	<toolbarpalette id="BrowserToolbarPalette">
 		<toolbaritem id="status4evar-status-widget"
 		             title="&status4evar.status.widget.title;"
diff --git a/browser/components/statusbar/content/prefs.xul b/browser/components/statusbar/content/prefs.xul
index 2c513789f7..e9f9840d25 100644
--- a/browser/components/statusbar/content/prefs.xul
+++ b/browser/components/statusbar/content/prefs.xul
@@ -401,7 +401,6 @@
 			<preference id="status4evar-pref-advanced-status-detectFullScreen" name="status4evar.advanced.status.detectFullScreen" type="bool" />
 			<preference id="status4evar-pref-advanced-status-detectVideo"      name="status4evar.advanced.status.detectVideo"      type="bool" />
 			<preference id="status4evar-pref-advanced-urlbar-forceBinding"     name="status4evar.advanced.urlbar.forceBinding"     type="bool" />
-			<preference id="toolkit-pref-classic-download-window"              name="browser.download.useToolkitUI"                type="bool" />
 		</preferences>
 
 		<commandset id="status4evar-commandset-advanced">
@@ -440,12 +439,6 @@
 					<checkbox id="status4evar-advanced-status-detectFullScreen-check" preference="status4evar-pref-advanced-status-detectFullScreen" label="&status4evar.advanced.status.detectFullScreen;" />
 					<checkbox id="status4evar-advanced-status-detectVideo-check" preference="status4evar-pref-advanced-status-detectVideo" label="&status4evar.advanced.status.detectVideo;" />
 				</groupbox>
-
-				<groupbox id="status4evar-advanced-download">
-					<caption label="&status4evar.pane.download;" />
-
-					<checkbox id="toolkit-classic-download-window-check" preference="toolkit-pref-classic-download-window" label="&toolkit.classic.download.window.label;" />
-				</groupbox>
 			</vbox>
 		</deck>
 	</prefpane>
diff --git a/browser/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd b/browser/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd
index cf589dec0e..0ea5ffc263 100644
--- a/browser/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd
+++ b/browser/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd
@@ -4,6 +4,7 @@
 <!ENTITY status4evar.progress.widget.title "Progress Meter">
 <!ENTITY status4evar.throbber.widget.title "Activity Indicator">
 <!ENTITY status4evar.download.widget.title "Download Status">
-<!ENTITY status4evar.options.widget.title "Status-4-Evar Options">
-<!ENTITY status4evar.options.widget.label "Status-4-Evar">
+<!ENTITY status4evar.options.widget.title "Pale Moon status bar options">
+<!ENTITY status4evar.options.widget.label "Pale Moon status bar">
+<!ENTITY status4evar.menu.options.label "Status bar options...">
 
diff --git a/browser/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd b/browser/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd
index 3c0846370b..e9c9d1440b 100644
--- a/browser/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd
+++ b/browser/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd
@@ -1,23 +1,23 @@
-<!ENTITY status4evar.window.title "Status-4-Evar Preferences">
+<!ENTITY status4evar.window.title "Pale Moon status bar preferences">
 
 <!ENTITY status4evar.pane.status "Status">
 <!ENTITY status4evar.pane.progress "Progress">
 <!ENTITY status4evar.pane.download "Download">
-<!ENTITY status4evar.pane.addonbar "Add-on Bar">
+<!ENTITY status4evar.pane.addonbar "Status Bar">
 <!ENTITY status4evar.pane.statusbar "Status Bar">
 <!ENTITY status4evar.pane.advanced "Advanced">
 
 <!ENTITY status4evar.tab.general "General">
-<!ENTITY status4evar.tab.toolbar "Toolbar">
-<!ENTITY status4evar.tab.urlbar "Location Bar">
-<!ENTITY status4evar.tab.popup "Popup">
+<!ENTITY status4evar.tab.toolbar "Status Bar">
+<!ENTITY status4evar.tab.urlbar "Address Bar">
+<!ENTITY status4evar.tab.popup "Pop-up">
 <!ENTITY status4evar.tab.tabs "Tabs">
 
 <!ENTITY status4evar.option.none "None">
 <!ENTITY status4evar.option.nothing "Nothing">
-<!ENTITY status4evar.option.toolbar "Toolbar">
-<!ENTITY status4evar.option.urlbar "Location Bar">
-<!ENTITY status4evar.option.popup "Popup">
+<!ENTITY status4evar.option.toolbar "Status Bar">
+<!ENTITY status4evar.option.urlbar "Address Bar">
+<!ENTITY status4evar.option.popup "Pop-up">
 <!ENTITY status4evar.option.tooltip "Tooltip">
 <!ENTITY status4evar.option.bottom "Bottom">
 <!ENTITY status4evar.option.top "Top">
@@ -38,7 +38,7 @@
 <!ENTITY status4evar.option.no-repeat "No Repeat">
 <!ENTITY status4evar.option.space "Space">
 <!ENTITY status4evar.option.round "Round">
-<!ENTITY status4evar.option.firefoxdefault "Firefox default">
+<!ENTITY status4evar.option.firefoxdefault "Pale Moon default">
 <!ENTITY status4evar.option.download.library "Library">
 <!ENTITY status4evar.option.download.tab "Tab">
 <!ENTITY status4evar.option.download.thirdparty "3rd Party">
@@ -47,11 +47,9 @@
 <!ENTITY status4evar.unit.seconds "seconds">
 <!ENTITY status4evar.unit.px "px">
 
-
-
 <!ENTITY status4evar.status.general.status.caption "Status Text">
 <!ENTITY status4evar.status.label "Show status in:">
-<!ENTITY status4evar.status.timeout.label "Delay before clearing status messages:">
+<!ENTITY status4evar.status.timeout.label "Hide the status after:">
 <!ENTITY status4evar.status.default.label "Show default status">
 <!ENTITY status4evar.status.network.label "Show network status">
 <!ENTITY status4evar.status.network.xhr.label "Show background network status">
@@ -69,21 +67,19 @@
 <!ENTITY status4evar.status.currentUrl "Current Location">
 <!ENTITY status4evar.status.statusText "Status Text">
 
-<!ENTITY status4evar.status.urlbar.firefox.builtin.caption "Firefox features">
+<!ENTITY status4evar.status.urlbar.firefox.builtin.caption "Firefox compatibility features">
 <!ENTITY browser.urlbar.formatting.enabled.label "Enable domain highlighting">
 <!ENTITY browser.urlbar.trimming.enabled.label "Enable protocol hiding (http:// and ftp://)">
 
 <!ENTITY status4evar.status.popup.invertMirror.label "Default to the right side">
 <!ENTITY status4evar.status.popup.mouseMirror.label "Swap sides when moused over">
 
-
-
 <!ENTITY status4evar.progress.style.label "Use a custom style">
 
-<!ENTITY status4evar.progress.urlbar.enable.label "Show progress in the Location Bar">
+<!ENTITY status4evar.progress.urlbar.enable.label "Show progress in the Address Bar">
 <!ENTITY status4evar.progress.urlbar.line.label "Line style:">
 
-<!ENTITY status4evar.progress.toolbar.force.label "Always show the toolbar item">
+<!ENTITY status4evar.progress.toolbar.force.label "Always show the status bar item">
 
 <!ENTITY status4evar.editor.label "Editor:">
 <!ENTITY status4evar.editor.css.color.label "Color:">
@@ -95,10 +91,10 @@
 
 
 <!ENTITY status4evar.download.button.action.label "Download status button action:">
-<!ENTITY status4evar.download.force.label "Always show the Download Status button">
-<!ENTITY status4evar.download.label.force.label "Show button text in icons-only mode">
-<!ENTITY status4evar.download.label.label "Download status button text:">
-<!ENTITY status4evar.download.tooltip.label "Download status button tooltip:">
+<!ENTITY status4evar.download.force.label "Always show the Download Status indicator">
+<!ENTITY status4evar.download.label.force.label "Always show the indicator text">
+<!ENTITY status4evar.download.label.label "Download status indicator text:">
+<!ENTITY status4evar.download.tooltip.label "Download status indicator tooltip:">
 <!ENTITY status4evar.download.progress.label "Show download progress on the button">
 <!ENTITY status4evar.download.progress.average.label "Show average download completion">
 <!ENTITY status4evar.download.progress.max.label "Show most complete download">
@@ -108,22 +104,15 @@
 <!ENTITY status4evar.download.notify.animate.label "Animate button when download completes">
 <!ENTITY status4evar.download.notify.timeout.label "Highlight button when download completes:">
 
-
-
 <!ENTITY status4evar.addonbar.borderStyle "Use alternate toolbar borders">
 <!ENTITY status4evar.addonbar.windowGripper "Show the window re-size gripper">
 <!ENTITY status4evar.addonbar.closeButton "Show the close button">
 <!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 
+<!ENTITY status4evar.advanced.warning "These advanced settings may cause issues with Pale Moon or other extensions. Modify at your own risk.">
 
-
-<!ENTITY status4evar.advanced.warning "These advanced settings may cause issues with Status-4-Evar or other extensions. Modify at your own risk.">
-
-<!ENTITY status4evar.advanced.urlbar.forceBinding "Attempt to force the the Location Bar XBL binding.">
-<!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Only select this if you have problems with the Location Bar progress or status text being displaying correctly. This will potentially break other extensions that try to set an XBL binding on the Location Bar.">
+<!ENTITY status4evar.advanced.urlbar.forceBinding "Attempt to force the the Address Bar XBL binding.">
+<!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Only select this if you have problems with the Address Bar progress or status text being displaying correctly. This will potentially break other extensions that try to set an XBL binding on the Address Bar.">
 
 <!ENTITY status4evar.advanced.status.detectFullScreen "Detect full-screen mode and show links/status appropriately.">
 <!ENTITY status4evar.advanced.status.detectVideo "Hide status popup in full-screen HTML5 video.">
-
-<!ENTITY toolkit.classic.download.window.label "Use classic download window">
-
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index c0e7d24e42..f0a698624a 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -108,9 +108,8 @@ browser.jar:
 * skin/classic/browser/statusbar/overlay.css                   (statusbar/overlay.css)
 * skin/classic/browser/statusbar/prefs.css                     (statusbar/prefs.css)
   skin/classic/browser/statusbar/pulse.png                     (../shared/statusbar/pulse.png)
-  skin/classic/browser/statusbar/s4e16.png                     (../shared/statusbar/s4e16.png)
-  skin/classic/browser/statusbar/s4e24.png                     (../shared/statusbar/s4e24.png)
-  skin/classic/browser/statusbar/s4e32.png                     (../shared/statusbar/s4e32.png)
+  skin/classic/browser/statusbar/pms16.png                     (../shared/statusbar/pms16.png)
+  skin/classic/browser/statusbar/pms24.png                     (../shared/statusbar/pms24.png)
   skin/classic/browser/statusbar/throbber-idle.png             (../shared/statusbar/throbber-idle.png)
   skin/classic/browser/statusbar/throbberStatic.png            (../shared/statusbar/throbberStatic.png)
   skin/classic/browser/statusbar/urlbar-over-link-arrow.png    (../shared/statusbar/urlbar-over-link-arrow.png)
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 616a14bf65..3029bc2a3c 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -131,9 +131,8 @@ browser.jar:
 *       skin/classic/browser/statusbar/overlay.css                   (statusbar/overlay.css)
 *       skin/classic/browser/statusbar/prefs.css                     (statusbar/prefs.css)
         skin/classic/browser/statusbar/pulse.png                     (../shared/statusbar/pulse.png)
-        skin/classic/browser/statusbar/s4e16.png                     (../shared/statusbar/s4e16.png)
-        skin/classic/browser/statusbar/s4e24.png                     (../shared/statusbar/s4e24.png)
-        skin/classic/browser/statusbar/s4e32.png                     (../shared/statusbar/s4e32.png)
+        skin/classic/browser/statusbar/pms16.png                     (../shared/statusbar/pms16.png)
+        skin/classic/browser/statusbar/pms24.png                     (../shared/statusbar/pms24.png)
         skin/classic/browser/statusbar/throbber-idle.png             (../shared/statusbar/throbber-idle.png)
         skin/classic/browser/statusbar/throbberStatic.png            (../shared/statusbar/throbberStatic.png)
         skin/classic/browser/statusbar/urlbar-over-link-arrow.png    (../shared/statusbar/urlbar-over-link-arrow.png)
diff --git a/browser/themes/shared/statusbar/overlay.css b/browser/themes/shared/statusbar/overlay.css
index a288df9c9f..85b9e3a188 100644
--- a/browser/themes/shared/statusbar/overlay.css
+++ b/browser/themes/shared/statusbar/overlay.css
@@ -38,12 +38,12 @@
 
 #status4evar-options-button
 {
-	list-style-image: url("chrome://browser/skin/statusbar/s4e24.png");
+	list-style-image: url("chrome://browser/skin/statusbar/pms24.png");
 }
 
 toolbar[iconsize="small"] #status4evar-options-button
 {
-	list-style-image: url("chrome://browser/skin/statusbar/s4e16.png");
+	list-style-image: url("chrome://browser/skin/statusbar/pms16.png");
 }
 
 /*
diff --git a/browser/themes/shared/statusbar/pms16.png b/browser/themes/shared/statusbar/pms16.png
new file mode 100644
index 0000000000..830c5861a9
Binary files /dev/null and b/browser/themes/shared/statusbar/pms16.png differ
diff --git a/browser/themes/shared/statusbar/pms24.png b/browser/themes/shared/statusbar/pms24.png
new file mode 100644
index 0000000000..cdc69b9b44
Binary files /dev/null and b/browser/themes/shared/statusbar/pms24.png differ
diff --git a/browser/themes/shared/statusbar/s4e16.png b/browser/themes/shared/statusbar/s4e16.png
deleted file mode 100644
index 8308229f94..0000000000
Binary files a/browser/themes/shared/statusbar/s4e16.png and /dev/null differ
diff --git a/browser/themes/shared/statusbar/s4e24.png b/browser/themes/shared/statusbar/s4e24.png
deleted file mode 100644
index 3197782f1f..0000000000
Binary files a/browser/themes/shared/statusbar/s4e24.png and /dev/null differ
diff --git a/browser/themes/shared/statusbar/s4e32.png b/browser/themes/shared/statusbar/s4e32.png
deleted file mode 100644
index 42b8ad1e36..0000000000
Binary files a/browser/themes/shared/statusbar/s4e32.png and /dev/null differ
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 3ae54f631c..3d3d786562 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -132,9 +132,8 @@ browser.jar:
 *       skin/classic/browser/statusbar/overlay.css                   (statusbar/overlay.css)
 *       skin/classic/browser/statusbar/prefs.css                     (statusbar/prefs.css)
         skin/classic/browser/statusbar/pulse.png                     (../shared/statusbar/pulse.png)
-        skin/classic/browser/statusbar/s4e16.png                     (../shared/statusbar/s4e16.png)
-        skin/classic/browser/statusbar/s4e24.png                     (../shared/statusbar/s4e24.png)
-        skin/classic/browser/statusbar/s4e32.png                     (../shared/statusbar/s4e32.png)
+        skin/classic/browser/statusbar/pms16.png                     (../shared/statusbar/pms16.png)
+        skin/classic/browser/statusbar/pms24.png                     (../shared/statusbar/pms24.png)
         skin/classic/browser/statusbar/throbber-idle.png             (../shared/statusbar/throbber-idle.png)
         skin/classic/browser/statusbar/throbberStatic.png            (../shared/statusbar/throbberStatic.png)
         skin/classic/browser/statusbar/urlbar-over-link-arrow.png    (../shared/statusbar/urlbar-over-link-arrow.png)