diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss
index f8525e9daf..8453185ec6 100644
--- a/platform/commonUI/general/res/sass/controls/_controls.scss
+++ b/platform/commonUI/general/res/sass/controls/_controls.scss
@@ -391,6 +391,13 @@ label.checkbox.custom {
 			right: $pagerW + $interiorMargin;
 		}
 	}
+	.l-calendar,
+	.l-time-selects {
+		border-top: 1px solid $colorInteriorBorder
+	}
+	.l-time-selects {
+		line-height: $formInputH;
+	}
 }
 
 /******************************************************** CALENDAR */
diff --git a/platform/commonUI/general/res/sass/forms/_datetime.scss b/platform/commonUI/general/res/sass/forms/_datetime.scss
index 8378fdbabd..dbfacdeb0a 100644
--- a/platform/commonUI/general/res/sass/forms/_datetime.scss
+++ b/platform/commonUI/general/res/sass/forms/_datetime.scss
@@ -19,39 +19,44 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+@mixin complexFieldHolder($myW) {
+	width: $myW + $interiorMargin;
+	input[type="text"] {
+		width: $myW;
+	}
+}
+
 .complex.datetime {
 	span {
 		display: inline-block;
 		margin-right: $interiorMargin;
 	}
-	
+
+/*
 	.field-hints,
 	.fields {
 	}
+
 	
 	.field-hints {
-		
+
 	}
-	
+	*/
+
 	.fields {
 		margin-top: $interiorMarginSm 0;
 		padding: $interiorMarginSm 0;
 	}
 	
 	.date {
-		$myW: 80px;
-		width: $myW + $interiorMargin;
-		input {
-			width: $myW;
-		}
-		
+		@include complexFieldHolder(80px);
+	}
+
+	.time.md {
+		@include complexFieldHolder(60px);
 	}
 	
 	.time.sm {
-		$myW: 40px;
-		width: $myW + $interiorMargin;
-		input {
-			width: $myW;
-		}
+		@include complexFieldHolder(40px);
 	}
 }
\ No newline at end of file
diff --git a/platform/commonUI/general/res/templates/controls/datetime-picker.html b/platform/commonUI/general/res/templates/controls/datetime-picker.html
index 111d5b4201..bca8064b74 100644
--- a/platform/commonUI/general/res/templates/controls/datetime-picker.html
+++ b/platform/commonUI/general/res/templates/controls/datetime-picker.html
@@ -39,35 +39,28 @@
 					<div class="sub">{{cell.dayOfYear}}</div>
 				</li>
 			</ul>
-
-
-			<!--<table>
-				<tr>
-					<th ng-repeat="day in ['Su','Mo','Tu','We','Th','Fr','Sa']">
-						{{day}}
-					</th>
-				</tr>
-				<tr ng-repeat="row in table">
-					<td style="text-align: center;"
-					    ng-repeat="cell in row"
-					    ng-click="select(cell)"
-					    ng-class='{ disabled: !isSelectable(cell), selected: isSelected(cell) }'>
-						<div>{{cell.day}}</div>
-						<div style="font-size: 80%">{{cell.dayOfYear}}</div>
-					</td>
-				</tr>
-			</table>-->
 		</div>
 	</div>
-	<div class="l-time-selects"
-	     ng-repeat="key in ['hours', 'minutes', 'seconds']"
-	     ng-if="options[key]">
-		<div>{{nameFor(key)}}</div>
-		<div class='form-control select'>
-			<select size="1"
-			        ng-model="time[key]"
-			        ng-options="i for i in optionsFor(key)">
-			</select>
+	<div class="l-time-selects complex datetime"
+			ng-show="options">
+		<div class="field-hints">
+			<span class="hint time md"
+				  ng-repeat="key in ['hours', 'minutes', 'seconds']"
+				  ng-if="options[key]">
+				{{nameFor(key)}}
+			</span>
+		</div>
+		<div>
+			<span class="field control time md"
+				  ng-repeat="key in ['hours', 'minutes', 'seconds']"
+				  ng-if="options[key]">
+				<div class='form-control select'>
+					<select size="1"
+							ng-model="time[key]"
+							ng-options="i for i in optionsFor(key)">
+					</select>
+				</div>
+			</span>
 		</div>
 	</div>
 </div>