diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b705d91..5c4c3994 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,12 +11,9 @@
 - Fixed the pixelated app icon on the top left of the window.
 - Fixed the blurred tray icon.
 - Fixed that the redundant description appears in the pinned start menu on Windows 7.
-- The main window is now minimized to system tray on close
-- Added Option to toggle minimize/restore on click on system tray icon
 
 #### OS X
 - Fixed that two icons appear on a notification.
-- Added Option to hide Window from dock on close
 
 ### Improvements
 - Added shortcuts
@@ -42,14 +39,18 @@
 - Added the tooltip text for the tray icon in order to show count of unread channels/mantions.
 - Added the option to launch the application on login.
 - Added the option to blink the taskbar icon when a new message has arrived.
+- The main window is now minimized to system tray on close
+- Added Option to toggle minimize/restore on click on system tray icon
 - Added installers (experimental)
 
 #### OS X
 - Added colored badges to the menu icon when there are unread channels/mentions.
+- Added Option to hide Window from dock on close
 
 #### Linux
 - Added the option to show the icon on menu bar. (requires libappindicator1 on Ubuntu)
 - Added the option to launch the application on login.
+- Added Option to hide Window into tray icon on close
 
 
 ## Release v1.2.1 (Beta)
diff --git a/docs/setup.md b/docs/setup.md
index 7f2c5e55..cd00f39a 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -124,7 +124,7 @@ The Settings Page is available from the **File** menu under **Settings** (Click
         This option allows such images to be rendered, but please be careful for security.
    - **Start app on login** (Windows, Linux)
       - This option starts the application when you login.
-   - **Leave app running in notification area when the window is closed** (OS X)
+   - **Leave app running in notification area when the window is closed** (OS X, Linux)
       - This option hides the window from the dock, if the window is closed
    - **Toggle window visibility when clicking on the tray icon** (Windows)
       - If checked, then a click on the system tray icon leads to a toggling of the minimized/maximized state of the window