diff --git a/app/components/form_elements/fieldset_toggle_component.html.erb b/app/components/form_elements/fieldset_toggle_component.html.erb
new file mode 100644
index 0000000..28549bc
--- /dev/null
+++ b/app/components/form_elements/fieldset_toggle_component.html.erb
@@ -0,0 +1,9 @@
+<%= tag.public_send(@tag, class: "flex items-center justify-between py-6") do %>
+
+
+
<%= @descripton %>
+
+
+ <%= render FormElements::ToggleComponent.new(enabled: @enabled, input_enabled: @input_enabled) %>
+
+<% end %>
diff --git a/app/components/form_elements/fieldset_toggle_component.rb b/app/components/form_elements/fieldset_toggle_component.rb
new file mode 100644
index 0000000..aa64535
--- /dev/null
+++ b/app/components/form_elements/fieldset_toggle_component.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module FormElements
+ class FieldsetToggleComponent < ViewComponent::Base
+ def initialize(tag: "li", enabled: false, input_enabled: true, title:, description:)
+ @tag = tag
+ @enabled = enabled
+ @input_enabled = input_enabled
+ @title = title
+ @descripton = description
+ @button_text = @enabled ? "Switch off" : "Switch on"
+ end
+ end
+end
diff --git a/app/components/form_elements/toggle_component.html.erb b/app/components/form_elements/toggle_component.html.erb
index fabb81c..9023b7f 100644
--- a/app/components/form_elements/toggle_component.html.erb
+++ b/app/components/form_elements/toggle_component.html.erb
@@ -1,10 +1,11 @@