diff --git a/migrations/20220215214154_favicon.sql b/migrations/20220215214154_favicon.sql
new file mode 100644
index 0000000..239d77f
--- /dev/null
+++ b/migrations/20220215214154_favicon.sql
@@ -0,0 +1,3 @@
+
+ALTER TABLE application ADD COLUMN favicon Boolean DEFAULT false;
+ALTER TABLE bookmark ADD COLUMN favicon Boolean DEFAULT false;
diff --git a/src/api/applications.rs b/src/api/applications.rs
index 2031171..0da08f9 100644
--- a/src/api/applications.rs
+++ b/src/api/applications.rs
@@ -15,6 +15,7 @@ struct ApiApplication {
     pub application_category_id: Option<i32>,
     pub enable_healthcheck: bool,
     pub healthcheck_status: Option<bool>,
+    pub favicon: bool,
 }
 
 impl From<application::Model> for ApiApplication {
@@ -29,6 +30,7 @@ impl From<application::Model> for ApiApplication {
             application_category_id: model.application_category_id,
             enable_healthcheck: model.enable_healthcheck,
             healthcheck_status: None,
+            favicon: model.favicon,
         }
     }
 }
@@ -65,6 +67,7 @@ pub async fn new_application(
         glyph: Set(data.0.glyph),
         application_category_id: Set(data.0.application_category_id),
         enable_healthcheck: Set(data.0.enable_healthcheck),
+        favicon: Set(data.0.favicon),
     };
     let app = model.insert(&state.db).await?;
     Ok(HttpResponse::Ok().json(app))
@@ -106,6 +109,7 @@ pub async fn update_applications(
                 application_category_id: Set(data.application_category_id),
                 glyph: Set(data.glyph),
                 enable_healthcheck: Set(data.enable_healthcheck),
+                favicon: Set(data.favicon),
             };
             let model = ret.update(&state.db).await?;
             Ok(HttpResponse::Ok().json(model))
@@ -210,6 +214,7 @@ mod tests {
             active: true,
             application_category_id: None,
             enable_healthcheck: false,
+            ..Default::default()
         };
 
         let state = setup_state().await?;
diff --git a/src/api/authorization.rs b/src/api/authorization.rs
index dfd659a..879d0f1 100644
--- a/src/api/authorization.rs
+++ b/src/api/authorization.rs
@@ -49,7 +49,7 @@ pub struct UpdatePasswordRequest {
 }
 
 #[instrument]
-#[post("password")]
+#[put("password")]
 pub async fn update_password(
     state: web::Data<AppState>,
     req: web::Json<UpdatePasswordRequest>,
diff --git a/src/entity/application.rs b/src/entity/application.rs
index 84ac8f8..870eb93 100644
--- a/src/entity/application.rs
+++ b/src/entity/application.rs
@@ -15,6 +15,7 @@ pub struct Model {
     pub glyph: Option<String>,
     pub application_category_id: Option<i32>,
     pub enable_healthcheck: bool,
+    pub favicon: bool,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
@@ -52,6 +53,7 @@ impl Default for Model {
             glyph: Default::default(),
             application_category_id: Default::default(),
             enable_healthcheck: false,
+            favicon: false,
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 1b0904a..e1085cb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -126,7 +126,7 @@ async fn main() {
                             .await;
                     }
                     Ok(res) => {
-                        if st
+                        if *st
                             .healthcheck_status
                             .lock()
                             .await
diff --git a/src/ui/components/ApplicationModal.vue b/src/ui/components/ApplicationModal.vue
index 0e062f3..105f2df 100644
--- a/src/ui/components/ApplicationModal.vue
+++ b/src/ui/components/ApplicationModal.vue
@@ -12,7 +12,8 @@
         <text-field v-model="app.appName" label="Name" required />
         <text-field v-model="app.description" label="Description" />
         <text-field v-model="app.url" label="URL" required />
-        <icon-picker v-model="app.glyph" />
+        <switch-field v-model="app.favicon" label="Use favicon" />
+        <icon-picker v-model="app.glyph" v-if="!app.favicon" />
         <switch-field v-model="app.enableHealthcheck" label="Health check" />
       </form>
     </template>
@@ -84,6 +85,7 @@ export default {
         let resp = await axios.post("/api/applications", {
           active: true,
           enableHealthcheck: !!this.app.enableHealthcheck,
+          favicon: !!this.app.favicon,
           ...this.app,
         });
         if (resp.status == 200) {
diff --git a/src/ui/components/ApplicationTile.vue b/src/ui/components/ApplicationTile.vue
index daf42a7..9e40740 100644
--- a/src/ui/components/ApplicationTile.vue
+++ b/src/ui/components/ApplicationTile.vue
@@ -1,7 +1,7 @@
 <template>
   <div :class="{tile: true, alive: appData.healthcheckStatus === true, dead: appData.healthcheckStatus === false}" @click="click">
-    <font-awesome-icon v-if="appData.glyph" :icon="appData.glyph" size="2x" />
-    <font-awesome-icon v-if="!appData.glyph && appData.healthcheckStatus === false" icon="ban" size="2x" />
+    <font-awesome-icon v-if="appData.glyph && !appData.favicon" :icon="appData.glyph" size="2x" />
+    <img :src="favicon" v-if="appData.favicon" width="30" height="30"/>
     <div class="label">
       <div class="title">{{appData.appName}}</div>
       <div class="description">{{appData.description}}</div>
@@ -12,6 +12,16 @@
 <script>
 export default {
   props: ["appData"],
+  computed: {
+    favicon() {
+      try {
+      const url = new URL(this.appData.url);
+      return `${url.protocol}${url.hostname}/favicon.ico`;
+      } catch  {
+        return "";
+      }
+    }
+  },
   methods: {
     click(e) {
       this.$emit("clicked", e, this.appData);
@@ -19,7 +29,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .tile {
   transition: all 0.5s;
   padding: 16px 25px;
@@ -40,7 +50,7 @@ export default {
   flex: 1;
   text-align: left;
 }
-svg {
+svg, img {
   color: #fff;
   margin-right: 20px;
 }
@@ -52,7 +62,7 @@ svg {
  .tile.alive svg {
    color: #009900;
 }
- .tile.dead svg {
+.tile.dead svg {
    color: #900;
 }
 .title {
@@ -79,4 +89,7 @@ svg {
 .lightMode .tile:hover {
   background-color: rgba(200,200,200, 0.5);
 }
+.tile.dead {
+  background: rgba(50,0,0,0.4);
+}
 </style>
diff --git a/src/ui/components/BookmarkTile.vue b/src/ui/components/BookmarkTile.vue
index 4ac1aaa..38495e3 100644
--- a/src/ui/components/BookmarkTile.vue
+++ b/src/ui/components/BookmarkTile.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="bookmark-tile" @click="click">
-      <font-awesome-icon icon="external-link-alt"/>
+    <font-awesome-icon v-if="!showFavIcon" icon="external-link-alt" size="2x"/>
+    <img v-if="showFavIcon" :src="favicon" @error="faviconError"/>
       {{bookmark.bookmarkName}}
   </div>
 </template>
@@ -8,19 +9,45 @@
 <script>
 export default {
   props: ["bookmark"],
+  data() {
+    return {
+      showFavIcon: true,
+    }
+  },
+  computed: {
+    favicon() {
+      try {
+      const url = new URL(this.bookmark.url);
+      return `${url.protocol}${url.hostname}/favicon.ico`;
+      } catch  {
+        return "";
+      }
+    }
+  },
   methods: {
     click() {
       this.$emit("clicked", this.bookmark);
     },
+    faviconError() {
+      this.showFavIcon = false;
+    }
   },
 };
 </script>
 
-<style>
+<style scoped>
 .bookmark-tile {
   padding: 5px 25px;
   border-radius: 5px;
   transition: all 0.2s;
+  line-height: 20px;
+  display: flex;
+}
+
+.bookmark-tile img, .bookmark-tile svg {
+  margin-right: 20px;
+  width: 20px;
+  height: 20px;
 }
 
 .bookmark-tile, .bookmark-tile svg {
@@ -42,6 +69,4 @@ export default {
   background: rgba(255,255,255,0.25);
   color: #222;
 }
-
-
 </style>
diff --git a/src/ui/components/NewItemTile.vue b/src/ui/components/NewItemTile.vue
index 2972baf..2da52e2 100644
--- a/src/ui/components/NewItemTile.vue
+++ b/src/ui/components/NewItemTile.vue
@@ -14,9 +14,34 @@ export default {
 </script>
 
 <style scoped>
+svg {
+  color: #fff;
+  margin-right: 20px;
+}
+
 .tile.new {
+  transition: all 0.5s;
+  padding: 16px 25px;
+  border-radius: 5px;
+  margin: 5px;
+  cursor: pointer;
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
   background: rgba(0,0,0,0.8);
 }
+.label {
+  font-weight: 900;
+  flex: 1;
+  text-align: left;
+}
+.title {
+  font-weight: bold;
+}
+.tile:hover {
+  transition: all 0.1s;
+  box-shadow: rgba(0, 0, 0, 0.5) 0px 20px 30px -10px;
+}
 .lightMode .tile.new {
   background: rgba(255,255,255,0.8);
 }
diff --git a/src/ui/components/TextField.vue b/src/ui/components/TextField.vue
index 0f75b81..19f0950 100644
--- a/src/ui/components/TextField.vue
+++ b/src/ui/components/TextField.vue
@@ -1,7 +1,7 @@
 <template>
   <form-field>
     <label v-if="label" :class="{error: isError}">{{label}}</label>
-    <input :value="modelValue" ref="field" @input="handleInput" :type="inputType" :class="{error: isError}" />
+    <input :placeholder="placeholder" :value="modelValue" ref="field" @input="handleInput" :type="inputType" :class="{error: isError}" />
   </form-field>
 </template>
 
@@ -9,6 +9,7 @@
 import FormField from "./FormField.vue";
 export default {
   props: {
+    placeholder: String,
     required: Boolean,
     label: String,
     modelValue: String,
diff --git a/src/ui/views/Login.vue b/src/ui/views/Login.vue
index 8d755c5..20ebf02 100644
--- a/src/ui/views/Login.vue
+++ b/src/ui/views/Login.vue
@@ -2,7 +2,8 @@
   <div class="login-wrapper">
     <form @submit.prevent="goLogin">
       <panel>
-        <input v-model="password" type="password" autofocus />
+        <div class="error" v-if="error">{{error}}</div>
+        <input v-model="password" type="password" autofocus @input="resetError"/>
         <button @clicked="goLogin" type="submit">Authenticate</button>
       </panel>
     </form>
@@ -21,15 +22,23 @@ export default {
   data() {
     return {
       password: "",
+      error: ""
     };
   },
   methods: {
+    resetError() {
+      this.error = "";
+    },
     async goLogin() {
       const response = await axios.post("/api/authorize", {
         password: this.password,
       });
-      localStorage.setItem("token", response.data.token);
-      this.$router.push("/");
+      if (response.status == 200) {
+        localStorage.setItem("token", response.data.token);
+        this.$router.push("/");
+      } else {
+        this.error = "Could not authenticate";
+      }
     },
   },
 };
@@ -71,4 +80,13 @@ button:hover {
   box-shadow: rgba(0, 0, 0, 0.25) 0px 14px 28px,
     rgba(0, 0, 0, 0.22) 0px 10px 10px;
 }
+.error {
+  color: #f33;
+  background: #311;
+  border-radius: 5px;
+  margin-bottom: 10px;
+  font-size: 16px;
+  font-weight: bold;
+  padding: 8px 12px;
+}
 </style>>
diff --git a/src/ui/views/Settings.vue b/src/ui/views/Settings.vue
index a89d31b..9c1a266 100644
--- a/src/ui/views/Settings.vue
+++ b/src/ui/views/Settings.vue
@@ -16,7 +16,17 @@
                 <btn label="Update"  @click="updateMode" />
             </div>
         </div>
+        <div class="section">
+            <h1>Password</h1>
+            <h2>Change password</h2>
+            <text-field v-model="password" password placeholder="password" />
+            <text-field v-model="confirmPassword" password placeholder="confirm password" />
+            <div class="actions">
+                <btn :disabled="password !== confirmPassword || !password.length" label="Change Password"  @click="updatePassword" />
+            </div>
+        </div>
         <div class="control-buttons">
+            <btn danger label="Logout" @click="logout" />
             <btn primary label="Back to Dashboard" @click="backClicked" />
         </div>
     </div>
@@ -26,13 +36,16 @@
 import Btn from "../components/Button.vue";
 import SwitchField from "../components/Switch.vue";
 import axios from "axios";
+import TextField from '../components/TextField.vue';
 
 export default {
-    components: { Btn, SwitchField },
+    components: { Btn, SwitchField, TextField },
     data() {
         return {
             file: "",
             darkMode: true,
+            password: "",
+            confirmPassword: "",
         }
     },
     async mounted() {
@@ -51,8 +64,20 @@ export default {
                  mode: this.darkMode ? "dark" : "light"
             });
         },
+        async updatePassword() {
+            const res = await axios.put("/api/password", {
+                password: this.password,
+            });
+            if (res.status === 200) {
+                this.$router.push("/login");
+            }
+        },
         backClicked() {
             this.$router.push("/");
+        },
+        logout() {
+            localStorage.removeItem("token");
+            this.$router.push("/login");
         }
     }
 }
@@ -96,4 +121,7 @@ export default {
     margin-top: 15px;
     text-align: right;
 }
+.control-buttons button  + button {
+    margin-left: 15px;
+}
 </style>