diff --git a/res.qrc b/res.qrc
index c357773f6..4e53a84a7 100644
--- a/res.qrc
+++ b/res.qrc
@@ -67,6 +67,7 @@
         <file>ui/chatForm/emoteButton.svg</file>
         <file>ui/chatForm/fileButton.svg</file>
         <file>ui/chatForm/screenshotButton.svg</file>
+        <file>ui/chatForm/searchCalendarButton.svg</file>
         <file>ui/chatForm/searchDownButton.svg</file>
         <file>ui/chatForm/searchHideButton.svg</file>
         <file>ui/chatForm/searchSettingsButton.svg</file>
diff --git a/src/widget/form/searchsettingsform.ui b/src/widget/form/searchsettingsform.ui
index 654d2cd9d..f7f91a609 100644
--- a/src/widget/form/searchsettingsform.ui
+++ b/src/widget/form/searchsettingsform.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>473</width>
-    <height>83</height>
+    <height>84</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -52,12 +52,12 @@
        </property>
        <item>
         <property name="text">
-         <string>with the end</string>
+         <string>from the end</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>with the first</string>
+         <string>from the beginning</string>
         </property>
        </item>
        <item>
@@ -82,7 +82,7 @@
      <item>
       <widget class="QPushButton" name="choiceDateButton">
        <property name="text">
-        <string>Choice</string>
+        <string/>
        </property>
       </widget>
      </item>
diff --git a/ui/chatForm/buttons.css b/ui/chatForm/buttons.css
index bef35130e..a556510b8 100644
--- a/ui/chatForm/buttons.css
+++ b/ui/chatForm/buttons.css
@@ -103,10 +103,10 @@ QAbstractButton#searchDownButton
 
 QAbstractButton#choiceDateButton
 {
+    background-image: url(":/ui/chatForm/searchCalendarButton.svg");
     border-radius: 5px;
-    width: 55px;
-    height: 25px;
-    color: #fff
+    width: 45px;
+    height: 35px;
 }
 
 QAbstractButton#startButton
diff --git a/ui/chatForm/searchCalendarButton.svg b/ui/chatForm/searchCalendarButton.svg
new file mode 100644
index 000000000..e0839be6c
--- /dev/null
+++ b/ui/chatForm/searchCalendarButton.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24.34902"
+   height="20.696665"
+   viewBox="0 0 24.34902 20.696665"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="searchCalendarButton.svg"
+   style="enable-background:new">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1194"
+     inkscape:window-height="727"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="11.402803"
+     inkscape:cx="12.17451"
+     inkscape:cy="10.348332"
+     inkscape:window-x="356"
+     inkscape:window-y="158"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient2289"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#6e0000;stop-opacity:1;"
+         offset="0"
+         id="stop2287" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(1136.2519,-82.207318)">
+    <g
+       id="g877"
+       transform="matrix(0.04610001,0,0,0.04610001,-1114.1308,77.270056)"
+       style="fill:#ffffff">
+      <rect
+         ry="15.194334"
+         y="107.09895"
+         x="-43.287827"
+         height="79.375"
+         width="39.6875"
+         id="rect816"
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.33097997;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:3.9000001;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.55504587;paint-order:stroke fill markers" />
+      <path
+         id="rect850"
+         transform="matrix(0.26458333,0,0,0.26458333,-479.85032,216.85036)"
+         d="M 133.22656,-214.80859 C 59.41896,-214.80859 0,-155.38963 0,-81.582031 V 0 h 2000 v -81.582031 c 0,-73.807599 -59.419,-133.226559 -133.2266,-133.226559 z M 0,188.15625 v 963.80855 c 0,73.8076 59.41896,133.2266 133.22656,133.2266 H 1866.7734 c 73.8076,0 133.2266,-59.419 133.2266,-133.2266 V 188.15625 Z"
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99010497;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:3.9000001;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.55504587;paint-order:stroke fill markers"
+         inkscape:connector-curvature="0" />
+      <rect
+         ry="15.194334"
+         y="107.09895"
+         x="-426.93365"
+         height="79.375"
+         width="39.6875"
+         id="rect816-7"
+         style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.33097997;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:3.9000001;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.55504587;paint-order:stroke fill markers;enable-background:new" />
+    </g>
+  </g>
+</svg>
diff --git a/ui/chatForm/searchDownButton.svg b/ui/chatForm/searchDownButton.svg
index e99f985c5..9068ae888 100644
--- a/ui/chatForm/searchDownButton.svg
+++ b/ui/chatForm/searchDownButton.svg
@@ -9,37 +9,35 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="7.0183306mm"
-   height="4.1245208mm"
-   viewBox="0 0 7.0183304 4.1245209"
+   width="26.525974"
+   height="15.58874"
+   viewBox="0 0 26.525974 15.58874"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="searchDownButton.svg">
-  <defs
-     id="defs2" />
+   sodipodi:docname="searchDownButton.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="185.76311"
-     inkscape:cy="-116.1932"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
      inkscape:window-width="1920"
      inkscape:window-height="1015"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="12.817625"
+     inkscape:cx="13.262987"
+     inkscape:cy="7.7943702"
      inkscape:window-x="0"
-     inkscape:window-y="876"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="36"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -60,7 +58,7 @@
     <g
        id="g11"
        style="fill:#ffffff"
-       transform="matrix(0.03267961,0,0,0.03267961,-57.771132,39.897882)">
+       transform="matrix(0.1242249,0,0,0.1242249,-52.303786,36.122025)">
       <rect
          transform="rotate(-44.285246)"
          style="fill:#ffffff;stroke-width:0.36410955"
diff --git a/ui/chatForm/searchHideButton.svg b/ui/chatForm/searchHideButton.svg
index a29b2da47..5b0fb80c3 100644
--- a/ui/chatForm/searchHideButton.svg
+++ b/ui/chatForm/searchHideButton.svg
@@ -9,37 +9,35 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="5.5071211mm"
-   height="5.5071211mm"
-   viewBox="0 0 5.5071209 5.5071212"
+   width="26"
+   height="26"
+   viewBox="0 0 26 26"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="hideButton.svg">
-  <defs
-     id="defs2" />
+   sodipodi:docname="searchHideButton.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="186.40227"
-     inkscape:cy="-38.76831"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
      inkscape:window-width="1920"
      inkscape:window-height="1015"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="9.0769231"
+     inkscape:cx="13"
+     inkscape:cy="13"
      inkscape:window-x="0"
-     inkscape:window-y="876"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="36"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -48,7 +46,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -59,7 +57,7 @@
      transform="translate(59.891963,-41.449704)">
     <g
        id="g30"
-       transform="matrix(0.42362466,0.42362466,-0.42362466,0.42362466,-22.854056,42.277356)"
+       transform="matrix(1.9999999,1.9999999,-1.9999999,1.9999999,114.96993,45.355829)"
        style="fill:#ffffff">
       <rect
          y="41.988605"
diff --git a/ui/chatForm/searchSettingsButton.svg b/ui/chatForm/searchSettingsButton.svg
index 0f69d1d1a..6f498e3f5 100644
--- a/ui/chatForm/searchSettingsButton.svg
+++ b/ui/chatForm/searchSettingsButton.svg
@@ -50,4 +50,4 @@
    id="path2"
    inkscape:connector-curvature="0"
    style="fill:#ffffff;stroke-width:1.44782674" />
-</svg>
\ No newline at end of file
+</svg>
diff --git a/ui/chatForm/searchUpButton.svg b/ui/chatForm/searchUpButton.svg
index d579c81fc..e425ae579 100644
--- a/ui/chatForm/searchUpButton.svg
+++ b/ui/chatForm/searchUpButton.svg
@@ -9,37 +9,35 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="7.0183306mm"
-   height="4.1245208mm"
-   viewBox="0 0 7.0183304 4.1245209"
+   width="26.525974"
+   height="15.58874"
+   viewBox="0 0 26.525974 15.58874"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.2 2405546, 2018-03-11"
-   sodipodi:docname="searchUpButton.svg">
-  <defs
-     id="defs2" />
+   sodipodi:docname="searchUpButton.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="185.76311"
-     inkscape:cy="-116.1932"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
      inkscape:window-width="1920"
      inkscape:window-height="1015"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="12.817625"
+     inkscape:cx="0.81918401"
+     inkscape:cy="7.79437"
      inkscape:window-x="0"
      inkscape:window-y="36"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -56,11 +54,11 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(59.722852,-41.245778)">
+     transform="translate(59.722851,-41.245778)">
     <g
        id="g11"
        style="fill:#ffffff"
-       transform="matrix(0.03267961,0,0,-0.03267961,-57.771132,46.718195)">
+       transform="matrix(0.12336383,0,0,-0.12336383,-52.355211,61.903867)">
       <rect
          transform="rotate(-44.285246)"
          style="fill:#ffffff;stroke-width:0.36410955"