diff --git a/icons/circleci.svg b/icons/circleci.svg
new file mode 100644
index 000000000..64afbf6f4
--- /dev/null
+++ b/icons/circleci.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="300" height="300" version="1.1" viewBox="0 0 300 300" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <circle cx="150" cy="150" r="30.221" style="fill:#FAFAFA;stroke-width:4.0451"/>
+ <path d="m148.1 23.078c-59.135 0-108.82 40.456-122.92 95.193-.12135.48136-.21331.9872-.21331 1.509 0 3.3372 2.7067 6.0439 6.0439 6.0439h51.172c2.4392 0 4.5204-1.4483 5.4751-3.5316 0 0 .07843-.14441.1027-.21317 10.55-22.766 33.591-38.562 60.328-38.562 36.717 0 66.483 29.762 66.483 66.483 0 36.721-29.758 66.483-66.475 66.483-26.738 0-49.775-15.801-60.328-38.562-.02831-.0728-.1027-.21318-.1027-.21318a6.0231 6.0231 0 0 0 -5.4751 -3.5316h-51.18c-3.3412-.00024-6.0439 2.7065-6.0439 6.0437 0 .52182.08792 1.0276.21331 1.509 14.097 54.738 63.782 95.193 122.92 95.193 70.097 0 126.92-56.829 126.92-126.92 0-70.093-56.825-126.92-126.92-126.92z" style="fill:#FAFAFA;stroke-width:4.0451"/>
+</svg>
diff --git a/icons/circleci_light.svg b/icons/circleci_light.svg
new file mode 100644
index 000000000..4f0b01b34
--- /dev/null
+++ b/icons/circleci_light.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="300" height="300" version="1.1" viewBox="0 0 300 300" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <circle cx="150" cy="150" r="30.221" style="fill:#424242;stroke-width:4.0451"/>
+ <path d="m148.1 23.078c-59.135 0-108.82 40.456-122.92 95.193-.12135.48136-.21331.9872-.21331 1.509 0 3.3372 2.7067 6.0439 6.0439 6.0439h51.172c2.4392 0 4.5204-1.4483 5.4751-3.5316 0 0 .07843-.14441.1027-.21317 10.55-22.766 33.591-38.562 60.328-38.562 36.717 0 66.483 29.762 66.483 66.483 0 36.721-29.758 66.483-66.475 66.483-26.738 0-49.775-15.801-60.328-38.562-.02831-.0728-.1027-.21318-.1027-.21318a6.0231 6.0231 0 0 0 -5.4751 -3.5316h-51.18c-3.3412-.00024-6.0439 2.7065-6.0439 6.0437 0 .52182.08792 1.0276.21331 1.509 14.097 54.738 63.782 95.193 122.92 95.193 70.097 0 126.92-56.829 126.92-126.92 0-70.093-56.825-126.92-126.92-126.92z" style="fill:#424242;stroke-width:4.0451"/>
+</svg>
diff --git a/icons/folder-circleci-open.svg b/icons/folder-circleci-open.svg
new file mode 100644
index 000000000..a7590ca0d
--- /dev/null
+++ b/icons/folder-circleci-open.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.4142" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><metadata><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><path d="m19 20h-15c-1.11 0-2-.9-2-2v-12c0-1.11.89-2 2-2h6l2 2h7c1.097 0 2 .903 2 2h-17v10l2.14-8h17.07l-2.28 8.5c-.23.87-1.01 1.5-1.93 1.5z" fill="#e57373" style="fill:#546e7a"/><g transform="matrix(.049538 0 0 .049538 9.9952 7.3779)"><circle cx="150" cy="150" r="30.221" style="fill:#FAFAFA;stroke-width:4.0451"/><path d="m148.1 23.078c-59.135 0-108.82 40.456-122.92 95.193-.12135.48136-.21331.9872-.21331 1.509 0 3.3372 2.7067 6.0439 6.0439 6.0439h51.172c2.4392 0 4.5204-1.4483 5.4751-3.5316 0 0 .07843-.14441.1027-.21317 10.55-22.766 33.591-38.562 60.328-38.562 36.717 0 66.483 29.762 66.483 66.483s-29.758 66.483-66.475 66.483c-26.738 0-49.775-15.801-60.328-38.562-.02831-.0728-.1027-.21318-.1027-.21318a6.0231 6.0231 0 0 0 -5.4751 -3.5316h-51.18c-3.3412-.00024-6.0439 2.7065-6.0439 6.0437 0 .52182.08792 1.0276.21331 1.509 14.097 54.738 63.782 95.193 122.92 95.193 70.097 0 126.92-56.829 126.92-126.92 0-70.093-56.825-126.92-126.92-126.92z" style="fill:#FAFAFA;stroke-width:4.0451"/></g></svg>
diff --git a/icons/folder-circleci.svg b/icons/folder-circleci.svg
new file mode 100644
index 000000000..1087b08c3
--- /dev/null
+++ b/icons/folder-circleci.svg
@@ -0,0 +1 @@
+<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.4142" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m10 4h-6c-1.11 0-2 .89-2 2v12c0 1.097.903 2 2 2h16c1.097 0 2-.903 2-2v-10c0-1.11-.9-2-2-2h-8l-2-2z" fill="#546e7a" fill-rule="nonzero"/><g transform="matrix(.049538 0 0 .049538 9.9949 7.3777)" fill="#FAFAFA" stroke-width="4.0451"><circle cx="150" cy="150" r="30.221"/><path d="m148.1 23.078c-59.135 0-108.82 40.456-122.92 95.193-.12135.48136-.21331.9872-.21331 1.509 0 3.3372 2.7067 6.0439 6.0439 6.0439h51.172c2.4392 0 4.5204-1.4483 5.4751-3.5316 0 0 .07843-.14441.1027-.21317 10.55-22.766 33.591-38.562 60.328-38.562 36.717 0 66.483 29.762 66.483 66.483s-29.758 66.483-66.475 66.483c-26.738 0-49.775-15.801-60.328-38.562-.02831-.0728-.1027-.21318-.1027-.21318a6.0231 6.0231 0 0 0 -5.4751 -3.5316h-51.18c-3.3412-.00024-6.0439 2.7065-6.0439 6.0437 0 .52182.08792 1.0276.21331 1.509 14.097 54.738 63.782 95.193 122.92 95.193 70.097 0 126.92-56.829 126.92-126.92 0-70.093-56.825-126.92-126.92-126.92z"/></g></svg>
diff --git a/src/icons/fileIcons.ts b/src/icons/fileIcons.ts
index 32f933c68..139f4c628 100644
--- a/src/icons/fileIcons.ts
+++ b/src/icons/fileIcons.ts
@@ -633,5 +633,6 @@ export const fileIcons: FileIcons = {
         { name: 'sequelize', fileNames: ['.sequelizerc'] },
         { name: 'gatsby', fileNames: ['gatsby.config.js'] },
         { name: 'wakatime', fileNames: ['.wakatime-project'], fileExtensions: ['.wakatime-project'], light: true },
+        { name: 'circleci', fileNames: ['circle.yml'], light: true },
     ]
 };
diff --git a/src/icons/folderIcons.ts b/src/icons/folderIcons.ts
index 20628a7cb..fbb1a1d30 100644
--- a/src/icons/folderIcons.ts
+++ b/src/icons/folderIcons.ts
@@ -99,6 +99,7 @@ export const folderIcons: FolderTheme[] = [
             { name: 'folder-import', folderNames: ['import', 'imports', 'imported'] },
             { name: 'folder-export', folderNames: ['export', 'exports', 'exported'] },
             { name: 'folder-wakatime', folderNames: ['wakatime'] },
+            { name: 'folder-circleci', folderNames: ['.circleci'] },
         ]
     },
     { name: 'classic', defaultIcon: { name: 'folder' }, rootFolder: { name: 'folder-root' } },