diff --git a/plugins/community_track/public/icons/calendar.png b/plugins/community_track/public/icons/calendar.png
new file mode 100644
index 0000000..f6978d7
Binary files /dev/null and b/plugins/community_track/public/icons/calendar.png differ
diff --git a/plugins/community_track/public/style.css b/plugins/community_track/public/style.css
index d13e010..2125a35 100644
--- a/plugins/community_track/public/style.css
+++ b/plugins/community_track/public/style.css
@@ -193,3 +193,9 @@
 .community-track textarea {
   width: 100%;
 }
+
+.formfield input#datepicker-from-date,
+.formfield input#datepicker-to-date {
+  width: 115px;
+  background: url(/plugins/community_track/icons/calendar.png) right center no-repeat;
+}
diff --git a/plugins/community_track/views/cms/community_track_plugin/_step.rhtml b/plugins/community_track/views/cms/community_track_plugin/_step.rhtml
index 31bffbe..b371993 100644
--- a/plugins/community_track/views/cms/community_track_plugin/_step.rhtml
+++ b/plugins/community_track/views/cms/community_track_plugin/_step.rhtml
@@ -4,8 +4,14 @@
 
 <div>
   <%= required f.text_field('name', :size => '64', :maxlength => 150) %>
-  <%= labelled_form_field(_('Start date'), pick_date(:article, :start_date)) %>
-  <%= labelled_form_field(_('End date'), pick_date(:article, :end_date)) %>
+  <%= labelled_form_field(_('Period'), (
+    date_range_field('article[start_date]', 'article[end_date]', @article.start_date, @article.end_date,
+                     '%Y-%m-%d',
+                     { :change_month => true, :change_year => true,
+                       :date_format => 'yy-mm-dd' },
+                     { :size => 14 })
+  )) %>
+
 </div>
 
 <%= labelled_form_field check_box(:article, :hidden) + _('Hidden Step'), '' %>
--
libgit2 0.21.2