diff --git a/framer/Material-UI.framerfx/code/IconButton.tsx b/framer/Material-UI.framerfx/code/IconButton.tsx
index e976d8f9bc0bd9..e02795d1725dc4 100644
--- a/framer/Material-UI.framerfx/code/IconButton.tsx
+++ b/framer/Material-UI.framerfx/code/IconButton.tsx
@@ -36,10 +36,10 @@ export const IconButton: React.SFC<Props> = (props: Props) => {
   const { badgeColor, badgeContent, height, icon, iconTheme, width, ...other } = props;
   const IconBadge =
     badgeContent === '' ? (
-      <Icon icon={icon} />
+      <Icon icon={icon} theme={iconTheme} />
     ) : (
       <MuiBadge badgeContent={badgeContent} color={badgeColor}>
-        <Icon icon={icon} />
+        <Icon icon={icon} theme={iconTheme} />
       </MuiBadge>
     );
 
diff --git a/framer/Material-UI.framerfx/code/ListItem.tsx b/framer/Material-UI.framerfx/code/ListItem.tsx
index 2cbafbf1bb9145..959bddc65e1de2 100644
--- a/framer/Material-UI.framerfx/code/ListItem.tsx
+++ b/framer/Material-UI.framerfx/code/ListItem.tsx
@@ -105,7 +105,7 @@ export const ListItem: React.SFC<Props> = (props: Props) => {
     case 'checkbox':
       primary = (
         <MuiListItemIcon>
-          <MuiCheckbox />
+          <MuiCheckbox edge="start" />
         </MuiListItemIcon>
       );
       break;
@@ -120,21 +120,13 @@ export const ListItem: React.SFC<Props> = (props: Props) => {
       );
       break;
     case 'iconButton':
-      secondary = (
-        <MuiListItemIcon>
-          <IconButton icon={secondaryIcon} />
-        </MuiListItemIcon>
-      );
+      secondary = <IconButton icon={secondaryIcon} edge="end" />;
       break;
     case 'checkbox':
-      secondary = (
-        <MuiListItemIcon>
-          <MuiCheckbox />
-        </MuiListItemIcon>
-      );
+      secondary = <MuiCheckbox edge="end" />;
       break;
     case 'switch':
-      secondary = <MuiSwitch />;
+      secondary = <MuiSwitch edge="end" />;
       break;
   }
 
@@ -146,10 +138,8 @@ export const ListItem: React.SFC<Props> = (props: Props) => {
         primary={label}
         secondary={secondaryLabel ? secondaryLabel : undefined}
       />
-      {/* This causes the text to have a bullet. No idea why! */}
-      {/* <MuiListItemSecondaryAction> */}
-      {secondary}
-      {/* </MuiListItemSecondaryAction>  */}
+      {/* MuiListItemSecondaryAction causes the text to have a bullet. No idea why! */}
+      <MuiListItemSecondaryAction>{secondary}</MuiListItemSecondaryAction>
     </MuiListItem>
   );
 };
diff --git a/framer/Material-UI.framerfx/design/document.json b/framer/Material-UI.framerfx/design/document.json
index c47926e51d4282..c814149fd14ddb 100644
--- a/framer/Material-UI.framerfx/design/document.json
+++ b/framer/Material-UI.framerfx/design/document.json
@@ -3269,7 +3269,6 @@
               "badgeColor" : "primary",
               "badgeContent" : "9",
               "icon" : "",
-              "invisible" : false,
               "max" : 99,
               "showZero" : false,
               "theme" : "Filled",
diff --git a/framer/scripts/templates/icon_button.txt b/framer/scripts/templates/icon_button.txt
index da65a6941c9653..62dc1c40122938 100644
--- a/framer/scripts/templates/icon_button.txt
+++ b/framer/scripts/templates/icon_button.txt
@@ -21,10 +21,10 @@ export const «componentName»: React.SFC<Props> = (props: Props) => {
   const { badgeColor, badgeContent, height, icon, iconTheme, width, ...other } = props;
   const IconBadge =
   badgeContent === '' ? (
-    <Icon icon={icon} />
+    <Icon icon={icon} theme={iconTheme} />
   ) : (
     <MuiBadge badgeContent={badgeContent} color={badgeColor}>
-      <Icon icon={icon} />
+      <Icon icon={icon} theme={iconTheme} />
     </MuiBadge>
   );
 
diff --git a/framer/scripts/templates/list_item.txt b/framer/scripts/templates/list_item.txt
index 6499ef09471def..c49713cffe148c 100644
--- a/framer/scripts/templates/list_item.txt
+++ b/framer/scripts/templates/list_item.txt
@@ -35,19 +35,19 @@ const defaultProps: Props =  {
 };
 
 export const «componentName»: React.SFC<Props> = (props: Props) => {
-  const { 
-    height, 
-    imageFile, 
-    imageUrl, 
-    inset, 
-    label, 
-    primaryAction, 
-    primaryIcon, 
-    secondaryAction, 
+  const {
+    height,
+    imageFile,
+    imageUrl,
+    inset,
+    label,
+    primaryAction,
+    primaryIcon,
+    secondaryAction,
     secondaryIcon,
-    secondaryLabel, 
-    width,  
-    ...other 
+    secondaryLabel,
+    width,
+    ...other
   } = props;
 
   let primary = null;
@@ -55,34 +55,44 @@ export const «componentName»: React.SFC<Props> = (props: Props) => {
 
   switch (primaryAction) {
     case 'icon':
-      primary = (<MuiListItemIcon>
-        <Icon icon={primaryIcon} />
-      </MuiListItemIcon>);
+      primary = (
+        <MuiListItemIcon>
+          <Icon icon={primaryIcon} />
+        </MuiListItemIcon>
+      );
       break;
     case 'avatar':
-      primary = (<MuiListItemAvatar><Avatar icon={primaryIcon} imageFile={imageFile} imageUrl={imageUrl}/></MuiListItemAvatar>);
+      primary = (
+        <MuiListItemAvatar>
+          <Avatar icon={primaryIcon} imageFile={imageFile} imageUrl={imageUrl} />
+        </MuiListItemAvatar>
+      );
       break;
     case 'checkbox':
-      primary = (<MuiListItemIcon><MuiCheckbox /></MuiListItemIcon>);
+      primary = (
+        <MuiListItemIcon>
+          <MuiCheckbox edge="start" />
+        </MuiListItemIcon>
+      );
       break;
   }
 
   switch (secondaryAction) {
     case 'icon':
-      secondary = (<MuiListItemIcon>
-        <Icon icon={secondaryIcon} />
-      </MuiListItemIcon>);
+      secondary = (
+        <MuiListItemIcon>
+          <Icon icon={secondaryIcon} />
+        </MuiListItemIcon>
+      );
       break;
     case 'iconButton':
-      secondary = (<MuiListItemIcon>
-        <IconButton icon={secondaryIcon} />
-      </MuiListItemIcon>);
+      secondary = <IconButton icon={secondaryIcon} edge="end" />;
       break;
     case 'checkbox':
-      secondary = (<MuiListItemIcon><MuiCheckbox /></MuiListItemIcon>);
+      secondary = <MuiCheckbox edge="end" />;
       break;
     case 'switch':
-      secondary = (<MuiSwitch />);
+      secondary = <MuiSwitch edge="end" />;
       break;
   }
 
@@ -94,13 +104,11 @@ export const «componentName»: React.SFC<Props> = (props: Props) => {
         primary={label}
         secondary={secondaryLabel ? secondaryLabel : undefined}
       />
-      {/* This causes the text to have a bullet. No idea why! */}
-      {/* <MuiListItemSecondaryAction> */}
-        {secondary}
-      {/* </MuiListItemSecondaryAction>  */}
+      {/* MuiListItemSecondaryAction causes the text to have a bullet. No idea why! */}
+      <MuiListItemSecondaryAction>{secondary}</MuiListItemSecondaryAction>
     </MuiListItem>
   );
-}
+};
 
 «componentName».defaultProps = defaultProps;