diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 60e38022c..a67c3da87 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -8627,17 +8627,15 @@ class SurveyAdminSettings {
 		echo '<legend>'.$lang['srv_activate_duration_2'].' '.Help::display('srv_activity_quotas').'</legend>';
 		echo '<div class="setting_holder">';
 		echo '<span class="setting_title">' . $lang['srv_activate_duration_manual_from'].'</span>';
-		echo '<div class="mock-input-holder">';
-		echo '<input id="startsManual1" type="text" class="large borderless" readonly="true" name="durationStarts" value="' . $starts . '" autocomplete="off"/>';
-		echo '<a id="datepicker-trigger-starts"><span class="faicon calendar_icon normal"></span></a>';
+		echo '<div class="icon_holder">';
+		echo '<input id="startsManual1" type="text" class="large" readonly="true" name="durationStarts" value="' . $starts . '" autocomplete="off"/>';
 		echo '</div>';
 		echo '</div>';
 		
 		echo '<div class="setting_holder">';
 		echo '<span class="setting_title">' . $lang['srv_activate_duration_manual_to'].'</span>';
-		echo '<div class="mock-input-holder">';
-		echo '<input id="expireManual1" type="text" class="large borderless" readonly="true" name="durationExpire" value="' . $expire . '" autocomplete="off"/>';
-		echo '<a id="datepicker-trigger-expire"><span class="faicon calendar_icon normal"></span></a>';
+		echo '<div class="icon_holder">';
+		echo '<input id="expireManual1" type="text" class="large" readonly="true" name="durationExpire" value="' . $expire . '" autocomplete="off"/>';
 		echo '</div>';
 		echo '</div>';
 		
@@ -8649,18 +8647,13 @@ class SurveyAdminSettings {
 		echo '</fieldset>';
 		
 		echo '
-			<script type="text/javascript">
+				<script type="text/javascript">
 				$(document).ready(function () {
-                    $("#startsManual1").datepicker();
-					$("#datepicker-trigger-starts").click(function(){
-						$("#startsManual1").datepicker("show");
-					});
-                    $("#expireManual1").datepicker();
-					$("#datepicker-trigger-expire").click(function(){
-						$("#expireManual1").datepicker("show");
-					});
+                    datepicker("#startsManual1");
+                    datepicker("#expireManual1");
 				});
-			</script>';	
+			</script>';
+
 	}
 	
 	function DisplayNastavitveMaxGlasov() {
diff --git a/admin/survey/script/datepicker.js b/admin/survey/script/datepicker.js
index 797379985..8cfc0c9a5 100644
--- a/admin/survey/script/datepicker.js
+++ b/admin/survey/script/datepicker.js
@@ -17,8 +17,6 @@ function datepicker (selector, event_trigger, datetime) {
 			dateFormat: "dd.mm.yy",
 			showAnim: "slideDown",
 			showOn: "button",
-			/*buttonImage: srv_site_url + "admin/survey/script/calendar/calendar.gif",
-			buttonImageOnly: true,*/
 			buttonText: "",
 			controlType: 'select',
 			oneLine: true,
@@ -42,9 +40,7 @@ function datepicker (selector, event_trigger, datetime) {
 			changeYear: true,
 			dateFormat: "dd.mm.yy",
 			showAnim: "slideDown",
-			showOn: "button",
-			/*buttonImage: srv_site_url + "admin/survey/script/calendar/calendar.gif",*/
-			/*buttonImageOnly: true,*/
+			showOn: "both",
 			buttonText: "",
 			onSelect: function(selected,evnt) {
 				if (event_trigger) {
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index ea011b2f8..fa1a2d531 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5151,6 +5151,18 @@ a.faicon.fa-stack {
   width: 1em;
 }
 
+div.icon_holder {
+  display: flex;
+  flex-direction: row;
+  box-sizing: border-box;
+  align-items: center;
+}
+div.icon_holder span.faicon,
+div.icon_holder a.faicon,
+div.icon_holder button.ui-datepicker-trigger {
+  margin-left: 12px;
+}
+
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
@@ -5857,17 +5869,6 @@ span.faicon.calendar_icon::before {
   content: "\f073";
 }
 
-div.icon_holder {
-  display: flex;
-  flex-direction: row;
-  box-sizing: border-box;
-  align-items: center;
-}
-div.icon_holder span.faicon,
-div.icon_holder a.faicon {
-  margin-left: 12px;
-}
-
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
@@ -7078,6 +7079,19 @@ div.button_holder.inline button {
   margin-left: 16px;
 }
 
+button.ui-datepicker-trigger {
+  cursor: pointer;
+  transition: 0.3s;
+  min-width: auto;
+  color: #1E88E5;
+  border: none;
+  background: none;
+  padding: 0;
+}
+button.ui-datepicker-trigger:hover {
+  color: #1980da;
+}
+
 label {
   cursor: pointer;
   margin-right: 16px;
@@ -7096,11 +7110,6 @@ input[type=text] {
   margin-top: 4px;
   font-family: Source Sans Pro, sans-serif;
 }
-input[type=text].borderless {
-  border: none;
-  border-radius: 0;
-  margin-top: 0;
-}
 input[type=text]#anketa_polnoIme {
   width: 400px;
 }
@@ -7181,21 +7190,6 @@ input.disabled {
   pointer-events: none;
 }
 
-div.mock-input-holder {
-  display: flex;
-  flex-direction: row;
-  box-sizing: border-box;
-  align-items: center;
-  border: 1px solid #C4C4C4;
-  margin-top: 4px;
-  border-radius: 2px;
-  width: 245px;
-}
-div.mock-input-holder span.faicon,
-div.mock-input-holder a.faicon {
-  margin: 0 8px;
-}
-
 fieldset {
   margin-bottom: 32px;
   padding: 32px;
diff --git a/resources/sass/admin_new/basic/icons/icons.scss b/resources/sass/admin_new/basic/icons/icons.scss
index c8cb8def3..d9d3a6a8f 100644
--- a/resources/sass/admin_new/basic/icons/icons.scss
+++ b/resources/sass/admin_new/basic/icons/icons.scss
@@ -50,6 +50,21 @@ a.faicon{
     }
 }
 
+//Wrapper (za ikone desno ob elementih)
+div.icon_holder {
+    display: flex;
+    flex-direction: row;
+    box-sizing: border-box;
+
+    align-items: center;
+
+    span.faicon,
+    a.faicon,
+    button.ui-datepicker-trigger{
+        margin-left: 12px;
+    }
+}
+
 
 @import "radio";
 @import "standard";
diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss
index cc25ff44b..06cf497e5 100644
--- a/resources/sass/admin_new/basic/icons/standard.scss
+++ b/resources/sass/admin_new/basic/icons/standard.scss
@@ -459,8 +459,8 @@ span.faicon.reload_large::before{
 /* CALENDAR */
 span.faicon.calendar_icon::before,
 button.ui-datepicker-trigger::before{
-		font-family: $fontawesome;
-		font-weight: 400;
+	font-family: $fontawesome;
+	font-weight: 400;
         font-size: 16px;
         content: "\f073";
 }
@@ -596,17 +596,3 @@ span.faicon.minus_circle::before{
 span.faicon.calendar_icon::before{
         content: "\f073";
 }
-
-//Wrapper (za ikone desno ob elementih)
-div.icon_holder {
-    display: flex;
-    flex-direction: row;
-    box-sizing: border-box;
-
-    align-items: center;
-
-    span.faicon,
-    a.faicon{
-        margin-left: 12px;
-    }
-}
diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss
index 0815a97c0..fb55ced98 100644
--- a/resources/sass/admin_new/components/form/button.scss
+++ b/resources/sass/admin_new/components/form/button.scss
@@ -111,4 +111,18 @@ div.button_holder {
             margin-left: 16px;
         }
     }
-}
\ No newline at end of file
+}
+
+//Trigger button za koledar
+button.ui-datepicker-trigger {
+	cursor: pointer;
+    transition: 0.3s;
+    min-width: auto;
+	color: $blue;
+    &:hover {
+            color: darken($blue, 3%);
+        }
+	border: none;
+	background: none;
+    padding: 0;
+}
diff --git a/resources/sass/admin_new/components/form/input.scss b/resources/sass/admin_new/components/form/input.scss
index a71e0b500..4b7955b58 100644
--- a/resources/sass/admin_new/components/form/input.scss
+++ b/resources/sass/admin_new/components/form/input.scss
@@ -14,12 +14,6 @@ input {
 
     &[type="text"] {
         border: 1px solid $dark-gray;
-        &.borderless {
-            border: none;
-            border-radius: 0;
-            margin-top: 0;
-        }
-        
         box-sizing: border-box;
         border-radius: 2px;
         width: 245px;
@@ -127,22 +121,3 @@ input {
         pointer-events: none;
     }
 }
-
-// Za prikaz ikon "v" input polju
-div.mock-input-holder {
-    display: flex;
-    flex-direction: row;
-    box-sizing: border-box;
-    align-items: center;
-    
-    border: 1px solid $dark-gray;
-    margin-top: 4px;
-    border-radius: 2px;
-    width: 245px;
-
-    span.faicon,
-    a.faicon{
-        margin: 0 8px;
-    }
-}
-