diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
index 9f6e7d5..59479ae 100644
--- a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
+++ b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
@@ -23,6 +23,7 @@
 import com.prolificinteractive.materialcalendarview.MaterialCalendarView;
 import com.prolificinteractive.materialcalendarview.OnDateSelectedListener;
 
+import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -235,7 +236,7 @@ public void onClick(View view) {
             yearSimpleDate = new SimpleDateFormat("yyyy", Locale.getDefault());
 
         // Init headers
-        yearHeaderValues.setText(String.valueOf(dateTimeCalendar.get(Calendar.YEAR)));
+        yearHeaderValues.setText(yearSimpleDate.format(dateTimeCalendar.getTime()));
         monthAndDayHeaderValues.setText(dayAndMonthSimpleDate.format(dateTimeCalendar.getTime()));
 
         // Construct TimePicker
@@ -270,7 +271,7 @@ public void onDateSelected(@NonNull MaterialCalendarView widget, @NonNull Calend
                 dateTimeCalendar.set(Calendar.MONTH, calendarDay.getMonth());
                 dateTimeCalendar.set(Calendar.DAY_OF_MONTH, calendarDay.getDay());
                 listPickerYearView.assignCurrentYear(calendarDay.getYear());
-                yearHeaderValues.setText(String.valueOf(calendarDay.getYear()));
+                yearHeaderValues.setText(yearSimpleDate.format(dateTimeCalendar.getTime()));
                 monthAndDayHeaderValues.setText(dayAndMonthSimpleDate.format(currentDate));
             }
         });
@@ -285,7 +286,7 @@ public void onDateSelected(@NonNull MaterialCalendarView widget, @NonNull Calend
             @Override
             public void onYearSelected(View view, int yearPicker) {
                 dateTimeCalendar.set(Calendar.YEAR, yearPicker);
-                yearHeaderValues.setText(String.valueOf(yearPicker));
+                yearHeaderValues.setText(yearSimpleDate.format(dateTimeCalendar.getTime()));
 
                 // Unfortunately, we have lags here and thread isn't a solution :/
                 materialCalendarView.setCurrentDate(dateTimeCalendar.getTime());
diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/TextCircularIndicatorView.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/TextCircularIndicatorView.java
index 11bffbd..ebb8aea 100644
--- a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/TextCircularIndicatorView.java
+++ b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/TextCircularIndicatorView.java
@@ -5,11 +5,9 @@
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.os.Build;
 import android.support.annotation.ColorInt;
-import android.support.annotation.RequiresApi;
+import android.support.v7.widget.AppCompatTextView;
 import android.util.AttributeSet;
-import android.widget.TextView;
 
 import com.kunzisoft.switchdatetime.R;
 
@@ -17,7 +15,7 @@
  * TextView with circular colored background
  * @author JJamet
  */
-public class TextCircularIndicatorView extends TextView {
+public class TextCircularIndicatorView extends AppCompatTextView {
 
     private int mCircleColor = Color.BLUE;
     private Paint mCirclePaint = new Paint();
@@ -35,12 +33,6 @@ public TextCircularIndicatorView(Context context, AttributeSet attrs, int defSty
         init(attrs);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public TextCircularIndicatorView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init(attrs);
-    }
-
     /**
      * Initialize constructor
      * @param attrs
diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/YearPickerAdapter.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/YearPickerAdapter.java
index bf973c9..23cd8f4 100644
--- a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/YearPickerAdapter.java
+++ b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/YearPickerAdapter.java
@@ -8,8 +8,12 @@
 
 import com.kunzisoft.switchdatetime.R;
 
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Adapter for manage elements of ListPickerYearView
@@ -22,6 +26,9 @@ class YearPickerAdapter extends RecyclerView.Adapter<YearPickerAdapter.TextIndic
 
     public static final int UNDEFINED = -1;
 
+    private SimpleDateFormat yearFormat;
+    private Calendar calendar;
+
     private List<Integer> listYears;
     private Integer selectedYear;
     private int positionSelectedYear;
@@ -34,6 +41,8 @@ class YearPickerAdapter extends RecyclerView.Adapter<YearPickerAdapter.TextIndic
     YearPickerAdapter() {
         this.listYears = new ArrayList<>();
         this.selectedYear = UNDEFINED;
+        this.yearFormat = new SimpleDateFormat("yyyy", Locale.getDefault());
+        this.calendar = Calendar.getInstance();
     }
 
     @Override
@@ -62,7 +71,9 @@ public TextIndicatorViewHolder onCreateViewHolder(ViewGroup parent, int viewType
     @Override
     public void onBindViewHolder(TextIndicatorViewHolder holder, int position) {
         Integer currentYear = listYears.get(position);
-        holder.textView.setText(String.valueOf(currentYear));
+
+        calendar.set(Calendar.YEAR, currentYear);
+        holder.textView.setText(yearFormat.format(calendar.getTime()));
 
         if(onClickYearListener != null)
             holder.container.setOnClickListener(new BufferYearClickListener(currentYear, position));
diff --git a/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml b/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml
index 4956222..26c3d59 100644
--- a/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml
+++ b/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml
@@ -16,28 +16,9 @@
   -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:minWidth="@dimen/time_label_min_width"
     android:layout_gravity="center">
-    <View
-        android:id="@+id/center_view"
-        android:layout_width="1dp"
-        android:layout_height="1dp"
-        android:background="#00000000"
-        android:layout_centerInParent="true"
-        android:visibility="invisible"
-        android:importantForAccessibility="no" />
-
-    <TextView
-        android:id="@+id/hours"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/time_placeholder"
-        android:layout_toStartOf="@+id/separator"
-        android:layout_centerVertical="true"
-        android:visibility="invisible"
-        style="@style/Theme.SwitchDateTime.TimeLabelText"
-        android:importantForAccessibility="no" />
 
     <TextView
         android:id="@+id/separator"
@@ -46,10 +27,17 @@
         android:text="@string/time_separator"
         android:paddingLeft="@dimen/separator_padding"
         android:paddingRight="@dimen/separator_padding"
-        android:layout_alignEnd="@+id/center_view"
+        android:layout_centerInParent="true"
+        style="@style/Theme.SwitchDateTime.TimeLabelText" />
+
+    <TextView
+        android:id="@+id/hours"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/time_placeholder"
+        android:layout_toStartOf="@id/separator"
         android:layout_centerVertical="true"
-        style="@style/Theme.SwitchDateTime.TimeLabelText"
-        android:importantForAccessibility="no" />
+        style="@style/Theme.SwitchDateTime.TimeLabelText" />
 
     <TextView
         android:id="@+id/minutes"
@@ -58,16 +46,13 @@
         android:text="@string/time_placeholder"
         android:layout_toEndOf="@+id/separator"
         android:layout_centerVertical="true"
-        android:visibility="invisible"
-        style="@style/Theme.SwitchDateTime.TimeLabelText"
-        android:importantForAccessibility="no" />
+        style="@style/Theme.SwitchDateTime.TimeLabelText" />
 
     <com.kunzisoft.switchdatetime.time.widget.AccessibleTextView
         android:id="@+id/ampm_hitspace"
         android:layout_width="@dimen/ampm_label_size"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentBottom="true"
+        android:layout_centerVertical="true"
         android:layout_alignStart="@+id/ampm_label"
         android:layout_alignEnd="@+id/ampm_label" />
     <TextView
@@ -79,6 +64,5 @@
         android:paddingRight="@dimen/ampm_left_padding"
         android:layout_toEndOf="@+id/minutes"
         android:layout_alignBaseline="@+id/separator"
-        style="@style/Theme.SwitchDateTime.TimeLabelAmPm"
-        android:importantForAccessibility="no" />
+        style="@style/Theme.SwitchDateTime.TimeLabelAmPm" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/switchdatetime/src/main/res/layout/time_header_label.xml b/switchdatetime/src/main/res/layout/time_header_label.xml
index e51db04..f187f31 100644
--- a/switchdatetime/src/main/res/layout/time_header_label.xml
+++ b/switchdatetime/src/main/res/layout/time_header_label.xml
@@ -16,27 +16,10 @@
   -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:minWidth="@dimen/time_label_min_width"
     android:layout_gravity="center">
-    <View
-        android:id="@+id/center_view"
-        android:layout_width="1dp"
-        android:layout_height="1dp"
-        android:background="#00000000"
-        android:layout_centerInParent="true"
-        android:visibility="invisible"
-        android:importantForAccessibility="no" />
-    <TextView
-        android:id="@+id/hours"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/time_placeholder"
-        android:layout_toLeftOf="@+id/separator"
-        android:layout_toStartOf="@+id/separator"
-        android:layout_centerVertical="true"
-        style="@style/Theme.SwitchDateTime.TimeLabelText"
-        android:importantForAccessibility="no" />
+    <!--TODO Accessible elements-->
 
     <TextView
         android:id="@+id/separator"
@@ -45,11 +28,18 @@
         android:text="@string/time_separator"
         android:paddingLeft="@dimen/separator_padding"
         android:paddingRight="@dimen/separator_padding"
-        android:layout_alignRight="@+id/center_view"
-        android:layout_alignEnd="@+id/center_view"
+        android:layout_centerInParent="true"
+        style="@style/Theme.SwitchDateTime.TimeLabelText" />
+
+    <TextView
+        android:id="@+id/hours"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/time_placeholder"
+        android:layout_toLeftOf="@id/separator"
+        android:layout_toStartOf="@id/separator"
         android:layout_centerVertical="true"
-        style="@style/Theme.SwitchDateTime.TimeLabelText"
-        android:importantForAccessibility="no" />
+        style="@style/Theme.SwitchDateTime.TimeLabelText" />
 
     <TextView
         android:id="@+id/minutes"
@@ -59,16 +49,13 @@
         android:layout_toRightOf="@+id/separator"
         android:layout_toEndOf="@+id/separator"
         android:layout_centerVertical="true"
-        android:visibility="invisible"
-        style="@style/Theme.SwitchDateTime.TimeLabelText"
-        android:importantForAccessibility="no" />
+        style="@style/Theme.SwitchDateTime.TimeLabelText" />
 
     <com.kunzisoft.switchdatetime.time.widget.AccessibleTextView
         android:id="@+id/ampm_hitspace"
         android:layout_width="@dimen/ampm_label_size"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentBottom="true"
+        android:layout_centerVertical="true"
         android:layout_alignLeft="@+id/ampm_label"
         android:layout_alignStart="@+id/ampm_label"
         android:layout_alignRight="@+id/ampm_label"
@@ -83,6 +70,5 @@
         android:layout_toRightOf="@+id/minutes"
         android:layout_toEndOf="@+id/minutes"
         android:layout_alignBaseline="@+id/separator"
-        style="@style/Theme.SwitchDateTime.TimeLabelAmPm"
-        android:importantForAccessibility="no" />
+        style="@style/Theme.SwitchDateTime.TimeLabelAmPm" />
 </RelativeLayout>
\ No newline at end of file