diff --git a/resources/svg/component-under-maintenance.svg b/resources/svg/component-under-maintenance.svg
index ec9b1e19..37decf5d 100644
--- a/resources/svg/component-under-maintenance.svg
+++ b/resources/svg/component-under-maintenance.svg
@@ -2,7 +2,7 @@
      width="20pt" height="20pt" viewBox="0 0 128.000000 128.000000"
      preserveAspectRatio="xMidYMid meet">
     <g transform="translate(0.000000,128.000000) scale(0.100000,-0.100000)"
-       fill="#000000" stroke="none">
+       fill="currentColor" stroke="none">
         <path d="M913 1250 c-66 -23 -109 -54 -127 -88 -7 -15 -19 -65 -25 -112 l-12
 -85 -77 -77 -77 -78 -67 67 c-65 65 -68 69 -68 116 0 27 -7 61 -16 76 -16 26
 -239 179 -277 189 -13 3 -36 -13 -78 -54 -32 -32 -59 -64 -59 -72 0 -7 38 -71
diff --git a/src/Filament/Resources/Schedules/RelationManagers/ComponentsRelationManager.php b/src/Filament/Resources/Schedules/RelationManagers/ComponentsRelationManager.php
index e5c79581..91a95798 100644
--- a/src/Filament/Resources/Schedules/RelationManagers/ComponentsRelationManager.php
+++ b/src/Filament/Resources/Schedules/RelationManagers/ComponentsRelationManager.php
@@ -9,6 +9,7 @@
 use Filament\Actions\DetachAction;
 use Filament\Actions\DetachBulkAction;
 use Filament\Forms\Components\Select;
+use Filament\Forms\Components\ToggleButtons;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Schemas\Schema;
 use Filament\Tables\Columns\TextColumn;
@@ -57,10 +58,12 @@ public function table(Table $table): Table
                             ->searchable()
                             ->multiple()
                             ->required(),
-                        Select::make('component_status')
+                        ToggleButtons::make('component_status')
                             ->options(ComponentStatusEnum::class)
                             ->default(ComponentStatusEnum::under_maintenance->value)
                             ->required()
+                            ->inline()
+                            ->columnSpanFull()
                             ->label(__('cachet::schedule.form.add_component.status_label')),
                     ]),
             ])
diff --git a/src/Filament/Resources/Schedules/ScheduleResource.php b/src/Filament/Resources/Schedules/ScheduleResource.php
index dfe38281..0fd5cb3c 100644
--- a/src/Filament/Resources/Schedules/ScheduleResource.php
+++ b/src/Filament/Resources/Schedules/ScheduleResource.php
@@ -27,6 +27,7 @@
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
+use Filament\Forms\Components\ToggleButtons;
 use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
 use Filament\Schemas\Components\Section;
@@ -84,11 +85,12 @@ public static function form(Schema $schema): Schema
                                 ->required()
                                 ->options(fn (): array => ComponentOptions::forSelect())
                                 ->disableOptionsWhenSelectedInSiblingRepeaterItems(),
-                            Select::make('component_status')
+                            ToggleButtons::make('component_status')
+                                ->label(__('cachet::schedule.form.add_component.status_label'))
+                                ->inline()
                                 ->options(ComponentStatusEnum::class)
                                 ->default(ComponentStatusEnum::under_maintenance->value)
-                                ->required()
-                                ->label(__('cachet::schedule.form.add_component.status_label')),
+                                ->required(),
                         ])
                         ->label(__('cachet::schedule.form.add_component.header'))
                         ->columnSpanFull(),