diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php
index 2a44fbf25..5e6151381 100644
--- a/resources/views/partials/label2-field-definitions.blade.php
+++ b/resources/views/partials/label2-field-definitions.blade.php
@@ -261,13 +261,18 @@
         <h1 class="l2fd-title" style="grid-area: fields-title">Fields</h1>
         <div class="l2fd-list" style="grid-area: fields-list">
             <template x-for="(field, index) in fields">
-                <div 
-                    x-bind:key="'field-' + index" 
+                <div
+                    x-data="{
+                                template: '{{ $template }}'
+                            }"
+                    x-bind:key="'field-' + index"
                     x-bind:class="{
                         'l2fd-listitem': true,
                         'selected': selectedField === field
                     }"
-                    x-on:click="selectedField = field" >
+                    x-bind:style="index < 4 && template === 'DefaultLabel' ? 'background-color:#EEEEEE;' : ''"
+                    x-on:click="selectedField = field"
+                    >
                     <label><span x-text="index+1"></span>: <span x-text="getFieldLabel(field)"></span></label>
                 </div>
             </template>
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 6f3694caf..7db98e258 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -216,7 +216,7 @@
                                     {{ Form::label('label2_fields', trans('admin/settings/general.label2_fields')) }}
                                 </div>
                                 <div class="col-md-9">
-                                    @include('partials.label2-field-definitions', [ 'name' => 'label2_fields', 'value' => old('label2_fields', $setting->label2_fields), 'customFields' => $customFields ])
+                                    @include('partials.label2-field-definitions', [ 'name' => 'label2_fields', 'value' => old('label2_fields', $setting->label2_fields), 'customFields' => $customFields, 'template' => $setting->label2_template])
                                     {!! $errors->first('label2_fields', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                     <p class="help-block">{{ trans('admin/settings/general.label2_fields_help') }}</p>
                                 </div>