diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 83c79ca..9b44d15 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -34,6 +34,7 @@ configure_file(${DOXYGEN_INPUT_DIR}/doc/doxyfile.in ${DOXYGEN_CONFIGURED_INPUT}
 
 # copy the files needed by the documentation
 configure_file(${DOXYGEN_INPUT_DIR}/doc/doxygen.css ${DOXYGEN_OUTPUT_DIR}/html/doxygen.css COPYONLY)
+configure_file(${DOXYGEN_INPUT_DIR}/doc/searchOverrides.css ${DOXYGEN_OUTPUT_DIR}/html/searchOverrides.css COPYONLY)
 
 # target setup
 add_custom_target(doc ALL
diff --git a/doc/doxyfile.in b/doc/doxyfile.in
index 606409f..e7e1633 100644
--- a/doc/doxyfile.in
+++ b/doc/doxyfile.in
@@ -1896,7 +1896,7 @@ MATHJAX_CODEFILE       =
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-SEARCHENGINE           = NO
+SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a web server instead of a web client using JavaScript. There
diff --git a/doc/doxygen.css b/doc/doxygen.css
index 9c2fc6a..632fbba 100644
--- a/doc/doxygen.css
+++ b/doc/doxygen.css
@@ -1062,18 +1062,26 @@ tr.heading h2 {
     display: table;
 }
 
+.tablist {
+    width: 100%;
+}
+
 .tablist li {
     float: left;
     display: table-cell;
     list-style: none;
 }
 
+#navrow1 .tablist li:last-child {
+    float: right;
+}
+
 #navrow1 {
     border-top: 1px solid #999;
     margin-top: 2em;
 }
 
-#navrow1 .tablist a, #navrow2 .tablist a, #navrow3 .tablist a, #navrow4 .tablist a {
+#navrow1 .tablist a:not(#MSearchClose), #navrow2 .tablist a, #navrow3 .tablist a, #navrow4 .tablist a {
     display: block;
     margin: 8px 0;
     padding: 0 8px;
@@ -1246,7 +1254,7 @@ div.contents ul li {
     width: 24px;
     height: 18px;
     margin-bottom: 4px;
-    background-image:url('ftv2folderopen.png');
+    background-image:url('folderopen.png');
     background-position: 0px -4px;
     background-repeat: repeat-y;
     vertical-align:top;
@@ -1257,7 +1265,7 @@ div.contents ul li {
     width: 24px;
     height: 18px;
     margin-bottom: 4px;
-    background-image:url('ftv2folderclosed.png');
+    background-image:url('folderclosed.png');
     background-position: 0px -4px;
     background-repeat: repeat-y;
     vertical-align:top;
@@ -1268,7 +1276,7 @@ div.contents ul li {
     width: 24px;
     height: 18px;
     margin-bottom: 4px;
-    background-image:url('ftv2doc.png');
+    background-image:url('doc.png');
     background-position: 0px -4px;
     background-repeat: repeat-y;
     vertical-align:top;
diff --git a/doc/header.html b/doc/header.html
index 4ae4788..918d7c6 100644
--- a/doc/header.html
+++ b/doc/header.html
@@ -2,9 +2,20 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>CSFML - C binding of the Simple and Fast Multimedia Library</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+        <meta http-equiv="Content-Type" content="text/html;"/>
+        <meta charset="utf-8"/>
         <!--<link rel='stylesheet' type='text/css' href="http://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic"/>-->
         <link rel="stylesheet" type="text/css" href="doxygen.css" title="default" media="screen,print" />
+        <script type="text/javascript" src="jquery.js"></script>
+        <script type="text/javascript" src="dynsections.js"></script>
+        <link rel="stylesheet" type="text/css" href="search/search.css" />
+        <link rel="stylesheet" type="text/css" href="searchOverrides.css" />        <script type="text/javascript" src="search/searchdata.js"></script>
+        <script type="text/javascript" src="search/search.js"></script>
+        <script type="text/javascript">
+        /* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+          $(document).ready(function() { init_search(); });
+        /* @license-end */
+        </script>
     </head>
     <body>
         <div id="banner-container">
diff --git a/doc/searchOverrides.css b/doc/searchOverrides.css
new file mode 100644
index 0000000..6d37607
--- /dev/null
+++ b/doc/searchOverrides.css
@@ -0,0 +1,45 @@
+/* Override search/search.css rules to adjust seach box placement */
+#MSearchBox {
+    position: relative;
+    display: block;
+    border-radius: 0;
+    box-shadow: none;
+    border-width: 1px;
+    border-color: #BBB;
+    border-style: solid;
+}
+.right #MSearchClose {
+    margin: 0;
+    right: auto;
+}
+#MSearchResultsWindow {
+    background-color: #EAF5DB;
+    border-color: #999;
+}
+#MSearchResults > .SRPage {
+    background-color: #EAF5DB;
+}
+a.SRSymbol {
+    color: rgb(70, 100, 30);
+}
+a.SRSymbol:hover {
+    text-decoration: underline;
+}
+a.SRScope {
+    color: rgb(70, 100, 30);
+}
+a.SRScope:hover {
+    text-decoration: underline;
+}
+#MSearchSelectWindow {
+    background-color: #EAF5DB;
+}
+#MSearchSelectWindow > a.SelectItem {
+    color: #333;
+    text-decoration: none;
+}
+#MSearchSelectWindow > a.SelectItem:hover {
+    color: white;
+    background-color: #8CC841;
+    text-decoration: none;
+}
\ No newline at end of file