diff --git a/vimwiki/style/css/vimwiki.css b/vimwiki/style/css/vimwiki.css
index 69ec81e..439d8d7 100644
--- a/vimwiki/style/css/vimwiki.css
+++ b/vimwiki/style/css/vimwiki.css
@@ -66,7 +66,6 @@ table {
 	font-family: "Lucida Sans Unicode", "Lucida Grande", Sans-Serif;
 	font-size: 12px;
 	background: #fff;
-	/* - pikaday */
 	margin: 45px;
 	width: 480px;
 	border-collapse: collapse;
@@ -77,14 +76,12 @@ th
 	font-size: 14px;
 	font-weight: normal;
 	color: #039;
-	/* - pikaday */
 	padding: 10px 8px;
 	border-bottom: 2px solid #6678b1;
 }
 td
 {
 	color: #669;
-	/* - pikaday */
 	padding: 9px 8px 0px 8px;
 }
 tbody tr:hover td
@@ -122,15 +119,15 @@ del {text-decoration: line-through; color: #777777;}
 	color: #a03020;
 }
 
-.yesterday, .tomorrow {
+.icon-left-open, .icon-right-open, .icon-home, .icon-calendar-empty {
 	color: #EDEDED;
-	font-size: 80px;
+	font-size: 20px;
 	text-decoration: none;
 }
 
-.yesterday:hover, .tomorrow:hover {
+.icon-left-open:hover, .icon-right-open:hover, .icon-home:hover, .icon-calendar-empty:hover {
 	color: #8B8878;
-	font-size: 80px;
+	font-size: 20px;
 	text-decoration: none;
 }
 
diff --git a/vimwiki/style/template.html b/vimwiki/style/template.html
index c2eccb2..b16270e 100644
--- a/vimwiki/style/template.html
+++ b/vimwiki/style/template.html
@@ -16,6 +16,9 @@
 
 		<link rel="stylesheet" href="%root_path%css/pikaday/pikaday.css">
 
+		<link rel="stylesheet" href="%root_path%css/fontello/fontello.css">
+		<link rel="stylesheet" href="%root_path%css/fontello/animation.css">
+
 		<script type="text/javascript" src="%root_path%js/scripts/shBrushScheme.js"></script>
 		<script type="text/javascript" src="%root_path%js/scripts/shBrushTcl_simple.js"></script>
 		<script type="text/javascript" src="%root_path%js/scripts/shBrushBash.js"></script>
@@ -40,35 +43,6 @@
 		<script type="text/javascript" src="%root_path%js/moment.js"></script>
 		<script type="text/javascript" src="%root_path%js/pikaday.js"></script>
 
-		<!-- Ссылки на предыдущую и следующую запись дневника -->
-		<script type="text/javascript">
-		function wikiDiaryLinks() {
-			var date = moment(document.title, "YYYY-MM-DD");
-
-				var prev = date.subtract('days', 1).format('YYYY-MM-DD');
-				var next = date.add('days', 2).format('YYYY-MM-DD');
-
-				document.links["prev"].href = [prev,".html"].join("");
-				document.links["next"].href = [next,".html"].join("");
-
-				document.getElementById("prev").innerHTML = "&#8678";
-				document.getElementById("next").innerHTML = "&#8680";
-		}
-		window.onload = wikiDiaryLinks;
-		</script>
-
-		<script type="text/javascript">
-		<!--
-		function today(){
-			return moment().format('YYYY-MM-DD');
-		}
-		//-->
-		</script>
-
-		<!-- -->
-		<!-- document.getElementById("prev").innerHTML = "&larr;"; -->
-		<!-- document.getElementById("next").innerHTML = "&rarr;"; -->
-
 		<script type="text/javascript" src="%root_path%js/pl/swfobject.js"></script>
 		<script type="text/javascript" src="%root_path%js/pl/1bit.js"></script>
 
@@ -86,11 +60,53 @@
 
 	</head>
 	<body>
-		<div style="text-align: left;  float: left; "><a class="yesterday" href="prev" id="prev"></a></div>
-		<div style="text-align: right; float: right;"><a class="tomorrow"  href="next" id="next"></a></div>
+
+		<!-- Ссылки на предыдущую и следующую запись дневника -->
+		<script type="text/javascript">
+			var date = moment(document.title, "YYYY-MM-DD");
+
+			if (date.format('YYYY') != '0000') {
+				var prev = date.subtract('days', 1).format('YYYY-MM-DD');
+				var next = date.add('days', 2).format('YYYY-MM-DD');
+
+				document.write('<div style="text-align: left;  float: left; " id="icons" class="navigation">');
+				document.write('<a class="icon-left-open" href="' + prev + '.html" id="prev"></a>');
+				document.write('<a class="icon-home" href="%root_path%index.html"></a>');
+				document.write('</div>');
+
+				document.write('<div style="text-align: right;  float: right; " id="icons" class="navigation">');
+				document.write('<a class="icon-calendar-empty" id="datepicker"></a>');
+				document.write('<a class="icon-right-open" href="' + next + '.html" id="prev"></a>');
+				document.write('</div>');
+			}
+
+			new Pikaday(
+			{
+				field:   document.getElementById('datepicker'),
+				trigger: document.getElementById('datepicker'),
+				firstDay: 1,
+				minDate: new Date('2010-11-13'),
+				maxDate: new Date('2015-02-06'),
+				yearRange: [2010,2015],
+				i18n: {
+					previousMonth : 'Предыдущий месяц',
+					nextMonth     : 'Следующий месяц',
+					months        : ['Январь','Февраль','Март','Апрель','Май','Июнь','Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
+					weekdays      : ['Воскресенье','Понедельник','Вторник','Среда','Четверг','Пятница','Суббота'],
+					weekdaysShort : ['Вс','Пн','Вт','Ср','Чт','Пт','Сб']
+				},
+				defaultDate: function() {
+					return moment().format('YYYY-MM-DD');
+				},
+				onSelect: function() {
+					document.location.href = this.getMoment().format('YYYY-MM-DD') + '.html';
+				}
+			});
+		</script> 
 
 		<div class="contents">
 			%content%
 		</div>
+
 	</body>
 </html>
