diff --git a/src/elements.tsx b/src/elements.tsx
index ef13db01..770dbac4 100644
--- a/src/elements.tsx
+++ b/src/elements.tsx
@@ -169,7 +169,6 @@ class InlineSettingsTextEdit extends React.Component<{text : string, value : str
             return (
                 <div onClick={this.clickEdit} className={cn("settings-input inline-edit", "edit-not-active")}>
                     {this.props.text}
-                    <i style={{marginLeft: 5}} className="fa-sharp fa-solid fa-pen"/>
                 </div>
             );
         }
diff --git a/src/settings.tsx b/src/settings.tsx
index 09563fe5..6766fa67 100644
--- a/src/settings.tsx
+++ b/src/settings.tsx
@@ -978,15 +978,18 @@ class RemotesModal extends React.Component<{}, {}> {
                         </If>
                     </div>
                 </div>
-                <div className="settings-field">
+                <div className="settings-field" style={{minHeight: 24}}>
                     <div className="settings-label">Alias</div>
                     <InlineSettingsTextEdit onChange={(val) => this.editAlias(remote.remoteid, val)} text={remoteAliasText ?? ""} value={remote.remotealias} placeholder="" maxLength={50}/>
                 </div>
                 <div className="settings-field">
                     <div className="settings-label">Auth Type</div>
-                    <div className="settings-input settings-clickable" onClick={() => this.editAuthSettings()}>
-                        {remote.authtype}
-                        <i style={{marginLeft: 5}} className="fa-sharp fa-solid fa-pen"/>
+                    <div className="settings-input">
+                        {remote.authtype} <i style={{marginLeft: 12}} className="fa-sharp fa-solid fa-pen hide-hover"/>
+                        <div onClick={() => this.editAuthSettings()} className="button is-plain is-outlined is-small is-inline-height ml-2 update-auth-button">
+                            <span className="icon is-small"><i className="fa-sharp fa-solid fa-pen"/></span>
+                            <span>Update Auth Settings</span>
+                        </div>
                     </div>
                 </div>
                 <div className="settings-field">
diff --git a/src/sh2.less b/src/sh2.less
index f56e1320..9e4904e8 100644
--- a/src/sh2.less
+++ b/src/sh2.less
@@ -2915,6 +2915,22 @@ input[type=checkbox] {
                     height: 22px;
                 }
             }
+
+            .settings-field {
+                .update-auth-button {
+                    visibility: hidden;
+                }
+                
+                &:hover {
+                    .update-auth-button {
+                        visibility: visible;
+                    }
+
+                    .hide-hover {
+                        display: none;
+                    }
+                }
+            }
         }
     }
 }
@@ -3045,6 +3061,11 @@ input[type=checkbox] {
 
         &.inline-edit.edit-not-active {
             cursor: pointer;
+
+            &:hover {
+                text-decoration: underline;
+                text-decoration-style: dotted;
+            }
         }
 
         &.settings-clickable {