diff --git a/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco b/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
index acc4aeff0..0f55e2fd3 100644
--- a/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
+++ b/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
@@ -8,8 +8,12 @@
 
   <p><%- @T('See your tickets from within your favorite calendar by adding the following url to your calendar app.') %></p>
 
-  <h3><%- @T('URL') %></h3>
-  <input class="form-control js-select" readonly value="<%= @baseurl %>/ical/tickets">
+  <h3><label for="calendar-subscription-url"><%- @T('URL') %></label></h3>
+  <div class="form-group">
+    <div class="controls">
+      <input type="url" class="form-control js-select" readonly value="<%= @baseurl %>/ical/tickets" id="calendar-subscription-url">
+    </div>
+  </div>
 
   <h3><%- @T('Subscription Settings') %></h3>
   <table class="settings-list">
diff --git a/app/assets/javascripts/app/views/settings/item.jst.eco b/app/assets/javascripts/app/views/settings/item.jst.eco
index b4b72d923..fa47874eb 100644
--- a/app/assets/javascripts/app/views/settings/item.jst.eco
+++ b/app/assets/javascripts/app/views/settings/item.jst.eco
@@ -2,7 +2,7 @@
   <h2><%- @T( @setting.title ) %></h2>
   <p class="help-text"><%- @RichText( @setting.description ) %></p>
   <div class="horizontal end">
-    <div class="form-item flex"></div>
+    <div class="form-item"></div>
     <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
   </div>
 </form>
\ No newline at end of file
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index c362b42e3..b39960d66 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -1402,6 +1402,14 @@ fieldset > .form-group {
   .form-control {
     min-width: initial;
   }
+
+  .controls {
+    display: block;
+  }
+
+  .controls--button {
+    display: flex;
+  }
 }
 
 .formGroup--standalone .form-control {
@@ -1437,6 +1445,7 @@ textarea,
   display: block;
   padding: 7px 12px;
   width: 100%;
+  min-width: 200px;
   height: 41px;
   font-size: 14px;
   font-weight: normal;
@@ -1649,7 +1658,7 @@ input.has-error {
 }
 
 .controls--button {
-  display: flex;
+  display: inline-flex;
   
   input,
   .form-control {
@@ -3422,6 +3431,10 @@ footer {
     text-transform: initial;
     letter-spacing: 0;
   }
+
+  .controls {
+    width: 100%;
+  }
 }
 
 .sidebar-block {