diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index a7e722a..9cb8476 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -342,6 +342,10 @@
 		"message": "Benachrichtigungen deaktivieren",
 		"description": ""
 	},
+	"showOptions": {
+		"message": "Einstellungen anzeigen",
+		"description": ""
+	},
 	"displayCallingStack": {
 		"message": "Aufrufestack anzeigen",
 		"description": ""
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 3bcb0ac..2e5f555 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -342,6 +342,10 @@
 		"message": "disable notifications",
 		"description": ""
 	},
+	"showOptions": {
+		"message": "display settings",
+		"description": ""
+	},
 	"displayCallingStack": {
 		"message": "display calling stack",
 		"description": ""
diff --git a/icons/pageAction-showOptions.svg b/icons/pageAction-showOptions.svg
new file mode 100644
index 0000000..3550f80
--- /dev/null
+++ b/icons/pageAction-showOptions.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   width="38"
+   height="38"
+   viewBox="0 0 38 38"
+   sodipodi:docname="pageAction-showOptions.svg"
+   inkscape:export-filename="Fingerprint.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1600"
+     inkscape:window-height="841"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="3.1354895"
+     inkscape:cx="-58.126935"
+     inkscape:cy="-15.960001"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     showguides="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3725" />
+  </sodipodi:namedview>
+  <path
+     style="stroke-width:2;fill:#919191;stroke:#919191;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1;stroke-linejoin:round;stroke-linecap:round"
+     d="m 24.479952,2.2691072 -2.588311,4.2101636 h -0.002 -6.297639 L 13.091726,2.4099677 a 17.529306,17.529306 0 0 0 -0.48323,0.1741192 17.529306,17.529306 0 0 0 -0.590831,0.2367238 17.529306,17.529306 0 0 0 -0.02739,0.011739 A 17.529306,17.529306 0 0 0 10.77144,3.4155555 17.529306,17.529306 0 0 0 10.69123,3.4566405 17.529306,17.529306 0 0 0 10.276476,3.6992331 17.529306,17.529306 0 0 0 9.7208592,4.0376895 17.529306,17.529306 0 0 0 9.4841355,4.1844192 17.529306,17.529306 0 0 0 9.0772052,4.4485326 17.529306,17.529306 0 0 0 8.6761437,4.7400355 17.529306,17.529306 0 0 0 8.4531148,4.9082856 17.529306,17.529306 0 0 0 8.2163911,5.0921868 17.529306,17.529306 0 0 0 7.6686002,5.528463 17.529306,17.529306 0 0 0 7.1931965,5.953001 17.529306,17.529306 0 0 0 6.9701666,6.1642916 17.529306,17.529306 0 0 0 6.7373564,6.39319 l 2.977634,3.752367 -3.1478406,5.454431 -4.6112251,-0.682782 a 17.529306,17.529306 0 0 0 -0.2093339,1.066236 17.529306,17.529306 0 0 0 -0.080212,0.446057 17.529306,17.529306 0 0 0 -0.1252094,1.336219 17.529306,17.529306 0 0 0 -0.031302,0.393236 17.529306,17.529306 0 0 0 0.00782,1.375346 17.529306,17.529306 0 0 0 0.00782,0.377584 17.529306,17.529306 0 0 0 0.1408614,1.336218 17.529306,17.529306 0 0 0 0.050866,0.410843 17.529306,17.529306 0 0 0 0.2445488,1.179707 17.529306,17.529306 0 0 0 0.095863,0.420624 L 6.815601,22.554975 9.9653994,28.007449 7.0621071,31.66591 a 17.529306,17.529306 0 0 0 0.1506429,0.138903 17.529306,17.529306 0 0 0 1.062323,0.897986 17.529306,17.529306 0 0 0 0.2621562,0.199553 17.529306,17.529306 0 0 0 2.6861308,1.651197 17.529306,17.529306 0 0 0 0.223029,0.113471 17.529306,17.529306 0 0 0 1.338175,0.567356 17.529306,17.529306 0 0 0 0.289546,0.11347 17.529306,17.529306 0 0 0 0.984067,0.307154 l 1.823361,-4.413629 6.295681,0.09391 L 23.830374,35.7 a 17.529306,17.529306 0 0 0 0.57518,-0.1839 17.529306,17.529306 0 0 0 0.980154,-0.336501 17.529306,17.529306 0 0 0 0.528228,-0.230855 17.529306,17.529306 0 0 0 1.083843,-0.49888 17.529306,17.529306 0 0 0 0.420625,-0.234768 17.529306,17.529306 0 0 0 1.113189,-0.653436 17.529306,17.529306 0 0 0 0.322805,-0.226942 17.529306,17.529306 0 0 0 1.091669,-0.796253 17.529306,17.529306 0 0 0 0.293459,-0.252375 17.529306,17.529306 0 0 0 0.841251,-0.753213 l -2.924812,-3.803233 3.230009,-5.403565 4.585791,0.747344 a 17.529306,17.529306 0 0 0 0.154556,-0.628004 17.529306,17.529306 0 0 0 0.01566,-0.07043 17.529306,17.529306 0 0 0 0.0763,-0.389323 17.529306,17.529306 0 0 0 0.168251,-1.193401 17.529306,17.529306 0 0 0 0.02348,-0.191726 17.529306,17.529306 0 0 0 0.04109,-0.436277 17.529306,17.529306 0 0 0 0.045,-0.878421 17.529306,17.529306 0 0 0 0.0039,-0.09586 17.529306,17.529306 0 0 0 -0.002,-0.213247 17.529306,17.529306 0 0 0 -0.03522,-1.001675 17.529306,17.529306 0 0 0 -0.03522,-0.686695 17.529306,17.529306 0 0 0 0,-0.0098 17.529306,17.529306 0 0 0 -0.002,-0.02153 17.529306,17.529306 0 0 0 -0.113471,-0.833425 17.529306,17.529306 0 0 0 -0.134992,-0.894072 17.529306,17.529306 0 0 0 -0.002,-0.01956 17.529306,17.529306 0 0 0 -0.0098,-0.03717 17.529306,17.529306 0 0 0 -0.158468,-0.665174 17.529306,17.529306 0 0 0 -0.01566,-0.05673 L 31.264497,15.376926 28.196868,9.8774977 31.1432,6.2738167 A 17.529306,17.529306 0 0 0 24.479952,2.2691072 Z m -5.5366,9.5902518 a 7.0117223,7.0117223 0 0 1 0.09195,0.0039 7.0117223,7.0117223 0 0 1 0.04891,-0.002 7.0117223,7.0117223 0 0 1 0.09978,0.0059 7.0117223,7.0117223 0 0 1 0.0313,0.002 7.0117223,7.0117223 0 0 1 0.324762,0.01369 7.0117223,7.0117223 0 0 1 0.37954,0.04304 7.0117223,7.0117223 0 0 1 0.158468,0.01761 7.0117223,7.0117223 0 0 1 0.06847,0.01369 7.0117223,7.0117223 0 0 1 0.549747,0.113471 7.0117223,7.0117223 0 0 1 0.06847,0.01369 7.0117223,7.0117223 0 0 1 0.01174,0.0039 7.0117223,7.0117223 0 0 1 0.0313,0.0098 7.0117223,7.0117223 0 0 1 0.637785,0.201508 7.0117223,7.0117223 0 0 1 0.0313,0.0098 7.0117223,7.0117223 0 0 1 1.027108,0.48323 7.0117223,7.0117223 0 0 1 0.01369,0.0078 7.0117223,7.0117223 0 0 1 2.574616,2.560923 7.0117223,7.0117223 0 0 1 0.471491,5.998309 7.0117223,7.0117223 0 0 1 -0.0059,0.02152 7.0117223,7.0117223 0 0 1 -0.002,0.002 7.0117223,7.0117223 0 0 1 -0.185858,0.422581 7.0117223,7.0117223 0 0 1 -0.117384,0.2602 7.0117223,7.0117223 0 0 1 -0.0078,0.01566 7.0117223,7.0117223 0 0 1 -0.160424,0.297372 7.0117223,7.0117223 0 0 1 -0.115428,0.176076 7.0117223,7.0117223 0 0 1 -0.144773,0.234767 7.0117223,7.0117223 0 0 1 -0.05282,0.07043 7.0117223,7.0117223 0 0 1 -0.219116,0.295416 7.0117223,7.0117223 0 0 1 -0.136948,0.181945 7.0117223,7.0117223 0 0 1 -0.07043,0.08022 7.0117223,7.0117223 0 0 1 -0.02738,0.02935 7.0117223,7.0117223 0 0 1 -0.176076,0.193683 7.0117223,7.0117223 0 0 1 -0.181945,0.197597 7.0117223,7.0117223 0 0 1 -0.123253,0.11347 7.0117223,7.0117223 0 0 1 -0.170207,0.154556 7.0117223,7.0117223 0 0 1 -0.215203,0.191726 7.0117223,7.0117223 0 0 1 -0.129122,0.09586 7.0117223,7.0117223 0 0 1 -0.21129,0.156511 7.0117223,7.0117223 0 0 1 -0.207379,0.152599 7.0117223,7.0117223 0 0 1 -0.140861,0.08804 7.0117223,7.0117223 0 0 1 -0.103688,0.06652 7.0117223,7.0117223 0 0 1 -0.02543,0.01369 7.0117223,7.0117223 0 0 1 -0.01956,0.01174 7.0117223,7.0117223 0 0 1 -0.05869,0.03717 7.0117223,7.0117223 0 0 1 -0.02935,0.01956 7.0117223,7.0117223 0 0 1 -0.0059,0.0039 7.0117223,7.0117223 0 0 1 -0.101733,0.05869 7.0117223,7.0117223 0 0 1 -0.164337,0.08021 7.0117223,7.0117223 0 0 1 -0.328675,0.164338 7.0117223,7.0117223 0 0 1 -0.02348,0.01174 7.0117223,7.0117223 0 0 1 -0.03522,0.01369 7.0117223,7.0117223 0 0 1 -2.885683,0.631917 7.0117223,7.0117223 0 0 1 -6.299595,-3.946051 7.0117223,7.0117223 0 0 1 -0.269982,-0.628003 7.0117223,7.0117223 0 0 1 -0.03326,-0.101732 7.0117223,7.0117223 0 0 1 -0.172163,-0.543879 7.0117223,7.0117223 0 0 1 -0.05478,-0.242592 7.0117223,7.0117223 0 0 1 -0.08804,-0.428451 7.0117223,7.0117223 0 0 1 -0.045,-0.367802 7.0117223,7.0117223 0 0 1 -0.03326,-0.309111 7.0117223,7.0117223 0 0 1 -0.01369,-0.410843 7.0117223,7.0117223 0 0 1 -0.002,-0.03326 7.0117223,7.0117223 0 0 1 0,-0.0078 7.0117223,7.0117223 0 0 1 -0.002,-0.117383 7.0117223,7.0117223 0 0 1 0.03717,-0.575181 7.0117223,7.0117223 0 0 1 0.10369,-0.692563 7.0117223,7.0117223 0 0 1 0.08999,-0.356065 7.0117223,7.0117223 0 0 1 0.0078,-0.03326 7.0117223,7.0117223 0 0 1 0.193683,-0.622134 7.0117223,7.0117223 0 0 1 0.01956,-0.05673 7.0117223,7.0117223 0 0 1 0.234768,-0.557572 7.0117223,7.0117223 0 0 1 0.06065,-0.12521 7.0117223,7.0117223 0 0 1 0.21716,-0.403017 7.0117223,7.0117223 0 0 1 0.04304,-0.07826 7.0117223,7.0117223 0 0 1 0.06652,-0.09978 7.0117223,7.0117223 0 0 1 0.260201,-0.389323 7.0117223,7.0117223 0 0 1 0.158468,-0.209335 7.0117223,7.0117223 0 0 1 0.281721,-0.340412 7.0117223,7.0117223 0 0 1 0.170206,-0.185858 7.0117223,7.0117223 0 0 1 0.301285,-0.299328 7.0117223,7.0117223 0 0 1 0.240636,-0.211291 7.0117223,7.0117223 0 0 1 0.29346,-0.236724 7.0117223,7.0117223 0 0 1 0.252375,-0.181945 7.0117223,7.0117223 0 0 1 0.314981,-0.209334 7.0117223,7.0117223 0 0 1 0.295414,-0.170207 7.0117223,7.0117223 0 0 1 0.31498,-0.164337 7.0117223,7.0117223 0 0 1 0.324762,-0.14673 7.0117223,7.0117223 0 0 1 0.309111,-0.123253 7.0117223,7.0117223 0 0 1 0.35802,-0.121296 7.0117223,7.0117223 0 0 1 0.305197,-0.08608 7.0117223,7.0117223 0 0 1 0.393236,-0.08999 7.0117223,7.0117223 0 0 1 0.269983,-0.04891 7.0117223,7.0117223 0 0 1 0.338456,-0.04695 7.0117223,7.0117223 0 0 1 0.105646,-0.0098 7.0117223,7.0117223 0 0 1 0.26607,-0.02153 7.0117223,7.0117223 0 0 1 0.28172,-0.01174 7.0117223,7.0117223 0 0 1 0.06652,-0.0039 z"
+     id="path3759"
+     inkscape:connector-curvature="0" />
+  <rect
+     style="fill:#ff0000;stroke:none"
+     id="rect3764-7"
+     width="6.2873464"
+     height="13.286468"
+     x="17.73506"
+     y="-18.60734" />
+  <rect
+     style="fill:#00ff00;stroke:none"
+     id="rect3764-3-5"
+     width="6.2873464"
+     height="13.286468"
+     x="11.392312"
+     y="-30.398373"
+     transform="rotate(31.575929)" />
+  <rect
+     style="fill:#00ff00;stroke:none"
+     id="rect3764-3-6-3"
+     width="6.2873464"
+     height="13.286468"
+     x="-24.182835"
+     y="-8.5329943"
+     transform="matrix(-0.851947,0.52362803,0.52362803,0.851947,0,0)" />
+</svg>
diff --git a/pageAction/gui.js b/pageAction/gui.js
index 85268c0..021f791 100644
--- a/pageAction/gui.js
+++ b/pageAction/gui.js
@@ -36,7 +36,7 @@
 	}();
 
 		
-	scope.createActionButtons = function createActionButtons(container, actions, data){
+	scope.createActionButtons = function createActionButtons(container, actions, data, horizontal){
 		actions.forEach(function(action, i){
 			var button = document.createElement("button");
 			button.className = action.name + " action";
@@ -52,7 +52,7 @@
 			}
 			button.addEventListener("click", action.callback.bind(undefined, data));
 			container.appendChild(button);
-			if (i % 3 === 2){
+			if (horizontal || i % 3 === 2){
 				container.appendChild(document.createElement("br"));
 			}
 		});
diff --git a/pageAction/pageAction.css b/pageAction/pageAction.css
index 6990464..f76fa34 100644
--- a/pageAction/pageAction.css
+++ b/pageAction/pageAction.css
@@ -67,6 +67,10 @@ button.action img {
 	text-align: right;
 }
 
+#globalActions .action {
+	margin-bottom: 4px;
+}
+
 .notifications .fakedCanvasContent {
 	display: block;
 	width: 100%;
diff --git a/pageAction/pageAction.js b/pageAction/pageAction.js
index 93f9cd5..8555c68 100644
--- a/pageAction/pageAction.js
+++ b/pageAction/pageAction.js
@@ -23,15 +23,30 @@
 
 		createActionButtons(
 			document.getElementById("globalActions"),
-			[{
-				name: "disableNotifications",
-				isIcon: true,
-				callback: function(){
-					settings.showNotifications = false;
-					window.close();
+			[
+				{
+					name: "showOptions",
+					isIcon: true,
+					callback: function(){
+						if (browser.runtime && browser.runtime.openOptionsPage){
+							browser.runtime.openOptionsPage();
+						}
+						else {
+							window.open(browser.extension.getURL("options/options.html"), "_blank");
+						}
+					}
+				},
+				{
+					name: "disableNotifications",
+					isIcon: true,
+					callback: function(){
+						settings.showNotifications = false;
+						window.close();
+					}
 				}
-			}],
-			undefined
+			],
+			undefined,
+			true
 		);
 		
 		if (!tabs.length){