diff --git a/www/calendar/app-calendar.less b/www/calendar/app-calendar.less
index dc914281f..3fb7f2f6f 100644
--- a/www/calendar/app-calendar.less
+++ b/www/calendar/app-calendar.less
@@ -424,10 +424,7 @@
                 // margin-bottom: 20px;
                 input {
                     width: 80px;
-                    margin-right: 0.3rem;
-                }
-                .fa-plus{
-                    margin-left:0.3rem;
+                    margin-right: 0.5rem;
                 }
             }
         }
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index f917f55fc..c36ae7c48 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1607,10 +1607,10 @@ define([
         ]));
 
         if (config.caretDown) {
-            $button.append(h('i.fa.fa-caret-down'));
+            $button.prepend(h('i.fa.fa-caret-down'));
         }
         if (config.angleDown) {
-            $button.append(h('i.fa.fa-angle-down'));
+            $button.prepend(h('i.fa.fa-angle-down'));
         }
 
         // Menu