=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html	2015-12-28 14:53:48 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html	2016-01-05 20:54:16 +0000
@@ -6,7 +6,7 @@
                 </th>
                 <th class="" ng-bind="valueLabel">
                 </th>
-                <th class="" ng-if="allowProvidedElsewhereExists[currentStage.id]" ng-bind="providedElsewhereLabel">
+                <th class="form-narrow-column" ng-if="allowProvidedElsewhereExists[currentStage.id]" ng-bind="providedElsewhereLabel">
                 </th>
             </tr>
         </thead>
@@ -225,9 +225,8 @@
                         </div>
                         <div ng-switch-when="TRUE_ONLY">
                             <div class="hideInPrint">
-                                <input type="checkbox"     
-                                   class="form-control"
-                                   ng-class="getInputNotifcationClass(prStDe.dataElement.id,false, currentEvent)"
+                                <input type="checkbox"
+                                   class="form-control-checkbox"
                                    ng-model="currentEvent[prStDe.dataElement.id]"                                                               
                                    ng-required={{prStDe.compulsory}} 
                                    ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed || assignedFields[currentEvent.event][prStDe.dataElement.id]" 
@@ -290,10 +289,10 @@
                     </div>                    
                 </ng-form>                
             </td>
-            <td ng-if="allowProvidedElsewhereExists[currentStage.id]">                
-                <div class="align-center" ng-show="prStDe.allowProvidedElsewhere">
+            <td class="form-narrow-column" ng-if="allowProvidedElsewhereExists[currentStage.id]">                
+                <div ng-show="prStDe.allowProvidedElsewhere">
                     <input type="checkbox" 
-                           class="form-control"
+                           class="form-control-checkbox"
                            ng-model="currentEvent.providedElsewhere[prStDe.dataElement.id]" 
                            ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed" 
                            ng-change="saveDatavalueLocation(prStDe)"/>                
@@ -317,7 +316,7 @@
                             </th>
                             <th class="" ng-bind="valueLabel">
                             </th>
-                            <th class="" ng-if="allowProvidedElsewhereExists[currentStage.id]" ng-bind="providedElsewhereLabel">
+                            <th class="form-narrow-column" class="" ng-if="allowProvidedElsewhereExists[currentStage.id]" ng-bind="providedElsewhereLabel">
                             </th>
                         </tr>
                     </thead>
@@ -507,9 +506,8 @@
                                         </div>
                                         <div ng-switch-when="TRUE_ONLY">
                                             <div class="hideInPrint">
-                                                <input type="checkbox"          
-                                                   class="form-control"
-                                                   ng-class="getInputNotifcationClass(prStDes[de.dataElement.id].dataElement.id,false, currentEvent)"
+                                                <input type="checkbox"
+                                                   class="form-control-checkbox"
                                                    ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]"                                                               
                                                    ng-required={{prStDes[de.dataElement.id].compulsory}} 
                                                    ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed || assignedFields[currentEvent.event][de.dataElement.id]" 
@@ -517,7 +515,7 @@
                                                    name="foo"/>
                                             </div>                                            
                                             <div class="not-for-screen">
-                                                <input type="checkbox" class="form-control" ng-checked={{currentEvent[prStDes[de.dataElement.id].dataElement.id]}}>
+                                                <input type="checkbox" class="form-control-checkbox" ng-checked={{currentEvent[prStDes[de.dataElement.id].dataElement.id]}}>
                                             </div>
                                         </div>
                                         <div ng-switch-when="LONG_TEXT">
@@ -578,10 +576,10 @@
                                     </div>    
                                 </ng-form>                                
                             </td>
-                            <td ng-if="allowProvidedElsewhereExists[currentStage.id]">                
-                                <div class="align-center" ng-show="prStDes[de.dataElement.id].allowProvidedElsewhere">
+                            <td class="form-narrow-column" ng-if="allowProvidedElsewhereExists[currentStage.id]">                
+                                <div ng-show="prStDes[de.dataElement.id].allowProvidedElsewhere">
                                     <input type="checkbox" 
-                                           class="form-control"
+                                           class="form-control-checkbox"
                                            ng-model="currentEvent.providedElsewhere[prStDes[de.dataElement.id].dataElement.id]"
                                            ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed" 
                                            ng-change="saveDatavalueLocation(prStDes[de.dataElement.id])"/>                

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2016-01-01 19:29:44 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2016-01-05 20:54:16 +0000
@@ -816,6 +816,7 @@
     -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
     transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
 }
+
 .form-control-inline {
     color: #555;
     padding: 6px 6px;
@@ -830,7 +831,6 @@
     transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
 }
 
-
 .form-control-program {    
     width: 40%;
     height: 34px;
@@ -857,18 +857,23 @@
     -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 8px rgba(102,175,233,0.6);
     box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 8px rgba(102,175,233,0.6)
 }
+
 .form-control-program:-moz-placeholder {
     color: #999
 }
+
 .form-control-program::-moz-placeholder {
     color: #999
 }
+
 .form-control-program:-ms-input-placeholder {
     color: #999
 }
+
 .form-control-program::-webkit-input-placeholder {
     color: #999
 }
+
 .form-control-program[disabled], .form-control-program[readonly], fieldset[disabled] .form-control-program {
     cursor: not-allowed;
     background-color: #eee
@@ -880,18 +885,23 @@
     -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 8px rgba(102,175,233,0.6);
     box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 8px rgba(102,175,233,0.6)
 }
+
 .form-control-inline:-moz-placeholder {
     color: #999
 }
+
 .form-control-inline::-moz-placeholder {
     color: #999
 }
+
 .form-control-inline:-ms-input-placeholder {
     color: #999
 }
+
 .form-control-inline::-webkit-input-placeholder {
     color: #999
 }
+
 .form-control-inline[disabled], .form-control-inline[readonly], fieldset[disabled] .form-control-inline {
     cursor: not-allowed;
     background-color: #eee
@@ -917,6 +927,17 @@
     transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
 }
 
+.form-control-checkbox {
+    height: 24px;
+    width: 24px;
+    padding-top: 3px;
+    padding-bottom: 3px;
+}
+
+.form-narrow-column {
+    width: 80px;
+}
+
 .underline {
     text-decoration: underline;
 }