diff --git a/apps/ssb.json b/apps/ssb.json
index a733ec22..cb07b7b1 100644
--- a/apps/ssb.json
+++ b/apps/ssb.json
@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🦀",
-	"previous": "&QGHSmapZNOzNQYbH9qUA5RPoqLhHZ1zFDMkOlKixrbQ=.sha256"
+	"previous": "&ePqnCcU373yUI01WtrFFKt+W/doAuMiN4g8qBt5p+rk=.sha256"
 }
diff --git a/apps/ssb/tf-compose.js b/apps/ssb/tf-compose.js
index 9eeb8422..d25321be 100644
--- a/apps/ssb/tf-compose.js
+++ b/apps/ssb/tf-compose.js
@@ -446,12 +446,15 @@ class TfComposeElement extends LitElement {
 			self.apps = await tfrpc.rpc.apps();
 		}
 		if (!this.apps) {
-			return html`<button class="w3-button w3-theme-d1" @click=${attach_app}>
+			return html`<button
+				class="w3-button w3-bar-item w3-theme-d1"
+				@click=${attach_app}
+			>
 				Attach App
 			</button>`;
 		} else {
 			return html`<button
-				class="w3-button w3-theme-d1"
+				class="w3-button w3-bar-item w3-theme-d1"
 				@click=${() => (this.apps = null)}
 			>
 				Discard App
@@ -472,18 +475,9 @@ class TfComposeElement extends LitElement {
 		if (draft.content_warning !== undefined) {
 			return html`
 				<div class="w3-container w3-padding">
-					<p>
-						<input type="checkbox" class="w3-check w3-theme-d1" id="cw" @change=${() => self.set_content_warning(undefined)} checked="checked"></input>
-						<label for="cw">CW</label>
-					</p>
 					<input type="text" class="w3-input w3-border w3-theme-d1" id="content_warning" placeholder="Enter a content warning here." @input=${self.input} value=${draft.content_warning}></input>
 				</div>
 			`;
-		} else {
-			return html`
-				<input type="checkbox" class="w3-check w3-theme-d1" id="cw" @change=${() => self.set_content_warning('')}></input>
-				<label for="cw">CW</label>
-			`;
 		}
 	}
 
@@ -546,6 +540,31 @@ class TfComposeElement extends LitElement {
 		this.requestUpdate();
 	}
 
+	toggle_menu(event) {
+		event.srcElement.parentNode
+			.querySelector('.w3-dropdown-content')
+			.classList.toggle('w3-show');
+	}
+
+	connectedCallback() {
+		super.connectedCallback();
+		this._click_callback = this.document_click.bind(this);
+		document.body.addEventListener('mouseup', this._click_callback);
+	}
+
+	disconnectedCallback() {
+		super.disconnectedCallback();
+		document.body.removeEventListener('mouseup', this._click_callback);
+	}
+
+	document_click(event) {
+		let content = this.renderRoot.querySelector('.w3-dropdown-content');
+		let target = event.target;
+		if (content && !content.contains(target)) {
+			content.classList.remove('w3-show');
+		}
+	}
+
 	render() {
 		let self = this;
 		let draft = self.get_draft();
@@ -559,7 +578,7 @@ class TfComposeElement extends LitElement {
 			draft.encrypt_to !== undefined
 				? undefined
 				: html`<button
-						class="w3-button w3-theme-d1"
+						class="w3-button w3-bar-item w3-theme-d1"
 						@click=${() => this.set_encrypt([])}
 					>
 						🔐
@@ -614,13 +633,43 @@ class TfComposeElement extends LitElement {
 					>
 						Submit
 					</button>
-					<button class="w3-button w3-theme-d1" @click=${this.attach}>
-						Attach
-					</button>
-					${this.render_attach_app_button()} ${encrypt}
-					<button class="w3-button w3-theme-d1" @click=${this.discard}>
-						Discard
-					</button>
+					<div class="w3-dropdown-click">
+						<button class="w3-button w3-theme-d1" @click=${this.toggle_menu}>
+							⚙️
+						</button>
+						<div class="w3-dropdown-content w3-bar-block">
+							${this.get_draft().content_warning === undefined
+								? html`
+										<button
+											class="w3-button w3-bar-item w3-theme-d1"
+											@click=${() => self.set_content_warning('')}
+										>
+											Add Content Warning
+										</button>
+									`
+								: html`
+										<button
+											class="w3-button w3-bar-item w3-theme-d1"
+											@click=${() => self.set_content_warning(undefined)}
+										>
+											Remove Content Warning
+										</button>
+									`}
+							<button
+								class="w3-button w3-bar-item w3-theme-d1"
+								@click=${this.attach}
+							>
+								Attach
+							</button>
+							${this.render_attach_app_button()} ${encrypt}
+							<button
+								class="w3-button w3-bar-item w3-theme-d1"
+								@click=${this.discard}
+							>
+								Discard
+							</button>
+						</div>
+					</div>
 				</footer>
 			</div>
 		`;