diff --git a/modules/webapp/src/main/elm/Page/Login/View.elm b/modules/webapp/src/main/elm/Page/Login/View.elm
index 1ca4a666..748c55d1 100644
--- a/modules/webapp/src/main/elm/Page/Login/View.elm
+++ b/modules/webapp/src/main/elm/Page/Login/View.elm
@@ -83,7 +83,7 @@ view flags model =
                         , div [ class "ui very basic right aligned segment" ]
                             [ text "No account? "
                             , a [ class "ui icon link", Page.href RegisterPage ]
-                                [ i [ class "edit icon" ] []
+                                [ i [ class "user circle outline icon" ] []
                                 , text "Sign up!"
                                 ]
                             ]
diff --git a/modules/webapp/src/main/elm/Page/Register/View.elm b/modules/webapp/src/main/elm/Page/Register/View.elm
index e91b466c..933dc978 100644
--- a/modules/webapp/src/main/elm/Page/Register/View.elm
+++ b/modules/webapp/src/main/elm/Page/Register/View.elm
@@ -14,125 +14,127 @@ view flags model =
         [ div [ class "ui centered grid" ]
             [ div [ class "row" ]
                 [ div [ class "sixteen wide mobile twelve wide tablet six wide computer column" ]
-                    [ h1 [ class "ui cener aligned icon header" ]
-                        [ img
-                            [ class "ui image"
-                            , src (flags.config.docspellAssetPath ++ "/img/logo-96.png")
-                            ]
-                            []
-                        , div [ class "content" ]
-                            [ text "Sign up @ Docspell"
-                            ]
-                        ]
-                    , Html.form
-                        [ class "ui large error form raised segment"
-                        , onSubmit RegisterSubmit
-                        , autocomplete False
-                        ]
-                        [ div [ class "required field" ]
-                            [ label [] [ text "Collective ID" ]
-                            , div [ class "ui left icon input" ]
-                                [ input
-                                    [ type_ "text"
-                                    , autocomplete False
-                                    , onInput SetCollId
-                                    , value model.collId
-                                    , autofocus True
-                                    ]
-                                    []
-                                , i [ class "users icon" ] []
+                    [ div [ class "ui segment register-view" ]
+                        [ h1 [ class "ui cener aligned icon header" ]
+                            [ img
+                                [ class "ui image"
+                                , src (flags.config.docspellAssetPath ++ "/img/logo-96.png")
+                                ]
+                                []
+                            , div [ class "content" ]
+                                [ text "Sign up @ Docspell"
                                 ]
                             ]
-                        , div [ class "required field" ]
-                            [ label [] [ text "User Login" ]
-                            , div [ class "ui left icon input" ]
-                                [ input
-                                    [ type_ "text"
-                                    , autocomplete False
-                                    , onInput SetLogin
-                                    , value model.login
+                        , Html.form
+                            [ class "ui large error form raised segment"
+                            , onSubmit RegisterSubmit
+                            , autocomplete False
+                            ]
+                            [ div [ class "required field" ]
+                                [ label [] [ text "Collective ID" ]
+                                , div [ class "ui left icon input" ]
+                                    [ input
+                                        [ type_ "text"
+                                        , autocomplete False
+                                        , onInput SetCollId
+                                        , value model.collId
+                                        , autofocus True
+                                        ]
+                                        []
+                                    , i [ class "users icon" ] []
                                     ]
-                                    []
-                                , i [ class "user icon" ] []
                                 ]
-                            ]
-                        , div
-                            [ class "required field"
-                            ]
-                            [ label [] [ text "Password" ]
-                            , div [ class "ui left icon action input" ]
-                                [ input
-                                    [ type_ <|
-                                        if model.showPass1 then
-                                            "text"
+                            , div [ class "required field" ]
+                                [ label [] [ text "User Login" ]
+                                , div [ class "ui left icon input" ]
+                                    [ input
+                                        [ type_ "text"
+                                        , autocomplete False
+                                        , onInput SetLogin
+                                        , value model.login
+                                        ]
+                                        []
+                                    , i [ class "user icon" ] []
+                                    ]
+                                ]
+                            , div
+                                [ class "required field"
+                                ]
+                                [ label [] [ text "Password" ]
+                                , div [ class "ui left icon action input" ]
+                                    [ input
+                                        [ type_ <|
+                                            if model.showPass1 then
+                                                "text"
 
-                                        else
-                                            "password"
-                                    , autocomplete False
-                                    , onInput SetPass1
-                                    , value model.pass1
-                                    ]
-                                    []
-                                , i [ class "lock icon" ] []
-                                , button [ class "ui icon button", onClick ToggleShowPass1 ]
-                                    [ i [ class "eye icon" ] []
+                                            else
+                                                "password"
+                                        , autocomplete False
+                                        , onInput SetPass1
+                                        , value model.pass1
+                                        ]
+                                        []
+                                    , i [ class "lock icon" ] []
+                                    , button [ class "ui icon button", onClick ToggleShowPass1 ]
+                                        [ i [ class "eye icon" ] []
+                                        ]
                                     ]
                                 ]
-                            ]
-                        , div
-                            [ class "required field"
-                            ]
-                            [ label [] [ text "Password (repeat)" ]
-                            , div [ class "ui left icon action input" ]
-                                [ input
-                                    [ type_ <|
-                                        if model.showPass2 then
-                                            "text"
+                            , div
+                                [ class "required field"
+                                ]
+                                [ label [] [ text "Password (repeat)" ]
+                                , div [ class "ui left icon action input" ]
+                                    [ input
+                                        [ type_ <|
+                                            if model.showPass2 then
+                                                "text"
 
-                                        else
-                                            "password"
-                                    , autocomplete False
-                                    , onInput SetPass2
-                                    , value model.pass2
-                                    ]
-                                    []
-                                , i [ class "lock icon" ] []
-                                , button [ class "ui icon button", onClick ToggleShowPass2 ]
-                                    [ i [ class "eye icon" ] []
+                                            else
+                                                "password"
+                                        , autocomplete False
+                                        , onInput SetPass2
+                                        , value model.pass2
+                                        ]
+                                        []
+                                    , i [ class "lock icon" ] []
+                                    , button [ class "ui icon button", onClick ToggleShowPass2 ]
+                                        [ i [ class "eye icon" ] []
+                                        ]
                                     ]
                                 ]
-                            ]
-                        , div
-                            [ classList
-                                [ ( "field", True )
-                                , ( "invisible", flags.config.signupMode /= "invite" )
-                                ]
-                            ]
-                            [ label [] [ text "Invitation Key" ]
-                            , div [ class "ui left icon input" ]
-                                [ input
-                                    [ type_ "text"
-                                    , autocomplete False
-                                    , onInput SetInvite
-                                    , model.invite |> Maybe.withDefault "" |> value
+                            , div
+                                [ classList
+                                    [ ( "field", True )
+                                    , ( "invisible", flags.config.signupMode /= "invite" )
                                     ]
-                                    []
-                                , i [ class "key icon" ] []
+                                ]
+                                [ label [] [ text "Invitation Key" ]
+                                , div [ class "ui left icon input" ]
+                                    [ input
+                                        [ type_ "text"
+                                        , autocomplete False
+                                        , onInput SetInvite
+                                        , model.invite |> Maybe.withDefault "" |> value
+                                        ]
+                                        []
+                                    , i [ class "key icon" ] []
+                                    ]
+                                ]
+                            , button
+                                [ class "ui primary button"
+                                , type_ "submit"
+                                ]
+                                [ text "Submit"
                                 ]
                             ]
-                        , button
-                            [ class "ui primary button"
-                            , type_ "submit"
-                            ]
-                            [ text "Submit"
-                            ]
-                        ]
-                    , resultMessage model
-                    , div [ class "ui very basic right aligned segment" ]
-                        [ text "Already signed up? "
-                        , a [ class "ui link", Page.href (LoginPage Nothing) ]
-                            [ i [ class "sign-in icon" ] []
-                            , text "Sign in"
+                        , resultMessage model
+                        , div [ class "ui very basic right aligned segment" ]
+                            [ text "Already signed up? "
+                            , a [ class "ui link", Page.href (LoginPage Nothing) ]
+                                [ i [ class "sign in icon" ] []
+                                , text "Sign in"
+                                ]
                             ]
                         ]
                     ]