diff --git a/src/components/Sidebar/index.js b/src/components/Sidebar/index.js
index 792aefd..9fd3811 100644
--- a/src/components/Sidebar/index.js
+++ b/src/components/Sidebar/index.js
@@ -1,5 +1,8 @@
 import { NavLink } from 'react-router-dom';
+import SidebarDownIcon from '../../assets/icons/SidebarDown-icon';
+import HomeIcon from '../../assets/icons/Home-icon';
 import XIcon from '../../assets/icons/X-close-icon';
+import combineClasses from '../../utils/combineCssClasses';
 import styles from './sidebar.module.css';
 
 const items = {
@@ -11,7 +14,15 @@ const items = {
   subs: [
     {
       text: 'Sub links',
-      link: '/',
+      link: '/login',
+    },
+    {
+      text: 'Sub links',
+      link: '/login',
+    },
+    {
+      text: 'Sub links',
+      link: '/login',
     },
     {
       text: 'Sub links',
@@ -19,34 +30,31 @@ const items = {
     },
     {
       text: 'Sub links',
-      link: '/',
-    },
-    {
-      text: 'Sub links',
-      link: '/',
-    },
-    {
-      text: 'Sub links',
-      link: '/',
+      link: '/login',
     },
   ],
 };
 
-const NavGroupItems = ({ list }) => (
-  <div className={styles.sidebarGroup}>
-    <NavLink to={list.title.link}>
-      <div className={styles.sidebarMainItem}>
-        <XIcon />
-        {list.title.text}
+const NavGroupItems = ({ list }) => {
+  return (
+    <div className={styles.sidebarGroup}>
+      <div className={combineClasses(styles.sidebarMainItem)}>
+        <NavLink className={combineClasses(styles.alink, styles.mainItemContent)} to={list.title.link}>
+          <HomeIcon className={styles.mainItemIcon} />
+          <div>{list.title.text}</div>
+        </NavLink>
+        <SidebarDownIcon className={styles.dropdownIcon} />
       </div>
-    </NavLink>
-    {list.subs.map((subLink) => (
-      <NavLink to={subLink.link}>
-        <div className={styles.sidebarSubItem}>{subLink.text}</div>
-      </NavLink>
-    ))}
-  </div>
-);
+      {list.subs.map((subLink, idx) => (
+        <NavLink key={idx} className={styles.alink} to={subLink.link}>
+          {({ isActive }) => (
+            <div className={combineClasses(styles.sidebarSubItem, [isActive, styles.subActive])}>{subLink.text}</div>
+          )}
+        </NavLink>
+      ))}
+    </div>
+  );
+};
 
 export default function Sidebar({ isMobileScreen, isOpen, setOpen }) {
   if (!isMobileScreen && isOpen) {
diff --git a/src/components/Sidebar/sidebar.module.css b/src/components/Sidebar/sidebar.module.css
index d027277..8c31091 100644
--- a/src/components/Sidebar/sidebar.module.css
+++ b/src/components/Sidebar/sidebar.module.css
@@ -10,14 +10,10 @@
 } */
 
 .sidebarBrandingHeader {
-  display: flex;
-  justify-content: space-between;
-  align-items: baseline;
-  padding: 40px 40px 30px 40px;
-}
-
-.closeIcon {
-  font-size: larger;
+  display: grid;
+  padding: 40px 0px 30px 40px;
+  grid-template-columns: auto 40px;
+  align-items: center;
 }
 
 .sidebarBranding {
@@ -30,10 +26,57 @@
 }
 
 .sidebarList {
+  width: 100%;
+}
+
+.sidebarGroup {
 }
 
 .sidebarMainItem {
+  width: 100%;
+  display: grid;
+  align-items: center;
+  grid-template-columns: auto 55px;
+  height: 48px;
+
+  /* background: #007aff; */
+}
+
+.mainItemContent {
+  display: grid;
+  align-items: center;
+  grid-template-columns: 80px auto;
+  height: 100%;
+
+  color: white;
+}
+
+.mainItemIcon {
+  padding-left: 40px;
+  width: auto;
+}
+
+.dropdownIcon {
+  padding-left: 20px;
+  width: auto;
 }
 
 .sidebarSubItem {
+  width: 100%;
+  height: 46px;
+  display: grid;
+  align-items: center;
+  padding-left: 80px;
+
+  color: white;
+}
+
+.alink:visited,
+.alink:link {
+  text-decoration: none;
+}
+
+.subActive {
+  background: #1f282d;
+  color: #007aff !important;
 }