Merge branch 'develop' into develop

src/themes/theme.scss

@@ -104,7 +104,7 @@
           cursor: pointer;
           background-position: right;
           background-repeat: no-repeat;
-          padding-right: 30px;
+          padding-right: 30px !important;
         }
 
         .both {