Merge branch 'master' into issue-392

app/components/Layout/components/SidebarCollections.js

@@ -116,6 +116,7 @@ type CollectionLinkProps = {
           key={collection.id}
           to={collection.url}
           icon={<CollectionIcon expanded={expanded} color={collection.color} />}
+          iconColor={collection.color}
         >
           <Flex justify="space-between">
             {collection.name}

app/components/Layout/components/SidebarLink.js

@@ -43,8 +43,10 @@ const StyledNavLink = styled(NavLink)`
   }
 
   &.active {
-    svg {
-      fill: ${activeStyle.color}
+    ${IconWrapper} & {
+      svg {
+        fill: ${({ iconColor }) => (iconColor ? iconColor : activeStyle.color)}
+      }
     }
   }
 `;
@@ -58,6 +60,7 @@ type Props = {
   icon?: React$Element<*>,
   expand?: boolean,
   expandedContent?: React$Element<*>,
+  iconColor?: string,
 };
 
 @observer class SidebarLink extends Component {