diff --git a/app/assets/images/snapcon_logo.png b/app/assets/images/snapcon_logo.png
new file mode 100644
index 00000000..cec0ed9b
Binary files /dev/null and b/app/assets/images/snapcon_logo.png differ
diff --git a/app/assets/stylesheets/osem-navbar.scss b/app/assets/stylesheets/osem-navbar.scss
index c64a15e6..1bdeb223 100644
--- a/app/assets/stylesheets/osem-navbar.scss
+++ b/app/assets/stylesheets/osem-navbar.scss
@@ -34,4 +34,9 @@
     .navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:hover, .navbar-default .navbar-nav>.open>a:focus {
         color: #FFF;
     }
+
+    .navbar-brand img {
+        margin-top: -5px;
+        max-height: 100%;
+    }
 }
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9e27c1a5..4091792d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -185,7 +185,7 @@ module ApplicationHelper
       'OSEM'
     )
     link_to(
-      link_text,
+      image_tag('snapcon_logo.png'),
       root_path,
       class: 'navbar-brand',
       title: 'Open Source Event Manager'
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index e99513d9..9e8c7c4e 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -14,7 +14,7 @@
         %span.icon-bar
         %span.icon-bar
         %span.icon-bar
-      = nav_root_link_for conference
+      = nav_root_link_for(conference)
 
     .collapse.navbar-collapse#main-nav
       - if content_for :splash_nav
@@ -42,33 +42,37 @@
               = link_to(new_registration_path('user')) do
                 %span.fa.fa-heart
                 Sign Up
-          %li.dropdown.visible-desktop
-            %a.dropdown-toggle{"data-toggle" => "dropdown", href: '#'}
-              %span.fa.fa-user
-              Sign In
-              %span.caret
-            .dropdown-menu
-              - if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
-                = form_tag User.ichain_login_url do
-                  = text_field_tag 'username', nil, id: 'user_ichain_email_dd', class: 'form-control', placeholder: 'Username'
-                  = password_field_tag 'password', nil, id: 'user_ichain_password_dd', class: 'form-control', placeholder: 'Password'
-                  %button.btn.btn-success.btn-block Sign in
-              - else
-                %div{style: "padding: 6px"}
-                  = form_tag new_user_session_path, class: 'form-group' do
-                    = text_field_tag 'user[login]', nil, id: 'user_login_dd', class: 'form-control', placeholder: 'Username / E-Mail'
-                    = password_field_tag 'user[password]', nil, id: 'user_password_dd', class: 'form-control', placeholder: 'Password'
-                    %p.text-right
-                      %small
-                        %label{for: 'user_remember_me'} Remember me
-                        = check_box_tag 'user[remember_me]'
-                    %br
-                    %button.btn.btn-success.btn-block Sign in
-                - unless omniauth_configured.empty?
-                  .divider
-                  %h6.text-center
-                    or
-                  = render 'devise/shared/openid_links'
+            %li{class: ""}
+              = link_to(sign_in_path) do
+                %span.fa.fa-user
+                Sign In
+          -# %li.dropdown.visible-desktop
+          -#   %a.dropdown-toggle{"data-toggle" => "dropdown", href: '#'}
+          -#     %span.fa.fa-user
+          -#     Sign In
+          -#     %span.caret
+          -#   .dropdown-menu
+          -#     - if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
+          -#       = form_tag User.ichain_login_url do
+          -#         = text_field_tag 'username', nil, id: 'user_ichain_email_dd', class: 'form-control', placeholder: 'Username'
+          -#         = password_field_tag 'password', nil, id: 'user_ichain_password_dd', class: 'form-control', placeholder: 'Password'
+          -#         %button.btn.btn-success.btn-block Sign in
+          -#     - else
+          -#       %div{style: "padding: 6px"}
+          -#         = form_tag new_user_session_path, class: 'form-group' do
+          -#           = text_field_tag 'user[login]', nil, id: 'user_login_dd', class: 'form-control', placeholder: 'Username / E-Mail'
+          -#           = password_field_tag 'user[password]', nil, id: 'user_password_dd', class: 'form-control', placeholder: 'Password'
+          -#           %p.text-right
+          -#             %small
+          -#               %label{for: 'user_remember_me'} Remember me
+          -#               = check_box_tag 'user[remember_me]'
+          -#           %br
+          -#           %button.btn.btn-success.btn-block Sign in
+          -#       - unless omniauth_configured.empty?
+          -#         .divider
+          -#         %h6.text-center
+          -#           or
+          -#         = render 'devise/shared/openid_links'
                 -# %p.text-right
                 -#   %br
                 -#   %a.small.btn.btn-xs.btn-default{"data-toggle" => "collapse", "data-target" =>  "#navbar-devise-help"}