diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6eb1ea0..d65786b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [1.1.3](https://github.com/cinnyapp/folds/compare/v1.1.2...v1.1.3) (2023-05-13)
+
+### Bug Fixes
+
+- as types ([#19](https://github.com/cinnyapp/folds/issues/19)) ([0fc2b04](https://github.com/cinnyapp/folds/commit/0fc2b04fa77bae4e1dc0e61a01b0a331416c80a6))
+
 ## [1.1.2](https://github.com/cinnyapp/folds/compare/v1.1.1...v1.1.2) (2023-05-11)
 
 ### Bug Fixes
diff --git a/package-lock.json b/package-lock.json
index 8f066db..196f546 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "folds",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "folds",
-      "version": "1.1.2",
+      "version": "1.1.3",
       "license": "Apache-2.0",
       "dependencies": {
         "@fontsource/inter": "^4.5.12",
diff --git a/package.json b/package.json
index 608dd17..405d633 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "folds",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "author": "Ajay Bura (ajbura)",
   "license": "Apache-2.0",
   "main": "dist/index.js",
diff --git a/src/components/as.tsx b/src/components/as.tsx
index ec2c083..5c3c6f4 100644
--- a/src/components/as.tsx
+++ b/src/components/as.tsx
@@ -1,12 +1,12 @@
 import { ElementType, forwardRef, ReactElement } from "react";
-import { AsComponentProps, RefOfType } from "./types";
+import { ComponentProps, AsProp, RefOfType } from "./types";
 
 export const as = <T extends ElementType, ExtraProps = unknown>(
   fc: (
-    props: Omit<AsComponentProps<T>, keyof ExtraProps> & ExtraProps,
+    props: Omit<ComponentProps<T>, keyof ExtraProps | keyof AsProp<T>> & AsProp<T> & ExtraProps,
     ref: RefOfType<T>
   ) => ReactElement
 ) =>
-  forwardRef(fc) as unknown as <E extends ElementType>(
-    props: Omit<AsComponentProps<E>, keyof ExtraProps> & ExtraProps
+  forwardRef(fc) as unknown as <E extends ElementType = T>(
+    props: Omit<ComponentProps<E>, keyof ExtraProps | keyof AsProp<E>> & AsProp<E> & ExtraProps
   ) => ReactElement;
diff --git a/src/components/icon/Icons.tsx b/src/components/icon/Icons.tsx
index dbe58b7..f7b7823 100644
--- a/src/components/icon/Icons.tsx
+++ b/src/components/icon/Icons.tsx
@@ -12,6 +12,7 @@ export type IconName =
   | "Explore"
   | "Smile"
   | "SmilePlus"
+  | "Leaf"
   | "Sticker"
   | "Delete"
   | "Phone"
@@ -51,6 +52,7 @@ export type IconName =
   | "Eye"
   | "EyeBlind"
   | "Warning"
+  | "Funnel"
   | "Hash"
   | "HashLock"
   | "HashGlobe"
@@ -330,7 +332,22 @@ export const Icons: Record<IconName, IconSrc> = {
         <path d="M24 3L24 5L16 5L16 3L24 3Z" fill="currentColor" />
       </>
     ),
-
+  Leaf: (filled) =>
+    filled ? (
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M4 15V18.9393L2.46967 20.4697L3.53033 21.5303L5.06065 20H9C15.6274 20 21 14.6274 21 8V3H16C9.37258 3 4 8.37258 4 15ZM7.53033 17.5303L16.5303 8.53033L15.4697 7.46967L6.46967 16.4697L7.53033 17.5303Z"
+        fill="currentColor"
+      />
+    ) : (
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M4 18.9393V15C4 8.37258 9.37258 3 16 3H21V8C21 14.6274 15.6274 20 9 20H5.06065L3.53033 21.5303L2.46967 20.4697L4 18.9393ZM5.5 17.4393V15C5.5 9.20101 10.201 4.5 16 4.5H19.5V8C19.5 13.799 14.799 18.5 9 18.5H6.56065L16.5303 8.53033L15.4697 7.46967L5.5 17.4393Z"
+        fill="currentColor"
+      />
+    ),
   Sticker: (filled) =>
     filled ? (
       <>
@@ -1188,19 +1205,19 @@ export const Icons: Record<IconName, IconSrc> = {
     filled ? (
       <>
         <path
-          d="M11 2.04932C5.94668 2.55104 2 6.81459 2 11.9999C2 14.2512 2.74391 16.3287 3.99932 18L11 10.9993V2.04932Z"
+          d="M11.25 2.02783C6.07745 2.41136 2 6.72957 2 12.0001C2 14.236 2.73379 16.3005 3.97368 17.9659L11.25 10.6896V2.02783Z"
           fill="currentColor"
         />
         <path
-          d="M20.0002 18.0006L13 11.0004V2.04932C18.0533 2.55104 22 6.81459 22 11.9999C22 14.2515 21.2559 16.3292 20.0002 18.0006Z"
+          d="M4.95939 19.1015C6.60053 20.7287 8.8027 21.791 11.25 21.9724V12.8109L4.95939 19.1015Z"
           fill="currentColor"
         />
         <path
-          d="M18.6445 19.4734C17.1118 20.8371 15.1567 21.7364 13 21.9506V13.8288L18.6445 19.4734Z"
+          d="M12.75 21.9724C15.1973 21.791 17.3995 20.7287 19.0406 19.1015L12.75 12.8109V21.9724Z"
           fill="currentColor"
         />
         <path
-          d="M11 21.9506C8.84306 21.7364 6.88774 20.8369 5.35489 19.4729L11 13.8278V21.9506Z"
+          d="M20.0263 17.9659L12.75 10.6896V2.02783C17.9226 2.41136 22 6.72958 22 12.0001C22 14.236 21.2662 16.3005 20.0263 17.9659Z"
           fill="currentColor"
         />
       </>
@@ -1208,7 +1225,7 @@ export const Icons: Record<IconName, IconSrc> = {
       <path
         fillRule="evenodd"
         clipRule="evenodd"
-        d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM11 13.1208V20.4418C9.0822 20.217 7.35955 19.3539 6.05029 18.0705L11 13.1208ZM11 10.9995L5.07267 16.9268C4.08244 15.537 3.5 13.8365 3.5 12C3.5 7.64389 6.77683 4.05313 11 3.5582V10.9995ZM13 13.1218V20.4418C14.9175 20.2171 16.64 19.3541 17.9492 18.071L13 13.1218ZM18.9269 16.9274L13 11.0005V3.5582C17.2232 4.05313 20.5 7.64389 20.5 12C20.5 13.8368 19.9174 15.5375 18.9269 16.9274Z"
+        d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM11.25 12.8108V20.4674C9.2171 20.2896 7.38933 19.3963 6.02005 18.0407L11.25 12.8108ZM11.25 10.6894L5.04777 16.8917C4.07268 15.5084 3.5 13.8211 3.5 12C3.5 7.55831 6.90686 3.91233 11.25 3.53263V10.6894ZM12.75 12.8108V20.4674C14.7829 20.2896 16.6107 19.3963 17.9799 18.0407L12.75 12.8108ZM18.9522 16.8917L12.75 10.6895V3.53263C17.0931 3.91233 20.5 7.55831 20.5 12C20.5 13.8211 19.9273 15.5084 18.9522 16.8917Z"
         fill="currentColor"
       />
     ),
@@ -1279,6 +1296,17 @@ export const Icons: Record<IconName, IconSrc> = {
         <rect x="11" y="16" width="2" height="2" fill="currentColor" />
       </>
     ),
+  Funnel: (filled) =>
+    filled ? (
+      <path d="M2 4H22V5.5L14 13.5V21H10V13.5L2 5.5V4Z" fill="currentColor" />
+    ) : (
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M15 12.5L22 5.5V4H2V5.5L9 12.5V21H15V12.5ZM13.5 19.5V11.8787L19.8787 5.5H4.12132L10.5 11.8787V19.5H13.5Z"
+        fill="currentColor"
+      />
+    ),
 
   Hash: () => (
     <path
diff --git a/src/components/types.ts b/src/components/types.ts
index d4eb05a..b5ae3e2 100644
--- a/src/components/types.ts
+++ b/src/components/types.ts
@@ -14,10 +14,8 @@ export type ContainerColor =
 
 export type RefOfType<E extends ElementType> = ComponentPropsWithRef<E>["ref"];
 
-type AsProp<E extends ElementType> = {
+export type AsProp<E extends ElementType> = {
   as?: E;
 };
 
-export type AsComponentProps<E extends ElementType> = PropsWithChildren<
-  ComponentPropsWithRef<E> & AsProp<E>
->;
+export type ComponentProps<E extends ElementType> = PropsWithChildren<ComponentPropsWithRef<E>>;