diff --git a/app/eventyay/presale/templates/pretixpresale/event/base.html b/app/eventyay/presale/templates/pretixpresale/event/base.html
index b7b3df35a6..8452c69a82 100644
--- a/app/eventyay/presale/templates/pretixpresale/event/base.html
+++ b/app/eventyay/presale/templates/pretixpresale/event/base.html
@@ -36,21 +36,26 @@
         </div>
     {% endif %}
     {% if event.settings.event_logo_image %}
-        <div class="event-logo-img-placement">
-            <img src="{{ event.settings.event_logo_image.url }}" alt="{% translate 'Event logo' %}" class="img-fluid event-logo-image">
+        <div class="container">
+            <div class="event-logo-img-placement">
+                <img src="{{ event.settings.event_logo_image.url }}" alt="{% translate 'Event logo' %}" class="img-fluid event-logo-image">
+            </div>
         </div>
     {% endif %}
     <div class="container page-header-links {% if event.settings.theme_color_background|upper != "#FFFFFF" or event.settings.logo_image_large %}page-header-links-outside{% endif %}">
         {% if event.settings.theme_color_background|upper != "#FFFFFF" or event.settings.logo_image_large %}
             <div class="pull-right header-part flip hidden-print header-content">
-                <nav class="locales" aria-label="{% trans "select language" %}">
-                    {% if event.settings.locales|length > 1 %}
-                        {% for l in languages %}
-                            <a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}{% if request.META.QUERY_STRING %}%3F{{ request.META.QUERY_STRING|urlencode }}{% endif %}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow" lang="{{ l.code }}" hreflang="{{ l.code }}">
-                                {{ l.name_local }}</a>
-                        {% endfor %}
-                    {% endif %}
-                </nav>
+                {% if event.settings.locales|length > 1 %}
+                    <form action="{% url 'presale:locale.set' %}" method="get" class="locales" aria-label="{% trans "select language" %}">
+                        <label for="locale-select" class="sr-only">{% trans "Language" %}</label>
+                        <select id="locale-select" name="locale" onchange="this.form.submit()" class="form-control input-sm">
+                            {% for l in languages %}
+                                <option value="{{ l.code }}" {% if l.code == request.LANGUAGE_CODE %}selected{% endif %}>{{ l.name_local }}</option>
+                            {% endfor %}
+                        </select>
+                        <input type="hidden" name="next" value="{{ request.path }}{% if request.META.QUERY_STRING %}?{{ request.META.QUERY_STRING|urlencode }}{% endif %}">
+                    </form>
+                {% endif %}
                 {% include "pretixpresale/fragment_login_status.html" %}
             </div>
         {% endif %}
@@ -71,12 +76,15 @@
         {% if event.settings.locales|length > 1 %}
             {% if event.settings.theme_color_background|upper == "#FFFFFF" and not event.settings.logo_image_large %}
                 <div class="{% if not event_logo or not event.settings.logo_image_large %}pull-right flip{% endif %} loginbox hidden-print">
-                    <nav class="locales" aria-label="{% trans "select language" %}">
-                        {% for l in languages %}
-                            <a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}{% if request.META.QUERY_STRING %}%3F{{ request.META.QUERY_STRING|urlencode }}{% endif %}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow">
-                                {{ l.name_local }}</a>
-                        {% endfor %}
-                    </nav>
+                    <form action="{% url 'presale:locale.set' %}" method="get" class="locales" aria-label="{% trans "select language" %}">
+                        <label for="locale-select-inline" class="sr-only">{% trans "Language" %}</label>
+                        <select id="locale-select-inline" name="locale" onchange="this.form.submit()" class="form-control input-sm">
+                            {% for l in languages %}
+                                <option value="{{ l.code }}" {% if l.code == request.LANGUAGE_CODE %}selected{% endif %}>{{ l.name_local }}</option>
+                            {% endfor %}
+                        </select>
+                        <input type="hidden" name="next" value="{{ request.path }}{% if request.META.QUERY_STRING %}?{{ request.META.QUERY_STRING|urlencode }}{% endif %}">
+                    </form>
                 </div>
             {% endif %}
         {% endif %}
diff --git a/app/eventyay/presale/templates/pretixpresale/fragment_login_status.html b/app/eventyay/presale/templates/pretixpresale/fragment_login_status.html
index 8a29c21695..1a00114446 100644
--- a/app/eventyay/presale/templates/pretixpresale/fragment_login_status.html
+++ b/app/eventyay/presale/templates/pretixpresale/fragment_login_status.html
@@ -7,7 +7,7 @@
 {{ show_organizer_area|json_script:"show_organizer_area" }}
 {{ 'popover-profile'|json_script:"popover_toggle" }}
 {{ base_path|json_script:"base_path" }}
-<nav class="login-hdr" aria-label="{% translate 'account' %}" style="{% if request.event and request.event.settings.event_logo_image %}margin-right: 18rem{% else %}margin-right: 0{% endif %}">
+<nav class="login-hdr login-hdr--aligned" aria-label="{% translate 'account' %}">
 
     {% if request.user.is_authenticated %}
         <div class="navigation-button">
diff --git a/app/eventyay/presale/templates/pretixpresale/organizers/base.html b/app/eventyay/presale/templates/pretixpresale/organizers/base.html
index cebf33f599..a0ca6a688b 100644
--- a/app/eventyay/presale/templates/pretixpresale/organizers/base.html
+++ b/app/eventyay/presale/templates/pretixpresale/organizers/base.html
@@ -17,12 +17,15 @@
         {% if organizer.settings.theme_color_background|upper != "#FFFFFF" or organizer.settings.organizer_logo_image_large %}
             <div class="container page-header-links">
                 <div class="pull-right header-part flip header-content">
-                    <div class="locales">
-                        {% for l in languages %}
-                            <a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow">
-                                {{ l.name_local }}</a>
-                        {% endfor %}
-                    </div>
+                    <form action="{% url 'presale:locale.set' %}" method="get" class="locales" aria-label="{% trans "select language" %}">
+                        <label for="locale-select-org" class="sr-only">{% trans "Language" %}</label>
+                        <select id="locale-select-org" name="locale" onchange="this.form.submit()" class="form-control input-sm">
+                            {% for l in languages %}
+                                <option value="{{ l.code }}" {% if l.code == request.LANGUAGE_CODE %}selected{% endif %}>{{ l.name_local }}</option>
+                            {% endfor %}
+                        </select>
+                        <input type="hidden" name="next" value="{{ request.path }}{% if request.META.QUERY_STRING %}?{{ request.META.QUERY_STRING|urlencode }}{% endif %}">
+                    </form>
                 </div>
             </div>
         {% endif %}
@@ -47,12 +50,17 @@ <h1><a href="{% eventurl organizer "presale:organizer.index" %}">{{ organizer.na
         </div>
         {% if organizer.settings.locales|length > 1 %}
             {% if organizer.settings.theme_color_background|upper == "#FFFFFF" and not organizer.settings.organizer_logo_image_large %}
-                <div class="{% if not organizer_logo or not organizer.settings.organizer_logo_image_large %}pull-right flip{% endif %} loginbox">
-                    <div class="locales">
-                        {% for l in languages %}
-                            <a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow">
-                                {{ l.name_local }}</a>
-                        {% endfor %}
+                <div class="container">
+                    <div class="{% if not organizer_logo or not organizer.settings.organizer_logo_image_large %}pull-right flip{% endif %} loginbox">
+                        <form action="{% url 'presale:locale.set' %}" method="get" class="locales" aria-label="{% trans "select language" %}">
+                            <label for="locale-select-org-inline" class="sr-only">{% trans "Language" %}</label>
+                            <select id="locale-select-org-inline" name="locale" onchange="this.form.submit()" class="form-control input-sm">
+                                {% for l in languages %}
+                                    <option value="{{ l.code }}" {% if l.code == request.LANGUAGE_CODE %}selected{% endif %}>{{ l.name_local }}</option>
+                                {% endfor %}
+                            </select>
+                            <input type="hidden" name="next" value="{{ request.path }}{% if request.META.QUERY_STRING %}?{{ request.META.QUERY_STRING|urlencode }}{% endif %}">
+                        </form>
                     </div>
                 </div>
             {% endif %}
diff --git a/app/eventyay/static/pretixpresale/scss/_event.scss b/app/eventyay/static/pretixpresale/scss/_event.scss
index e015793166..9a4f07ccdb 100644
--- a/app/eventyay/static/pretixpresale/scss/_event.scss
+++ b/app/eventyay/static/pretixpresale/scss/_event.scss
@@ -7,8 +7,7 @@
         border-bottom: 2px solid $table-border-color;
     }
 
-    &:last-child {
-    }
+    /* removed empty ruleset */
     p  {
         margin-bottom: 0;
     }
@@ -161,13 +160,13 @@ section.front-page {
     top: 0;
 }
 .event-logo-img-placement {
-    margin: 0 12%;
+    margin: 0; /* align with .container gutters */
 }
 .event-logo-image {
     max-height: 140px;
     max-width: 240px;
     width: auto;
-    border-radius: 10px;
+    border-radius: 0; /* keep original image shape */
 }
 
 @media (max-width: 768px) {
@@ -175,7 +174,7 @@ section.front-page {
         max-height: 120px;
         max-width: 120px;
         width: auto;
-        border-radius: 10px;
+        border-radius: 0;
         margin-bottom: 10px;
     }
 }
@@ -232,6 +231,11 @@ section.front-page {
     }
 }
 
+/* Ensure login fragment aligns with container gutters; use modifier class added to fragment */
+.login-hdr--aligned {
+    margin-right: 0 !important;
+}
+
 .subevent-list {
     background-color: white;