diff --git a/style.css b/style.css
index ff545c630..2af7b00eb 100644
--- a/style.css
+++ b/style.css
@@ -1,6 +1,10 @@
 .output-html p {margin: 0 0.5em;}
 .performance { font-size: 0.85em; color: #444; }
 
+#txt2img_generate, #img2img_generate{
+    max-width: 13em;
+}
+
 button{
     align-self: stretch !important;
 }
@@ -23,24 +27,28 @@ button{
     overflow: visible !important;
 }
 
-fieldset span.text-gray-500{
+fieldset span.text-gray-500, .gr-panel div.flex-col div.justify-between label, label.block span{
     position: absolute;
-    top: -0.425em;
-    background-color: rgb(249 250 251);
-    line-height: 0.7em;
-    padding: 0 0.5em;
-}
-.dark fieldset span.text-gray-500 { background-color: rgb(17 24 39); }
-
-.gr-panel div.flex-col div.justify-between label, label.block span{
-    position: absolute;
-    top: -0.4em;
-    background-color: rgb(249 250 251);
-    line-height: 0.7em;
+    top: -0.6em;
+    line-height: 1.2em;
     padding: 0 0.5em;
     margin: 0;
 }
-.dark .gr-panel div.flex-col div.justify-between label, .dark label.block span{ background-color: rgb(17 24 39); }
+
+fieldset span.text-gray-500, .gr-panel div.flex-col div.justify-between label, label.block span{
+    background-color: white;
+    border-top: 1px solid #eee;
+    border-left: 1px solid #eee;
+    border-right: 1px solid #eee;
+}
+
+.dark fieldset span.text-gray-500, .dark .gr-panel div.flex-col div.justify-between label, .dark label.block span{
+    background-color: rgb(31, 41, 55);
+    border-top: 1px solid rgb(55 65 81);
+    border-left: 1px solid rgb(55 65 81);
+    border-right: 1px solid rgb(55 65 81);
+}
+
 
 .gr-panel div.flex-col div.justify-between label span{
     margin: 0;
diff --git a/webui.py b/webui.py
index a6704bd4c..45bbbbf7a 100644
--- a/webui.py
+++ b/webui.py
@@ -1227,7 +1227,7 @@ with gr.Blocks(analytics_enabled=False) as txt2img_interface:
     with gr.Row():
         prompt = gr.Textbox(label="Prompt", elem_id="txt2img_prompt", show_label=False, placeholder="Prompt", lines=1)
         negative_prompt = gr.Textbox(label="Negative prompt", elem_id="txt2img_negative_prompt", show_label=False, placeholder="Negative prompt", lines=1, visible=False)
-        submit = gr.Button('Generate', variant='primary')
+        submit = gr.Button('Generate', elem_id="txt2img_generate", variant='primary')
 
     with gr.Row().style(equal_height=False):
         with gr.Column(variant='panel'):
@@ -1575,7 +1575,7 @@ sample_img2img = sample_img2img if os.path.exists(sample_img2img) else None
 with gr.Blocks(analytics_enabled=False) as img2img_interface:
     with gr.Row():
         prompt = gr.Textbox(label="Prompt", elem_id="img2img_prompt", show_label=False, placeholder="Prompt", lines=1)
-        submit = gr.Button('Generate', variant='primary')
+        submit = gr.Button('Generate', elem_id="img2img_generate", variant='primary')
 
     with gr.Row().style(equal_height=False):