diff --git a/src/pretix/control/templates/pretixcontrol/base.html b/src/pretix/control/templates/pretixcontrol/base.html
index a87d1ccac..67326e356 100644
--- a/src/pretix/control/templates/pretixcontrol/base.html
+++ b/src/pretix/control/templates/pretixcontrol/base.html
@@ -2,6 +2,7 @@
 {% load staticfiles %}
 {% load i18n %}
 {% load statici18n %}
+{% load eventurl %}
 <!DOCTYPE html>
 <html>
 	<head>
@@ -78,6 +79,22 @@
                             {% endfor %}
                         </ul>
                     </li>
+                    {% if request.event %}
+                        <li>
+                            {% if has_domain and not request.event.live %}
+                                <form action="{% eventurl request.event "presale:event.auth" %}" method="post" target="_blank">
+                                    <input type="hidden" value="{{ new_session }}" name="session">
+                                    <button type="submit" class="btn btn-link" id="button-shop">
+                                       <i class="fa fa-eye"></i> {% trans "Go to shop" %}
+                                    </button>
+                                </form>
+                            {% else %}
+                                <a href="{% eventurl request.event "presale:event.index" %}" title="{% trans "Go to Shop" %}"  target="_blank">
+                                    <i class="fa fa-eye"></i> {% trans "Go to shop" %}
+                                </a>
+                            {% endif %}
+                        </li>
+                    {% endif %}
                 </ul>
                 <ul class="nav navbar-nav navbar-top-links navbar-right">
                     {% for nav in nav_topbar %}
diff --git a/src/pretix/control/templates/pretixcontrol/event/index.html b/src/pretix/control/templates/pretixcontrol/event/index.html
index d8086fe08..af1e9c73c 100644
--- a/src/pretix/control/templates/pretixcontrol/event/index.html
+++ b/src/pretix/control/templates/pretixcontrol/event/index.html
@@ -4,22 +4,9 @@
 {% load staticfiles %}
 {% block title %}{{ request.event.name }}{% endblock %}
 {% block content %}
-    <form action="{% eventurl request.event "presale:event.auth" %}" method="post" target="_blank">
-        <h1>
-            {{ request.event.name }}
-            {% if has_domain and not request.event.live %}
-                <input type="hidden" value="{{ new_session }}" name="session">
-                <button type="submit" class="btn btn-default btn-sm">
-                    {% trans "Go to shop" %}
-                </button>
-            {% else %}
-                <a href="{% eventurl request.event "presale:event.index" %}" class="btn btn-default btn-sm" target="_blank">
-                    {% trans "Go to shop" %}
-                </a>
-            {% endif %}
-        </h1>
-    </form>
-
+<h1>
+    {{ request.event.name }}            
+</h1>
     {% if actions|length > 0 %}
         <div class="panel panel-danger">
             <div class="panel-heading">
diff --git a/src/pretix/static/pretixcontrol/scss/main.scss b/src/pretix/static/pretixcontrol/scss/main.scss
index e5ea14717..6871349e2 100644
--- a/src/pretix/static/pretixcontrol/scss/main.scss
+++ b/src/pretix/static/pretixcontrol/scss/main.scss
@@ -46,6 +46,13 @@ nav.navbar .danger, nav.navbar .danger:hover, nav.navbar .danger:active {
 .nav-pills {
     margin-bottom: 10px;
 }
+
+#button-shop {
+    padding: 15px;
+    min-height: 50px;
+    border: none;
+}
+
 .product-row {
     padding: 10px 0;
 
