diff --git a/src/Services/Misc/FAIconGenerator.php b/src/Services/Misc/FAIconGenerator.php
index 274c778d..b8ee4481 100644
--- a/src/Services/Misc/FAIconGenerator.php
+++ b/src/Services/Misc/FAIconGenerator.php
@@ -34,11 +34,12 @@ class FAIconGenerator
         'fa-file-lines' => ['txt', 'md', 'log', 'rst', 'tex'],
         'fa-file-csv' => ['csv', 'tsv'],
         'fa-file-word' => ['doc', 'docx', 'odt', 'rtf'],
-        'fa-file-zipper' => ['zip', 'rar', 'bz2', 'tar', '7z', 'gz', 'tgz'],
+        'fa-file-zipper' => ['zip', 'rar', 'bz2', 'tar', '7z', 'gz', 'tgz', 'xz', 'txz', 'tbz'],
         'fa-file-audio' => ['mp3', 'wav', 'aac', 'm4a', 'wma', 'ogg', 'flac', 'alac'],
         'fa-file-powerpoint' => ['ppt', 'pptx', 'odp', 'pps', 'key'],
         'fa-file-excel' => ['xls', 'xlr', 'xlsx', 'ods', 'numbers'],
-        'fa-file-code' => ['php', 'xml', 'html', 'js', 'ts', 'htm', 'c', 'cpp', 'json'],
+        'fa-file-code' => ['php', 'xml', 'html', 'js', 'ts', 'htm', 'c', 'cpp', 'json', 'py', 'css', 'yml', 'yaml',
+            'sql', 'sh', 'bat', 'exe', 'dll', 'lib', 'so', 'a', 'o', 'h', 'hpp', 'java', 'class', 'jar', 'rb', 'rbw', 'rake', 'gem',],
         'fa-file-video' => ['webm', 'avi', 'mp4', 'mkv', 'wmv'],
     ];
 
diff --git a/tests/Services/Misc/FAIconGeneratorTest.php b/tests/Services/Misc/FAIconGeneratorTest.php
index 91255f68..63015d7b 100644
--- a/tests/Services/Misc/FAIconGeneratorTest.php
+++ b/tests/Services/Misc/FAIconGeneratorTest.php
@@ -46,10 +46,52 @@ class FAIconGeneratorTest extends WebTestCase
     {
         return [
             ['pdf', 'fa-file-pdf'],
-            ['jpeg', 'fa-file-image'],
-            ['txt', 'fa-file-alt'],
+            ['jpeg','fa-file-image'],
+            ['txt', 'fa-file-lines'],
             ['doc', 'fa-file-word'],
-            ['zip', 'fa-file-archive'],
+            ['zip', 'fa-file-zipper'],
+            ['png', 'fa-file-image'],
+            ['jpg', 'fa-file-image'],
+            ['gif', 'fa-file-image'],
+            ['svg', 'fa-file-image'],
+            ['xls', 'fa-file-excel'],
+            ['xlsx', 'fa-file-excel'],
+            ['ppt', 'fa-file-powerpoint'],
+            ['pptx', 'fa-file-powerpoint'],
+            ['docx', 'fa-file-word'],
+            ['odt', 'fa-file-word'],
+            ['ods', 'fa-file-excel'],
+            ['odp', 'fa-file-powerpoint'],
+            ['py', 'fa-file-code'],
+            ['js', 'fa-file-code'],
+            ['html', 'fa-file-code'],
+            ['css', 'fa-file-code'],
+            ['xml', 'fa-file-code'],
+            ['json', 'fa-file-code'],
+            ['yml', 'fa-file-code'],
+            ['yaml', 'fa-file-code'],
+            ['csv', 'fa-file-csv'],
+            ['sql', 'fa-file-code'],
+            ['sh', 'fa-file-code'],
+            ['bat', 'fa-file-code'],
+            ['exe', 'fa-file-code'],
+            ['dll', 'fa-file-code'],
+            ['lib', 'fa-file-code'],
+            ['so', 'fa-file-code'],
+            ['a', 'fa-file-code'],
+            ['o', 'fa-file-code'],
+            ['class', 'fa-file-code'],
+            ['jar', 'fa-file-code'],
+            ['rar', 'fa-file-zipper'],
+            ['7z', 'fa-file-zipper'],
+            ['tar', 'fa-file-zipper'],
+            ['gz', 'fa-file-zipper'],
+            ['tgz', 'fa-file-zipper'],
+            ['bz2', 'fa-file-zipper'],
+            ['tbz', 'fa-file-zipper'],
+            ['xz', 'fa-file-zipper'],
+            ['txz', 'fa-file-zipper'],
+            ['zip', 'fa-file-zipper'],
             ['php', 'fa-file-code'],
             ['tmp', 'fa-file'],
             ['fgd', 'fa-file'],
@@ -61,7 +103,7 @@ class FAIconGeneratorTest extends WebTestCase
      */
     public function testFileExtensionToFAType(string $ext, string $expected): void
     {
-        $this->assertSame($expected, $this->service->fileExtensionToFAType($ext));
+        $this->assertSame($expected, $this->service->fileExtensionToFAType($ext), 'Failed for extension .'.$ext);
     }
 
     public function testGenerateIconHTML(): void