diff --git a/gotify_tray/gui/designs/widget_settings.py b/gotify_tray/gui/designs/widget_settings.py
index 0ccd047..7dd9190 100644
--- a/gotify_tray/gui/designs/widget_settings.py
+++ b/gotify_tray/gui/designs/widget_settings.py
@@ -12,7 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(384, 272)
+        Dialog.resize(384, 300)
         self.gridLayout = QtWidgets.QGridLayout(Dialog)
         self.gridLayout.setObjectName("gridLayout")
         self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
@@ -118,6 +118,29 @@ class Ui_Dialog(object):
         self.groupBox_2.setObjectName("groupBox_2")
         self.gridLayout_2 = QtWidgets.QGridLayout(self.groupBox_2)
         self.gridLayout_2.setObjectName("gridLayout_2")
+        self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
+        self.label = QtWidgets.QLabel(self.groupBox_2)
+        self.label.setObjectName("label")
+        self.horizontalLayout_4.addWidget(self.label)
+        self.spin_popup_w = QtWidgets.QSpinBox(self.groupBox_2)
+        self.spin_popup_w.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
+        self.spin_popup_w.setMinimum(100)
+        self.spin_popup_w.setMaximum(10000)
+        self.spin_popup_w.setObjectName("spin_popup_w")
+        self.horizontalLayout_4.addWidget(self.spin_popup_w)
+        self.label_2 = QtWidgets.QLabel(self.groupBox_2)
+        self.label_2.setObjectName("label_2")
+        self.horizontalLayout_4.addWidget(self.label_2)
+        self.spin_popup_h = QtWidgets.QSpinBox(self.groupBox_2)
+        self.spin_popup_h.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
+        self.spin_popup_h.setMinimum(100)
+        self.spin_popup_h.setMaximum(10000)
+        self.spin_popup_h.setObjectName("spin_popup_h")
+        self.horizontalLayout_4.addWidget(self.spin_popup_h)
+        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_4.addItem(spacerItem4)
+        self.gridLayout_2.addLayout(self.horizontalLayout_4, 1, 0, 1, 1)
         self.cb_image_popup = QtWidgets.QCheckBox(self.groupBox_2)
         self.cb_image_popup.setObjectName("cb_image_popup")
         self.gridLayout_2.addWidget(self.cb_image_popup, 0, 0, 1, 1)
@@ -126,21 +149,21 @@ class Ui_Dialog(object):
         self.groupBox_logging.setObjectName("groupBox_logging")
         self.gridLayout_6 = QtWidgets.QGridLayout(self.groupBox_logging)
         self.gridLayout_6.setObjectName("gridLayout_6")
-        self.label_logging = QtWidgets.QLabel(self.groupBox_logging)
-        self.label_logging.setObjectName("label_logging")
-        self.gridLayout_6.addWidget(self.label_logging, 0, 0, 1, 1)
         self.combo_logging = QtWidgets.QComboBox(self.groupBox_logging)
         self.combo_logging.setObjectName("combo_logging")
         self.gridLayout_6.addWidget(self.combo_logging, 0, 1, 1, 1)
+        spacerItem5 = QtWidgets.QSpacerItem(190, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.gridLayout_6.addItem(spacerItem5, 0, 3, 1, 1)
         self.pb_open_log = QtWidgets.QPushButton(self.groupBox_logging)
         self.pb_open_log.setMaximumSize(QtCore.QSize(30, 16777215))
         self.pb_open_log.setObjectName("pb_open_log")
         self.gridLayout_6.addWidget(self.pb_open_log, 0, 2, 1, 1)
-        spacerItem4 = QtWidgets.QSpacerItem(190, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.gridLayout_6.addItem(spacerItem4, 0, 3, 1, 1)
+        self.label_logging = QtWidgets.QLabel(self.groupBox_logging)
+        self.label_logging.setObjectName("label_logging")
+        self.gridLayout_6.addWidget(self.label_logging, 0, 0, 1, 1)
         self.verticalLayout.addWidget(self.groupBox_logging)
-        spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
-        self.verticalLayout.addItem(spacerItem5)
+        spacerItem6 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+        self.verticalLayout.addItem(spacerItem6)
         self.tabWidget.addTab(self.tab_advanced, "")
         self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1)
 
@@ -178,11 +201,17 @@ class Ui_Dialog(object):
         self.pb_import.setText(_translate("Dialog", "Import"))
         self.pb_export.setText(_translate("Dialog", "Export"))
         self.groupBox_2.setTitle(_translate("Dialog", "Image pop-up"))
+        self.label.setToolTip(_translate("Dialog", "Maximum pop-up width"))
+        self.label.setText(_translate("Dialog", "Width"))
+        self.spin_popup_w.setToolTip(_translate("Dialog", "Maximum pop-up width"))
+        self.label_2.setToolTip(_translate("Dialog", "Maximum pop-up height"))
+        self.label_2.setText(_translate("Dialog", "Height"))
+        self.spin_popup_h.setToolTip(_translate("Dialog", "Maximum pop-up height"))
         self.cb_image_popup.setText(_translate("Dialog", "Show an image pop-up when hovering over image URLs"))
         self.groupBox_logging.setTitle(_translate("Dialog", "Logging"))
-        self.label_logging.setText(_translate("Dialog", "Level"))
         self.pb_open_log.setToolTip(_translate("Dialog", "Open logfile"))
         self.pb_open_log.setText(_translate("Dialog", "..."))
+        self.label_logging.setText(_translate("Dialog", "Level"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_advanced), _translate("Dialog", "Advanced"))
 
 
diff --git a/gotify_tray/gui/designs/widget_settings.ui b/gotify_tray/gui/designs/widget_settings.ui
index 63fb668..fa9e1d1 100644
--- a/gotify_tray/gui/designs/widget_settings.ui
+++ b/gotify_tray/gui/designs/widget_settings.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>384</width>
-    <height>272</height>
+    <height>300</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -264,6 +264,75 @@
           <string>Image pop-up</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_2">
+          <item row="1" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
+            <item>
+             <widget class="QLabel" name="label">
+              <property name="toolTip">
+               <string>Maximum pop-up width</string>
+              </property>
+              <property name="text">
+               <string>Width</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="spin_popup_w">
+              <property name="toolTip">
+               <string>Maximum pop-up width</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+              <property name="minimum">
+               <number>100</number>
+              </property>
+              <property name="maximum">
+               <number>10000</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_2">
+              <property name="toolTip">
+               <string>Maximum pop-up height</string>
+              </property>
+              <property name="text">
+               <string>Height</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="spin_popup_h">
+              <property name="toolTip">
+               <string>Maximum pop-up height</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+              <property name="minimum">
+               <number>100</number>
+              </property>
+              <property name="maximum">
+               <number>10000</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
           <item row="0" column="0">
            <widget class="QCheckBox" name="cb_image_popup">
             <property name="text">
@@ -280,16 +349,22 @@
           <string>Logging</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_6">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_logging">
-            <property name="text">
-             <string>Level</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="1">
            <widget class="QComboBox" name="combo_logging"/>
           </item>
+          <item row="0" column="3">
+           <spacer name="horizontalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>190</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
           <item row="0" column="2">
            <widget class="QPushButton" name="pb_open_log">
             <property name="maximumSize">
@@ -306,18 +381,12 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="3">
-           <spacer name="horizontalSpacer_5">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_logging">
+            <property name="text">
+             <string>Level</string>
             </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>190</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
+           </widget>
           </item>
          </layout>
         </widget>
diff --git a/gotify_tray/gui/widgets/SettingsDialog.py b/gotify_tray/gui/widgets/SettingsDialog.py
index 0940ade..3117a3b 100644
--- a/gotify_tray/gui/widgets/SettingsDialog.py
+++ b/gotify_tray/gui/widgets/SettingsDialog.py
@@ -84,7 +84,8 @@ class SettingsDialog(QtWidgets.QDialog, Ui_Dialog):
 
         # Advanced
         self.cb_image_popup.setChecked(settings.value("ImagePopup/enabled", type=bool))
-        # TODO: w/h
+        self.spin_popup_w.setValue(settings.value("ImagePopup/w", type=int))
+        self.spin_popup_h.setValue(settings.value("ImagePopup/h", type=int))
 
     def change_server_info_callback(self):
         self.server_changed = verify_server(force_new=True, enable_import=False)
@@ -179,6 +180,8 @@ class SettingsDialog(QtWidgets.QDialog, Ui_Dialog):
         self.pb_import.clicked.connect(self.import_callback)
         self.pb_reset.clicked.connect(self.reset_callback)
         self.cb_image_popup.stateChanged.connect(self.settings_changed_callback)
+        self.spin_popup_w.valueChanged.connect(self.settings_changed_callback)
+        self.spin_popup_h.valueChanged.connect(self.settings_changed_callback)
 
     def apply_settings(self):
         # Priority
@@ -210,6 +213,8 @@ class SettingsDialog(QtWidgets.QDialog, Ui_Dialog):
 
         # Advanced
         settings.setValue("ImagePopup/enabled", self.cb_image_popup.isChecked())
+        settings.setValue("ImagePopup/w", self.spin_popup_w.value())
+        settings.setValue("ImagePopup/h", self.spin_popup_h.value())
 
         self.settings_changed = False
         self.buttonBox.button(