diff --git a/config/defaults.yml b/config/defaults.yml
index 93ff98a..ddc3076 100755
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -45,4 +45,4 @@ session_password: asDD3s2@sAdc983#
 mailbox_max_parent_folder_depth: 3
 
 # array of logins which only can login to application, comment it to allow everyone to login
-only_can_logins: [wtodryk]
+only_can_logins: [wojciech@todryk.pl]
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 999e71c..1135ce8 100755
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -163,6 +163,7 @@ pl:
     setup: Konfiguracja
     login: Logowanie
     only_can_logins: Podany identyfikator użytkownika nie uprawnia do korzystania z aplikacji
+    logout: Wyloguj
 
   internal:
     imap_error: Błąd protokołu IMAP
@@ -197,5 +198,4 @@ pl:
     view: Pokaż
     version: Wersja
     set: Ustaw
-    logout: Wyloguj
     no_file_chosen: Nie wybrano żadnego pliku
diff --git a/themes/olive/images/logo_small.png b/themes/olive/images/logo_small.png
index 3263e4c..28b9079 100755
Binary files a/themes/olive/images/logo_small.png and b/themes/olive/images/logo_small.png differ
diff --git a/themes/olive/stylesheets/base.css b/themes/olive/stylesheets/base.css
index 520ad9e..42f711a 100755
--- a/themes/olive/stylesheets/base.css
+++ b/themes/olive/stylesheets/base.css
@@ -84,7 +84,7 @@ body {
 }
 
 #sidebar .block {
-  margin-bottom: 20px;
+  margin-bottom: 10px;
   padding-bottom: 1px;
 }
 
diff --git a/themes/olive/stylesheets/style.css b/themes/olive/stylesheets/style.css
index c87ce20..33c6f50 100755
--- a/themes/olive/stylesheets/style.css
+++ b/themes/olive/stylesheets/style.css
@@ -578,6 +578,7 @@ div.actiongroup {
 
 div.logo {
     text-align: center;
+    margin-bottom: 10px;
 }
 
 div#logo {
diff --git a/themes/olive/views/folders/_list.html.erb b/themes/olive/views/folders/_list.html.erb
index 9211551..dddbefe 100755
--- a/themes/olive/views/folders/_list.html.erb
+++ b/themes/olive/views/folders/_list.html.erb
@@ -15,6 +15,6 @@
 	</ul>
 	<% end %>
 	<br/>
-	<%= raw single_action_onclick('logout','common','power.png',user_logout_path) %>
+	<%= raw single_action_onclick('logout','user','power.png',user_logout_path) %>
 	</div>
 </div>
diff --git a/themes/olive/views/sidebar/_logo.html.erb b/themes/olive/views/sidebar/_logo.html.erb
index f449fb5..1116476 100755
--- a/themes/olive/views/sidebar/_logo.html.erb
+++ b/themes/olive/views/sidebar/_logo.html.erb
@@ -1 +1,3 @@
-<div class="block logo"><img src="<%= current_theme_image_path('logo_small.png')%>" alt="Mailr"/></div>
+<div class="logo">
+<%= link_to image_tag(current_theme_image_path("logo_small.png"),:alt=> t(:mailr,:scope=>:common)), root_path %>
+</div>
diff --git a/themes/olive/views/user/login.html.erb b/themes/olive/views/user/login.html.erb
index 324a4f8..533e2fd 100755
--- a/themes/olive/views/user/login.html.erb
+++ b/themes/olive/views/user/login.html.erb
@@ -35,7 +35,7 @@
 		<div class="group navform wat-cf">
 			<div class="right">
 				<button class="button" type="submit">
-					<img src="<%= current_theme_image_path('key.png')%>" alt="login" /> <%= t(:log_in,:scope=>:common) %>
+					<img src="<%= current_theme_image_path('key.png')%>" alt="login" /> <%= t(:please_login,:scope=>:user) %>
                 </button>
 			</div>
 		</div>
diff --git a/themes/olive/views/user/setup.html.erb b/themes/olive/views/user/setup.html.erb
index 74a3c98..0d8d42e 100755
--- a/themes/olive/views/user/setup.html.erb
+++ b/themes/olive/views/user/setup.html.erb
@@ -13,7 +13,7 @@
 	<%= raw form_field(@user,"first_name",nil,"Joe","") %>
 	<%= raw form_field(@user,"last_name",nil,"Doe","") %>
 	<%= raw form_field(@server,"name",nil,"server.domain","") %>
-	<%= raw form_button('send',"tick.png") %>
+	<%= raw single_action('send','compose',"up.png") %>
 	</form>
 	</div>
 </div>