diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index 9024e39..1db91ae 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 8.2
+
+- Fix creation of new tmux terminal windows
+- Add add-on icon
+- Update welcome logo
+- Fix SSH folder issue with authorized keys
+
 ## 8.1
 
 - Fix for non existing .bash_profile startup error
diff --git a/ssh/config.json b/ssh/config.json
index 0f785f9..f6d15de 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,6 +1,6 @@
 {
   "name": "SSH server",
-  "version": "8.1",
+  "version": "8.2",
   "slug": "ssh",
   "description": "Allows connections over SSH",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/ssh",
diff --git a/ssh/data/.tmux.conf b/ssh/data/.tmux.conf
index 42f3a19..fff27cf 100644
--- a/ssh/data/.tmux.conf
+++ b/ssh/data/.tmux.conf
@@ -1,4 +1,3 @@
-set-option -g default-shell /bin/zsh
 set-option -g default-terminal $TERM
 set-option -g base-index 1
 setw -g pane-base-index 1
diff --git a/ssh/data/motd b/ssh/data/motd
index e6f1ddf..8180c6a 100644
--- a/ssh/data/motd
+++ b/ssh/data/motd
@@ -1,13 +1,11 @@
+ _    _                                         _     _              _   
+| |  | |                          /\           (_)   | |            | |  
+| |__| | ___  _ __ ___   ___     /  \   ___ ___ _ ___| |_ __ _ _ __ | |_ 
+|  __  |/ _ \| '_ ` _ \ / _ \   / /\ \ / __/ __| / __| __/ _` | '_ \| __|
+| |  | | (_) | | | | | |  __/  / ____ \\__ \__ \ \__ \ || (_| | | | | |_ 
+|_|  |_|\___/|_| |_| |_|\___| /_/    \_\___/___/_|___/\__\__,_|_| |_|\__|
+                                                                         
 
-  _    _                 _       
- | |  | |               (_)      
- | |__| | __ _ ___ ___   _  ___  
- |  __  |/ _` / __/ __| | |/ _ \ 
- | |  | | (_| \__ \__ \_| | (_) |
- |_|  |_|\__,_|___/___(_)_|\___/ 
-                                 
-
-
-Our Cli:
+Our command line:
 $ hassio help
 
diff --git a/ssh/data/run.sh b/ssh/data/run.sh
index 93fa248..d5392da 100755
--- a/ssh/data/run.sh
+++ b/ssh/data/run.sh
@@ -9,12 +9,14 @@ bashio::log.info "Initializing add-on for use..."
 if bashio::config.has_value 'authorized_keys'; then
     bashio::log.info "Setup authorized_keys"
 
-    mkdir -p ~/.ssh
+    mkdir -p /data/.ssh
+    chmod 700 /data/.ssh
+    rm -f /data/.ssh/authorized_keys
     while read -r line; do
-        echo "$line" >> ~/.ssh/authorized_keys
+        echo "$line" >> /data/.ssh/authorized_keys
     done <<< "$(bashio::config 'authorized_keys')"
 
-    chmod 600 ~/.ssh/authorized_keys
+    chmod 600 /data/.ssh/authorized_keys
     sed -i s/#PasswordAuthentication.*/PasswordAuthentication\ no/ /etc/ssh/sshd_config
 
     # Unlock account
@@ -103,4 +105,4 @@ WAIT_PIDS+=($!)
 
 # Wait until all is done
 bashio::log.info "SSH add-on is set up and running!"
-wait "${WAIT_PIDS[@]}"
\ No newline at end of file
+wait "${WAIT_PIDS[@]}"
diff --git a/ssh/icon.png b/ssh/icon.png
new file mode 100644
index 0000000..5c98c3f
Binary files /dev/null and b/ssh/icon.png differ