diff --git a/public/logos/wave-dark.png b/public/logos/wave-dark.png
new file mode 100644
index 00000000..552cf00b
Binary files /dev/null and b/public/logos/wave-dark.png differ
diff --git a/public/logos/wave-logo.png b/public/logos/wave-logo.png
new file mode 100644
index 00000000..a10809fb
Binary files /dev/null and b/public/logos/wave-logo.png differ
diff --git a/src/app/sidebar/sidebar.less b/src/app/sidebar/sidebar.less
index 3325ba08..14c3a77c 100644
--- a/src/app/sidebar/sidebar.less
+++ b/src/app/sidebar/sidebar.less
@@ -22,32 +22,83 @@
     &.collapsed {
         width: 6em;
         min-width: 6em;
-        .arrow-container {
+        .arrow-container, .collapse-button {
             transform: rotate(180deg);
+            margin-top: 20px;
         }
         .contents {
-            opacity: 0;
-            visibility: hidden;
+            margin-top: 26px;
+            
+            .top, .workspaces-item, .middle, .bottom, .separator {
+                pointer-events: none;
+                opacity: 0;
+                visibility: hidden;
+            }
+
+            .logo {
+                display: flex;
+                flex-direction: column;
+                margin-left: 0;
+                justify-content: center;
+                align-items: center;
+
+                .logo-container img {
+                    width: 45px;
+                }
+
+                .collapse-button {
+                    margin-right: 0;
+                }
+            }
         }
         overflow: hidden;
     }
 
     .arrow-container {
         position: absolute;
-        top: 1em;
-        right: 2em;
+        top: 24px;
+        right: 15px;
         width: 1.5em;
         height: 1.5em;
         border-radius: 50%;
         transition: transform 0.3s ease-in-out;
+        z-index: 2;
         svg {
             width: 1.5em;
             height: 1.5em;
         }
     }
 
+    .contents {
+        margin-top: 36px;
+    }
+
+    .logo {
+        margin-left: 14px;
+        display: flex;
+        flex-direction: row;
+
+        .spacer {
+            flex-grow: 1;
+        }
+        
+        img {
+            width: 100px;
+        }
+
+        .collapse-button {
+            transition: transform 0.3s ease-in-out;
+            margin-right: 14px;
+            
+            svg {
+                margin-top: 3px;
+                width: 1.5em;
+                height: 1.5em;
+            }
+        }
+    }
+
     .top {
-        margin-top: 32px;
     }
 
     .separator {
diff --git a/src/app/sidebar/sidebar.tsx b/src/app/sidebar/sidebar.tsx
index 34236457..89e89f73 100644
--- a/src/app/sidebar/sidebar.tsx
+++ b/src/app/sidebar/sidebar.tsx
@@ -195,10 +195,24 @@ class MainSideBar extends React.Component<{}, {}> {
         return (
             <div className={cn("main-sidebar", { collapsed: isCollapsed }, { "is-dev": GlobalModel.isDev })}>
                 <div className="title-bar-drag" />
-                <div className="arrow-container hoverEffect" onClick={this.toggleCollapsed}>
-                    <LeftChevronIcon className="icon" />
-                </div>
                 <div className="contents">
+                    <div className="logo">
+                        <If condition={isCollapsed}>
+                            <div className="logo-container" onClick={this.toggleCollapsed}>
+                                <img src="public/logos/wave-logo.png"/>
+                            </div>
+                        </If>
+                        <If condition={!isCollapsed}>
+                            <div className="logo-container">
+                                <img src="public/logos/wave-dark.png"/>
+                            </div>
+                            <div className="spacer"/>
+                            <div className="collapse-button" onClick={this.toggleCollapsed}>
+                                <LeftChevronIcon className="icon" />
+                            </div>
+                        </If>
+                    </div>
+                    <div className="separator" />
                     <div className="top">
                         <div className="item hoverEffect unselectable" onClick={this.handleHistoryClick}>
                             <HistoryIcon className="icon" />
@@ -209,7 +223,7 @@ class MainSideBar extends React.Component<{}, {}> {
                             <FavoritesIcon className="icon" />
                             Favorites
                             <span className="hotkey">&#x2318;B</span>
-                        </div>  */}
+                            </div>  */}
                         <div className="item hoverEffect unselectable" onClick={this.handleConnectionsClick}>
                             <ConnectionsIcon className="icon" />
                             Connections