diff --git a/src/renderer/views/components/settings-window.ejs b/src/renderer/views/components/settings-window.ejs
index 0018a1ae..f4b6ec89 100644
--- a/src/renderer/views/components/settings-window.ejs
+++ b/src/renderer/views/components/settings-window.ejs
@@ -921,107 +921,128 @@
                                     </div>
                                 </div>
 
-                                <div class="md-option-line" v-show="app.cfg.connectivity.discord_rpc.enabled != false">
-                                    <div class="md-option-segment">
-                                        {{$root.getLz('settings.option.connectivity.discordRPC.clientName')}}
-                                    </div>
-                                    <div class="md-option-segment md-option-segment_auto">
-                                        <label>
-                                            <select class="md-select" v-model="app.cfg.connectivity.discord_rpc.client">
-                                                <option value="Cider">{{$root.getLz('app.name')}}</option>
-                                                <option value="AppleMusic">{{$root.getLz('term.appleMusic')}}
-                                                </option>
-                                            </select>
-                                        </label>
-                                    </div>
-                                </div>
+                                <div v-show="app.cfg.connectivity.discord_rpc.enabled != false">
 
-                                <div class="md-option-line" v-show="app.cfg.connectivity.discord_rpc.enabled != false">
-                                    <div class="md-option-segment">
-                                        {{$root.getLz('settings.option.connectivity.discordRPC.clearOnPause')}}
+                                    <div class="md-option-line">
+                                        <div class="md-option-segment">
+                                            {{$root.getLz('settings.option.connectivity.discordRPC.reload')}}
+                                        </div>
+                                        <div class="md-option-segment md-option-segment_auto">
+                                            <button class="md-btn" @click="reloadDiscordRPC()">
+                                                {{$root.getLz('menubar.options.reload')}}
+                                            </button>
+                                        </div>
                                     </div>
-                                    <div class="md-option-segment md-option-segment_auto">
-                                        <label>
-                                            <input type="checkbox"
-                                                   v-model="app.cfg.connectivity.discord_rpc.clear_on_pause" switch />
-                                        </label>
-                                    </div>
-                                </div>
 
-                                <div class="md-option-line" v-show="app.cfg.connectivity.discord_rpc.enabled != false">
-                                    <div class="md-option-segment">
-                                        {{$root.getLz('settings.option.connectivity.discordRPC.hideButtons')}}
+                                    <div class="md-option-line">
+                                        <div class="md-option-segment">
+                                            {{$root.getLz('settings.option.connectivity.discordRPC.clientName')}}
+                                        </div>
+                                        <div class="md-option-segment md-option-segment_auto">
+                                            <label>
+                                                <select class="md-select" v-model="app.cfg.connectivity.discord_rpc.client">
+                                                    <option value="Cider">{{$root.getLz('app.name')}}</option>
+                                                    <option value="AppleMusic">{{$root.getLz('term.appleMusic')}}
+                                                    </option>
+                                                </select>
+                                            </label>
+                                        </div>
                                     </div>
-                                    <div class="md-option-segment md-option-segment_auto">
-                                        <label>
-                                            <input type="checkbox"
-                                                   v-model="app.cfg.connectivity.discord_rpc.hide_buttons" switch />
-                                        </label>
-                                    </div>
-                                </div>
 
-                                <div class="md-option-line" v-show="app.cfg.connectivity.discord_rpc.enabled != false">
-                                    <div class="md-option-segment">
-                                        {{$root.getLz('settings.option.connectivity.discordRPC.showSongLink')}}
+                                    <div class="md-option-line">
+                                        <div class="md-option-segment">
+                                            {{$root.getLz('settings.option.connectivity.discordRPC.clearOnPause')}}
+                                        </div>
+                                        <div class="md-option-segment md-option-segment_auto">
+                                            <label>
+                                                <input type="checkbox"
+                                                       v-model="app.cfg.connectivity.discord_rpc.clear_on_pause" switch />
+                                            </label>
+                                        </div>
                                     </div>
-                                    <div class="md-option-segment md-option-segment_auto">
-                                        <label>
-                                            <input type="checkbox"
-                                                   v-model="app.cfg.connectivity.discord_rpc.show_songlink" switch/>
-                                        </label>
-                                    </div>
-                                </div>
 
-                                <div class="md-option-line" v-show="app.cfg.connectivity.discord_rpc.enabled != false">
-                                    <div class="md-option-segment">
-                                        {{$root.getLz('settings.option.connectivity.discordRPC.hideTimestamp')}}
+                                    <div class="md-option-line">
+                                        <div class="md-option-segment">
+                                            {{$root.getLz('settings.option.connectivity.discordRPC.hideTimestamp')}}
+                                        </div>
+                                        <div class="md-option-segment md-option-segment_auto">
+                                            <label>
+                                                <input type="checkbox"
+                                                       v-model="app.cfg.connectivity.discord_rpc.activity.hide_timestamp" switch />
+                                            </label>
+                                        </div>
                                     </div>
-                                    <div class="md-option-segment md-option-segment_auto">
-                                        <label>
-                                            <input type="checkbox"
-                                                   v-model="app.cfg.connectivity.discord_rpc.hide_timestamp" switch />
-                                        </label>
-                                    </div>
-                                </div>
 
-                                <div class="md-option-line" v-show="app.cfg.connectivity.discord_rpc.enabled != false">
-                                    <div class="md-option-segment">
-                                        {{$root.getLz('settings.option.connectivity.discordRPC.detailsFormat')}}<br />
-                                        <small>{{$root.getLz('term.variables')}}: {artist}, {composer}, {title},
-                                            {album},
-                                            {trackNumber}</small>
+                                    <div class="md-option-line">
+                                        <div class="md-option-segment">
+                                            {{$root.getLz('settings.option.connectivity.discordRPC.detailsFormat')}}<br />
+                                            <small>{{$root.getLz('term.variables')}}: {artist}, {composer}, {title},
+                                                {album},
+                                                {trackNumber}</small>
+                                        </div>
+                                        <div class="md-option-segment md-option-segment_auto">
+                                            <label>
+                                                <input type="text"
+                                                       v-model="app.cfg.connectivity.discord_rpc.activity.details_format" />
+                                            </label>
+                                        </div>
                                     </div>
-                                    <div class="md-option-segment md-option-segment_auto">
-                                        <label>
-                                            <input type="text"
-                                                   v-model="app.cfg.connectivity.discord_rpc.details_format" />
-                                        </label>
-                                    </div>
-                                </div>
 
-                                <div class="md-option-line" v-show="app.cfg.connectivity.discord_rpc.enabled != false">
-                                    <div class="md-option-segment">
-                                        {{$root.getLz('settings.option.connectivity.discordRPC.stateFormat')}}
-                                        <small>{{$root.getLz('term.variables')}}: {artist}, {composer}, {title},
-                                            {album},
-                                            {trackNumber}</small>
+                                    <div class="md-option-line">
+                                        <div class="md-option-segment">
+                                            {{$root.getLz('settings.option.connectivity.discordRPC.stateFormat')}}
+                                            <small>{{$root.getLz('term.variables')}}: {artist}, {composer}, {title},
+                                                {album},
+                                                {trackNumber}</small>
+                                        </div>
+                                        <div class="md-option-segment md-option-segment_auto">
+                                            <label>
+                                                <input type="text"
+                                                       v-model="app.cfg.connectivity.discord_rpc.activity.state_format" />
+                                            </label>
+                                        </div>
                                     </div>
-                                    <div class="md-option-segment md-option-segment_auto">
-                                        <label>
-                                            <input type="text"
-                                                   v-model="app.cfg.connectivity.discord_rpc.state_format" />
-                                        </label>
-                                    </div>
-                                </div>
 
-                                <div class="md-option-line" v-show="app.cfg.connectivity.discord_rpc.enabled != false">
-                                    <div class="md-option-segment">
-                                        {{$root.getLz('settings.option.connectivity.discordRPC.reload')}}
+                                    <div class="md-option-line">
+                                        <div class="md-option-segment">
+                                            {{$root.getLz('settings.option.connectivity.discordRPC.showActivityButtons')}}
+                                        </div>
+                                        <div class="md-option-segment md-option-segment_auto">
+                                            <label>
+                                                <input type="checkbox"
+                                                       v-model="app.cfg.connectivity.discord_rpc.activity.buttons.enabled" switch />
+                                            </label>
+                                        </div>
                                     </div>
-                                    <div class="md-option-segment md-option-segment_auto">
-                                        <button class="md-btn" @click="reloadDiscordRPC()">
-                                            {{$root.getLz('menubar.options.reload')}}
-                                        </button>
+
+                                    <div v-show="app.cfg.connectivity.discord_rpc.activity.buttons.enabled == true">
+                                        <div class="md-option-line">
+                                            <div class="md-option-segment">
+                                                {{$root.getLz('settings.option.connectivity.discordRPC.firstButton')}}
+                                            </div>
+                                            <div class="md-option-segment md-option-segment_auto">
+                                                <label>
+                                                    <select class="md-select" v-model="app.cfg.connectivity.discord_rpc.activity.buttons.first" @change="if ($event.target.value == 'disabled') app.cfg.connectivity.discord_rpc.activity.buttons.second = 'disabled';">
+                                                        <option v-for="option in app.cfg.connectivity.discord_rpc.activity.buttons.options" v-bind:value="option" v-show="app.cfg.connectivity.discord_rpc.activity.buttons.second != option">{{ $root.getLz(`settings.option.connectivity.discordRPC.buttons.${option}`) }}</option>
+                                                        <option value="disabled">{{$root.getLz('term.disabled')}}</option>
+                                                    </select>
+                                                </label>
+                                            </div>
+                                        </div>
+
+                                        <div class="md-option-line" v-show="app.cfg.connectivity.discord_rpc.activity.buttons.first != 'disabled'">
+                                            <div class="md-option-segment">
+                                                {{$root.getLz('settings.option.connectivity.discordRPC.secondButton')}}
+                                            </div>
+                                            <div class="md-option-segment md-option-segment_auto">
+                                                <label>
+                                                    <select class="md-select" v-model="app.cfg.connectivity.discord_rpc.activity.buttons.second">
+                                                        <option v-for="option in app.cfg.connectivity.discord_rpc.activity.buttons.options" v-bind:value="option" v-show="app.cfg.connectivity.discord_rpc.activity.buttons.first != option">{{ $root.getLz(`settings.option.connectivity.discordRPC.buttons.${option}`) }}</option>
+                                                        <option value="disabled">{{$root.getLz('term.disabled')}}</option>
+                                                    </select>
+                                                </label>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>