LinwoodDev · CodeDoctorDE · Aug 29, 2026 · Aug 27, 2026
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
@@ -1,6 +1,9 @@
 name: Dart quality
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
 
 permissions:
   contents: read

diff --git a/app/fonts/Comfortaa-Bold.ttf b/app/fonts/Comfortaa-Bold.ttf
diff --git a/app/fonts/Comfortaa-Light.ttf b/app/fonts/Comfortaa-Light.ttf
diff --git a/app/fonts/Comfortaa-Medium.ttf b/app/fonts/Comfortaa-Medium.ttf
diff --git a/app/fonts/Comfortaa-Regular.ttf b/app/fonts/Comfortaa-Regular.ttf
diff --git a/app/fonts/Comfortaa-SemiBold.ttf b/app/fonts/Comfortaa-SemiBold.ttf
diff --git a/app/fonts/Comfortaa-Variable.ttf b/app/fonts/Comfortaa-Variable.ttf
diff --git a/app/fonts/NotoSansArabic-Black.ttf b/app/fonts/NotoSansArabic-Black.ttf
diff --git a/app/fonts/NotoSansArabic-Bold.ttf b/app/fonts/NotoSansArabic-Bold.ttf
diff --git a/app/fonts/NotoSansArabic-ExtraLight.ttf b/app/fonts/NotoSansArabic-ExtraLight.ttf
diff --git a/app/fonts/NotoSansArabic-Light.ttf b/app/fonts/NotoSansArabic-Light.ttf
diff --git a/app/fonts/NotoSansArabic-Medium.ttf b/app/fonts/NotoSansArabic-Medium.ttf
diff --git a/app/fonts/NotoSansArabic-Regular.ttf b/app/fonts/NotoSansArabic-Regular.ttf
diff --git a/app/fonts/NotoSansArabic-SemiBold.ttf b/app/fonts/NotoSansArabic-SemiBold.ttf
diff --git a/app/fonts/NotoSansArabic-Thin.ttf b/app/fonts/NotoSansArabic-Thin.ttf
diff --git a/app/fonts/NotoSansArabic-Variable.ttf b/app/fonts/NotoSansArabic-Variable.ttf
diff --git a/app/fonts/Roboto-Black.ttf b/app/fonts/Roboto-Black.ttf
diff --git a/app/fonts/Roboto-BlackItalic.ttf b/app/fonts/Roboto-BlackItalic.ttf
diff --git a/app/fonts/Roboto-Bold.ttf b/app/fonts/Roboto-Bold.ttf
diff --git a/app/fonts/Roboto-BoldItalic.ttf b/app/fonts/Roboto-BoldItalic.ttf
diff --git a/app/fonts/Roboto-Italic-Variable.ttf b/app/fonts/Roboto-Italic-Variable.ttf
diff --git a/app/fonts/Roboto-Italic.ttf b/app/fonts/Roboto-Italic.ttf
diff --git a/app/fonts/Roboto-Light.ttf b/app/fonts/Roboto-Light.ttf
diff --git a/app/fonts/Roboto-LightItalic.ttf b/app/fonts/Roboto-LightItalic.ttf
diff --git a/app/fonts/Roboto-Medium.ttf b/app/fonts/Roboto-Medium.ttf
diff --git a/app/fonts/Roboto-MediumItalic.ttf b/app/fonts/Roboto-MediumItalic.ttf
diff --git a/app/fonts/Roboto-Regular.ttf b/app/fonts/Roboto-Regular.ttf
diff --git a/app/fonts/Roboto-Thin.ttf b/app/fonts/Roboto-Thin.ttf
diff --git a/app/fonts/Roboto-ThinItalic.ttf b/app/fonts/Roboto-ThinItalic.ttf
diff --git a/app/fonts/Roboto-Variable.ttf b/app/fonts/Roboto-Variable.ttf
diff --git a/app/lib/dialogs/elements.dart b/app/lib/dialogs/elements.dart
@@ -126,7 +126,7 @@ ContextMenuBuilder buildElementsContextMenu(
           children: Arrangement.values
               .map(
                 (e) => MenuItemButton(
-                  leadingIcon: Icon(e.icon(PhosphorIconsStyle.light)),
+                  leadingIcon: Icon(e.icon()),
                   child: Text(e.getLocalizedName(context)),
                   onPressed: () {
                     Navigator.of(context).pop(true);
@@ -150,7 +150,7 @@ ContextMenuBuilder buildElementsContextMenu(
           children: operationKeys
               .map(
                 (e) => MenuItemButton(
-                  leadingIcon: PhosphorIcon(e.icon(PhosphorIconsStyle.light)),
+                  leadingIcon: PhosphorIcon(e.icon()),
                   child: Text(e.getLocalizedName(context)),
                   onPressed: () {
                     final flipAxis = e.flipAxis;

diff --git a/app/lib/dialogs/import/add.dart b/app/lib/dialogs/import/add.dart
@@ -326,7 +326,7 @@ class _AddDialogState extends State<AddDialog> {
         icon: Padding(
           padding: const EdgeInsets.all(4),
           child: PhosphorIcon(
-            handler.getIcon(bloc) ?? tool.icon(PhosphorIconsStyle.light),
+            handler.getIcon(bloc) ?? tool.icon(),
             color: status == ToolStatus.disabled
                 ? Theme.of(context).disabledColor
                 : null,
@@ -371,10 +371,7 @@ class _AddDialogState extends State<AddDialog> {
             textDirection: TextDirection.ltr,
           ),
         ),
-        icon: PhosphorIcon(
-          type.icon(PhosphorIconsStyle.light),
-          textDirection: TextDirection.ltr,
-        ),
+        icon: PhosphorIcon(type.icon(), textDirection: TextDirection.ltr),
         onTap: () async {
           final bloc = context.read<DocumentBloc>();
           final importService = context.read<ImportService>();
@@ -452,7 +449,7 @@ class _AddDialogState extends State<AddDialog> {
                   _buildSection(
                     context,
                     title: category.getLocalizedName(context),
-                    icon: category.icon(PhosphorIconsStyle.light),
+                    icon: category.icon(),
                     children: category == ToolCategory.import
                         ? [
                             ...importItems,

diff --git a/app/lib/dialogs/template.dart b/app/lib/dialogs/template.dart
@@ -841,7 +841,7 @@ class _TemplateDetailsViewState extends State<_TemplateDetailsView> {
                   SizedBox.square(
                     dimension: 64,
                     child: OptionButton(
-                      icon: Icon(tool.icon(PhosphorIconsStyle.light)),
+                      icon: Icon(tool.icon()),
                       tooltip: tool.name,
                     ),
                   ),

diff --git a/app/lib/renderers/renderer.dart b/app/lib/renderers/renderer.dart
@@ -483,12 +483,19 @@ enum RendererOperation {
     };
   }
 
-  IconGetter get icon => switch (this) {
-    RendererOperation.invert => PhosphorIcons.circleHalf,
-    RendererOperation.background => PhosphorIcons.paintBucket,
-    RendererOperation.grayscale => PhosphorIcons.palette,
-    RendererOperation.flipHorizontal => PhosphorIcons.flipHorizontal,
-    RendererOperation.flipVertical => PhosphorIcons.flipVertical,
+  PhosphorIconData icon({bool filled = false}) => switch (this) {
+    RendererOperation.invert =>
+      filled ? PhosphorIconsFill.circleHalf : PhosphorIconsLight.circleHalf,
+    RendererOperation.background =>
+      filled ? PhosphorIconsFill.paintBucket : PhosphorIconsLight.paintBucket,
+    RendererOperation.grayscale =>
+      filled ? PhosphorIconsFill.palette : PhosphorIconsLight.palette,
+    RendererOperation.flipHorizontal =>
+      filled
+          ? PhosphorIconsFill.flipHorizontal
+          : PhosphorIconsLight.flipHorizontal,
+    RendererOperation.flipVertical =>
+      filled ? PhosphorIconsFill.flipVertical : PhosphorIconsLight.flipVertical,
   };
 
   Axis? get flipAxis => switch (this) {

diff --git a/app/lib/selections/area.dart b/app/lib/selections/area.dart
@@ -4,7 +4,8 @@ class AreaSelection extends Selection<Area> {
   AreaSelection(super.selected);
 
   @override
-  IconGetter get icon => PhosphorIcons.monitor;
+  PhosphorIconData icon({bool filled = false}) =>
+      filled ? PhosphorIconsFill.monitor : PhosphorIconsLight.monitor;
 
   @override
   String getLocalizedName(BuildContext context) =>

diff --git a/app/lib/selections/document.dart b/app/lib/selections/document.dart
@@ -4,7 +4,8 @@ class DocumentSelection extends Selection<EditorController> {
   DocumentSelection(EditorController cubit) : super([cubit]);
 
   @override
-  IconGetter get icon => PhosphorIcons.wrench;
+  PhosphorIconData icon({bool filled = false}) =>
+      filled ? PhosphorIconsFill.wrench : PhosphorIconsLight.wrench;
 
   @override
   String getLocalizedName(BuildContext context) =>

diff --git a/app/lib/selections/elements/element.dart b/app/lib/selections/elements/element.dart
@@ -218,5 +218,6 @@ class ElementSelection<T extends PadElement> extends Selection<Renderer<T>> {
       AppLocalizations.of(context).element;
 
   @override
-  IconGetter get icon => PhosphorIcons.cube;
+  PhosphorIconData icon({bool filled = false}) =>
+      filled ? PhosphorIconsFill.cube : PhosphorIconsLight.cube;
 }
diff --git a/app/lib/selections/elements/image.dart b/app/lib/selections/elements/image.dart
@@ -28,7 +28,8 @@ class ImageElementSelection extends ElementSelection<ImageElement> {
   }
 
   @override
-  IconGetter get icon => PhosphorIcons.image;
+  PhosphorIconData icon({bool filled = false}) =>
+      filled ? PhosphorIconsFill.image : PhosphorIconsLight.image;
 
   @override
   String getLocalizedName(BuildContext context) =>

diff --git a/app/lib/selections/elements/pdf.dart b/app/lib/selections/elements/pdf.dart
@@ -60,7 +60,8 @@ class PdfElementSelection extends ElementSelection<PdfElement> {
   }
 
   @override
-  IconGetter get icon => PhosphorIcons.filePdf;
+  PhosphorIconData icon({bool filled = false}) =>
+      filled ? PhosphorIconsFill.filePdf : PhosphorIconsLight.filePdf;
 
   @override
   String getLocalizedName(BuildContext context) =>

diff --git a/app/lib/selections/elements/pen.dart b/app/lib/selections/elements/pen.dart
@@ -27,7 +27,8 @@ class PenElementSelection extends ElementSelection<PenElement> {
   }
 
   @override
-  IconGetter get icon => PhosphorIcons.pen;
+  PhosphorIconData icon({bool filled = false}) =>
+      filled ? PhosphorIconsFill.pen : PhosphorIconsLight.pen;
 
   @override
   String getLocalizedName(BuildContext context) =>

diff --git a/app/lib/selections/elements/polygon.dart b/app/lib/selections/elements/polygon.dart
@@ -27,7 +27,8 @@ class PolygonElementSelection extends ElementSelection<PolygonElement> {
   }
 
   @override
-  IconGetter get icon => PhosphorIcons.polygon;
+  PhosphorIconData icon({bool filled = false}) =>
+      filled ? PhosphorIconsFill.polygon : PhosphorIconsLight.polygon;
 
   @override
   String getLocalizedName(BuildContext context) =>

diff --git a/app/lib/selections/elements/shape.dart b/app/lib/selections/elements/shape.dart
@@ -67,7 +67,8 @@ class ShapeElementSelection extends ElementSelection<ShapeElement> {
   }
 
   @override
-  IconGetter get icon => selected.first.element.property.shape.icon;
+  PhosphorIconData icon({bool filled = false}) =>
+      selected.first.element.property.shape.icon(filled: filled);
 
   @override
   String getLocalizedName(BuildContext context) =>
@@ -116,7 +117,7 @@ class _ShapeElementStrokeStyleSectionState
                     (e) => DropdownMenuEntry(
                       label: e.getLocalizedName(context),
                       value: e,
-                      leadingIcon: Icon(e.icon(PhosphorIconsStyle.light)),
+                      leadingIcon: Icon(e.icon()),
                     ),
                   )
                   .toList(),

diff --git a/app/lib/selections/elements/svg.dart b/app/lib/selections/elements/svg.dart
@@ -28,7 +28,8 @@ class SvgElementSelection extends ElementSelection<SvgElement> {
   }
 
   @override
-  IconGetter get icon => PhosphorIcons.fileSvg;
+  PhosphorIconData icon({bool filled = false}) =>
+      filled ? PhosphorIconsFill.fileSvg : PhosphorIconsLight.fileSvg;
 
   @override
   String getLocalizedName(BuildContext context) =>

diff --git a/app/lib/selections/elements/table.dart b/app/lib/selections/elements/table.dart
@@ -165,7 +165,8 @@ class TableElementSelection extends ElementSelection<TableElement> {
   }
 
   @override
-  IconGetter get icon => PhosphorIcons.table;
+  PhosphorIconData icon({bool filled = false}) =>
+      filled ? PhosphorIconsFill.table : PhosphorIconsLight.table;
 
   @override
   String getLocalizedName(BuildContext context) =>

diff --git a/app/lib/selections/elements/text.dart b/app/lib/selections/elements/text.dart
@@ -57,7 +57,8 @@ class LabelElementSelection extends ElementSelection<PadElement> {
   }
 
   @override
-  IconGetter get icon => PhosphorIcons.textT;
+  PhosphorIconData icon({bool filled = false}) =>
+      filled ? PhosphorIconsFill.textT : PhosphorIconsLight.textT;
 
   @override
   String getLocalizedName(BuildContext context) =>

diff --git a/app/lib/selections/selection.dart b/app/lib/selections/selection.dart
@@ -107,7 +107,7 @@ abstract class Selection<T> {
 
   String getLocalizedCaption(BuildContext context) => '';
 
-  IconGetter get icon;
+  PhosphorIconData icon({bool filled = false});
 
   List<Widget> buildProperties(BuildContext context) => [];
 

diff --git a/app/lib/selections/tools/area.dart b/app/lib/selections/tools/area.dart
@@ -92,7 +92,7 @@ class AreaToolSelection extends ToolSelection<AreaTool> {
               .map(
                 (preset) => ButtonSegment<double>(
                   value: preset.ratio,
-                  icon: PhosphorIcon(preset.icon(PhosphorIconsStyle.light)),
+                  icon: PhosphorIcon(preset.icon()),
                   tooltip: preset.getLocalizedName(context),
                 ),
               )

diff --git a/app/lib/selections/tools/asset.dart b/app/lib/selections/tools/asset.dart
@@ -16,9 +16,7 @@ class AssetToolSelection extends ToolSelection<AssetTool> {
                 (type) => DropdownMenuEntry(
                   value: type,
                   label: type.getLocalizedName(context),
-                  leadingIcon: PhosphorIcon(
-                    type.icon(PhosphorIconsStyle.light),
-                  ),
+                  leadingIcon: PhosphorIcon(type.icon()),
                 ),
               )
               .toList(),

diff --git a/app/lib/selections/tools/barcode.dart b/app/lib/selections/tools/barcode.dart
@@ -16,7 +16,7 @@ class BarcodeToolSelection extends ToolSelection<BarcodeTool> {
               .map(
                 (e) => DropdownMenuEntry(
                   label: e.getLocalizedName(context),
-                  leadingIcon: Icon(e.icon(PhosphorIconsStyle.light)),
+                  leadingIcon: Icon(e.icon()),
                   value: e,
                 ),
               )

diff --git a/app/lib/selections/tools/eraser.dart b/app/lib/selections/tools/eraser.dart
@@ -18,7 +18,7 @@ class EraserToolSelection extends ToolSelection<EraserTool> {
               .map(
                 (e) => DropdownMenuEntry(
                   label: e.getLocalizedName(context),
-                  leadingIcon: Icon(e.icon(PhosphorIconsStyle.light)),
+                  leadingIcon: Icon(e.icon()),
                   value: e,
                 ),
               )

diff --git a/app/lib/selections/tools/select.dart b/app/lib/selections/tools/select.dart
@@ -18,7 +18,7 @@ class SelectToolSelection extends ToolSelection<SelectTool> {
               .map(
                 (e) => DropdownMenuEntry(
                   label: e.getLocalizedName(context),
-                  leadingIcon: Icon(e.icon(PhosphorIconsStyle.light)),
+                  leadingIcon: Icon(e.icon()),
                   value: e,
                 ),
               )

diff --git a/app/lib/selections/tools/shape.dart b/app/lib/selections/tools/shape.dart
@@ -163,7 +163,8 @@ class ShapeToolSelection extends ToolSelection<ShapeTool> {
   }
 
   @override
-  IconGetter get icon => selected.first.property.shape.icon;
+  PhosphorIconData icon({bool filled = false}) =>
+      selected.first.property.shape.icon(filled: filled);
 }
 
 class ShapeView extends StatefulWidget {
@@ -248,7 +249,7 @@ class _ShapeViewState extends State<ShapeView> {
                     (e) => DropdownMenuEntry(
                       label: e.key,
                       value: e.key,
-                      leadingIcon: Icon(e.value.icon(PhosphorIconsStyle.light)),
+                      leadingIcon: Icon(e.value.icon()),
                     ),
                   )
                   .toList(),
@@ -432,7 +433,7 @@ class _StrokeStyleSectionState extends State<_StrokeStyleSection> {
                     (e) => DropdownMenuEntry(
                       label: e.getLocalizedName(context),
                       value: e,
-                      leadingIcon: Icon(e.icon(PhosphorIconsStyle.light)),
+                      leadingIcon: Icon(e.icon()),
                     ),
                   )
                   .toList(),

diff --git a/app/lib/selections/tools/spacer.dart b/app/lib/selections/tools/spacer.dart
@@ -16,7 +16,7 @@ class SpacerToolSelection extends ToolSelection<SpacerTool> {
               .map(
                 (e) => DropdownMenuEntry(
                   label: e.getLocalizedName(context),
-                  leadingIcon: Icon(e.icon(PhosphorIconsStyle.light)),
+                  leadingIcon: Icon(e.icon()),
                   value: e,
                 ),
               )

diff --git a/app/lib/selections/tools/table.dart b/app/lib/selections/tools/table.dart
@@ -86,7 +86,8 @@ class TableToolSelection extends ToolSelection<TableTool> {
   }
 
   @override
-  IconGetter get icon => PhosphorIcons.table;
+  PhosphorIconData icon({bool filled = false}) =>
+      filled ? PhosphorIconsFill.table : PhosphorIconsLight.table;
 }
 
 class _TableBorderControls extends StatefulWidget {

diff --git a/app/lib/selections/tools/texture.dart b/app/lib/selections/tools/texture.dart
@@ -58,5 +58,6 @@ class TextureToolSelection extends ToolSelection<TextureTool> {
   }
 
   @override
-  IconGetter get icon => selected.first.icon;
+  PhosphorIconData icon({bool filled = false}) =>
+      selected.first.icon(filled: filled);
 }
diff --git a/app/lib/selections/tools/tool.dart b/app/lib/selections/tools/tool.dart
@@ -99,12 +99,14 @@ class ToolSelection<T extends Tool> extends Selection<T> {
   }
 
   @override
-  IconGetter get icon {
+  PhosphorIconData icon({bool filled = false}) {
     final type = selected.first.runtimeType;
     if (selected.every((e) => e.runtimeType == type)) {
-      return selected.first.icon;
+      return selected.first.icon(filled: filled);
     }
-    return PhosphorIcons.paintRoller;
+    return filled
+        ? PhosphorIconsFill.paintRoller
+        : PhosphorIconsLight.paintRoller;
   }
 
   @override

diff --git a/app/lib/settings/pages/connections.dart b/app/lib/settings/pages/connections.dart
@@ -43,7 +43,7 @@ final _connectionsSettingsPage = SettingsLeapPage<ButterflySettings>(
                         )
                       : null,
                   leading: remote.icon?.isEmpty ?? true
-                      ? PhosphorIcon(remote.typeIcon(PhosphorIconsStyle.light))
+                      ? PhosphorIcon(remote.typeIcon())
                       : Image.memory(remote.icon!),
                   onTap: () => context.pushNamed(
                     'connection',
@@ -108,7 +108,7 @@ Widget? buildConnectionsSettingsFloatingActionButton(
               .map(
                 (e) => ListTile(
                   title: Text(e.getLocalizedTypeName(context)),
-                  leading: PhosphorIcon(e.typeIcon(PhosphorIconsStyle.light)),
+                  leading: PhosphorIcon(e.typeIcon()),
                   onTap: () => Navigator.pop(context, e),
                 ),
               )

diff --git a/app/lib/views/app_bar.dart b/app/lib/views/app_bar.dart
@@ -461,9 +461,7 @@ class _AppBarTitleState extends State<_AppBarTitle> {
             ),
           if (state.absolute)
             IconButton(
-              icon: PhosphorIcon(
-                currentIndex.location.fileType.icon(PhosphorIconsStyle.light),
-              ),
+              icon: PhosphorIcon(currentIndex.location.fileType.icon()),
               tooltip: AppLocalizations.of(context).export,
               onPressed: () => context.read<ImportService>().export(),
             ),
@@ -725,9 +723,7 @@ class MainPopupMenu extends StatelessWidget {
                               )
                               .map(
                                 (e) => MenuItemButton(
-                                  leadingIcon: PhosphorIcon(
-                                    e.icon(PhosphorIconsStyle.light),
-                                  ),
+                                  leadingIcon: PhosphorIcon(e.icon()),
                                   child: Text(e.getLocalizedName(context)),
                                   onPressed: () {
                                     context