diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 35927c92..bfa82354 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -32,7 +32,7 @@
 <div id="wrapper">
   <div id="top-menu">
     <div id="header">
-      <div id="logo"></div>
+      <div id="logo"><%= link_to(h(Setting.app_title), home_path) %></div>
       <div id="top-menu-items">
       <div id="search">
         <%= label_tag("q", l(:label_search), :class => "hidden-for-sighted") %>
diff --git a/public/images/logo_chiliproject.png b/public/images/logo_chiliproject.png
deleted file mode 100644
index a6c7d5c7..00000000
Binary files a/public/images/logo_chiliproject.png and /dev/null differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 7e3e35fa..2adfd8de 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1138,7 +1138,12 @@ a:hover {
         float:left;
         width:200px;
         height:43px;
-	background: url(../images/logo_chiliproject.png) no-repeat 15px;
+   font-size: 3em;
+   padding-left: 15px;
+}
+#logo a, #logo a:hover {
+   color: #FFFFFF;
+   text-decoration: none;
 }
 #top-menu-items {
         float:right;