diff --git a/APPL/PDA/default.css b/APPL/PDA/default.css
index 3fc6dc9bce..0aed720405 100644
--- a/APPL/PDA/default.css
+++ b/APPL/PDA/default.css
@@ -445,11 +445,15 @@ label.uploadbutton {
     padding: 1px 10px;
     text-align: center;
 }
-div.suggestklikker, i.dateklikker {
+div.suggestklikker, i.dateklikker, i.timeklikker {
     display:inline-block;
     width:0px;
     text-align:center;
     position: relative;
     left: -20px;
     padding: 0.34em 0;
+}
+.ui-input-text input,
+.ui-input-search input {
+    display: inline-block!important;
 }
\ No newline at end of file
diff --git a/APPL/PDA/mobile.js b/APPL/PDA/mobile.js
index 90c34cb9c9..cbd5b0c318 100644
--- a/APPL/PDA/mobile.js
+++ b/APPL/PDA/mobile.js
@@ -19,7 +19,7 @@ $(document).bind("mobileinit", function(){
 });
 $(document).bind("pageinit", function(){
     $("i.dateklikker,i.timeklikker").each(function() {
-        // $(this).appendTo($(this).prev());
+        $(this).appendTo($(this).prev());
     });
 });
 
diff --git a/APPL/Shared/Suggest/suggest.css b/APPL/Shared/Suggest/suggest.css
index ee71bfef58..9e5fb87dcb 100644
--- a/APPL/Shared/Suggest/suggest.css
+++ b/APPL/Shared/Suggest/suggest.css
@@ -79,7 +79,4 @@ i.suggestbusy {
 /* als readonly geen klikker weergeven */
 input.suggestReadOnly + i.suggestklikker {
   display: none
-}
-.fldkp.hasIcon, .fldpers.hasIcon {
-    float: left;
 }
\ No newline at end of file
diff --git a/APPL/Shared/calendar.inc b/APPL/Shared/calendar.inc
index 16d14c5c95..0019ffd301 100644
--- a/APPL/Shared/calendar.inc
+++ b/APPL/Shared/calendar.inc
@@ -167,8 +167,8 @@ function _FCLTcalendar (fieldID, params)
 
   %>
   <input class="flddate<%=!params.readonly&&params.required?" required":""%><%=params.addClass? " " + params.addClass : ""%>" type="<%=params.hidden?"hidden":"text"%>" <%=readotag%> <%=hiddentag%> id="show_<%=fieldID%>" value="<%=iniDate%>" nofollow="<%=params.nofollow? 1 : 0%>">
-<% if (!params.hidden && !params.readonly && !params.mobile) { %>
-  <i class='fa fa-calendar fa-fw dateklikker' onclick='$("#show_<%=fieldID%>").datepicker("show")'></i>
+<% if (!params.hidden && !params.readonly) { %>
+  <i class='fa fa-calendar fa-fw dateklikker' onclick='$("#show_<%=fieldID%>").click().focus()'></i>
 <% } %>
 <%
   if (params.timeField)
@@ -176,7 +176,7 @@ function _FCLTcalendar (fieldID, params)
     <input type="text" step='<%=60*(params.timeStep||15)%>'
            class="fldtime<%=!params.readonly&&params.required?" required":"" + " " + (params.timeClass||"")%><%=params.addClass? " " + params.addClass : ""%>"
            id="time_from_<%=fieldID%>" <%=readotag%> size="5" value="<%=iniTime%>">
-<%   if (!params.readonly && !params.mobile) { %>
+<%   if (!params.readonly) { %>
         <i class='fa fa-clock-o fa-fw timeklikker <%=(params.timeClass||"")%>' onclick='$("#time_from_<%=fieldID%>")[0].click(); FcltMgr.stopPropagation(event);'></i>
 <%   }
    }